From 5c9219b4cb06c4dfceab99d8a261cdc8d3f5ce8c Mon Sep 17 00:00:00 2001 From: Thomas Knoefel Date: Sun, 12 Jan 2025 15:15:06 +0100 Subject: [PATCH] update replaceAll --- src/MultiReplacePanel.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/src/MultiReplacePanel.cpp b/src/MultiReplacePanel.cpp index 34e9cde..26fb58f 100644 --- a/src/MultiReplacePanel.cpp +++ b/src/MultiReplacePanel.cpp @@ -4149,16 +4149,14 @@ bool MultiReplace::replaceAll(const ReplaceItemData& itemData, int& findCount, i return true; } - bool isReplaceFirstEnabled = (IsDlgButtonChecked(_hSelf, IDC_REPLACE_FIRST_CHECKBOX) == BST_CHECKED); - int searchFlags = (itemData.wholeWord * SCFIND_WHOLEWORD) | (itemData.matchCase * SCFIND_MATCHCASE) | (itemData.regex * SCFIND_REGEXP); - std::string findTextUtf8 = convertAndExtend(itemData.findText, itemData.extended); - std::string replaceTextUtf8 = convertAndExtend(itemData.replaceText, itemData.extended); + int searchFlags = (itemData.wholeWord * SCFIND_WHOLEWORD) | (itemData.matchCase * SCFIND_MATCHCASE) | (itemData.regex * SCFIND_REGEXP); + SearchResult searchResult = performSearchForward(findTextUtf8, searchFlags, false, 0); + bool isReplaceFirstEnabled = (IsDlgButtonChecked(_hSelf, IDC_REPLACE_FIRST_CHECKBOX) == BST_CHECKED); int previousLineIndex = -1; int lineFindCount = 0; - - SearchResult searchResult = performSearchForward(findTextUtf8, searchFlags, false, 0); + std::string replaceTextUtf8; while (searchResult.pos >= 0) {