From 18ddcf23bfafbe9b3db659667fc7cf54d8c0b788 Mon Sep 17 00:00:00 2001
From: Ivan <8611739+IRBorisov@users.noreply.github.com>
Date: Mon, 5 Aug 2024 14:06:31 +0300
Subject: [PATCH] Replace literals with ChrW

---
 VERSION                 |  2 +-
 src/LinkMappingUnit.cls | 67 ++++++++++++++++++++---------------------
 src/MainImpl.bas        |  5 ++-
 3 files changed, 36 insertions(+), 38 deletions(-)

diff --git a/VERSION b/VERSION
index 3a3cd8c..1892b92 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.3.1
+1.3.2
diff --git a/src/LinkMappingUnit.cls b/src/LinkMappingUnit.cls
index 6b26c9b..c9f3e0e 100644
--- a/src/LinkMappingUnit.cls
+++ b/src/LinkMappingUnit.cls
@@ -64,52 +64,51 @@ Private Sub Class_Initialize()
   Dim rule As LMUItem
     
   Set rule = New LMUItem
-  rule.repWhat = "!В архив\Income"
-  rule.repList.Add ("00 Архив\01 Инкам")
+  ' !В архив\Income
+  rule.repWhat = ChrW(33) & ChrW(1042) & ChrW(32) & ChrW(1072) & ChrW(1088) & ChrW(1093) & ChrW(1080) & ChrW(1074) & "\Income"
+  ' 00 Архив\01 Инкам
+  rule.repList.Add ChrW(48) & ChrW(48) & ChrW(32) & ChrW(1040) & ChrW(1088) & ChrW(1093) & ChrW(1080) & ChrW(1074) & ChrW(92) & _
+           ChrW(48) & ChrW(49) & ChrW(32) & ChrW(1048) & ChrW(1085) & ChrW(1082) & ChrW(1072) & ChrW(1084)
   Call m_ReplaceMap.Add(rule)
   
   Set rule = New LMUItem
-  rule.repWhat = "!В архив\Outcome"
-  rule.repList.Add ("00 Архив\02 Ауткам")
+  ' !В архив\Outcome
+  rule.repWhat = ChrW(33) & ChrW(1042) & ChrW(32) & ChrW(1072) & ChrW(1088) & ChrW(1093) & ChrW(1080) & ChrW(1074) & "\Outcome"
+  ' 00 Архив\02 Ауткам
+  rule.repList.Add ChrW(48) & ChrW(48) & ChrW(32) & ChrW(1040) & ChrW(1088) & ChrW(1093) & ChrW(1080) & ChrW(1074) & ChrW(92) & _
+           ChrW(48) & ChrW(50) & ChrW(32) & ChrW(1040) & ChrW(1091) & ChrW(1090) & ChrW(1082) & ChrW(1072) & ChrW(1084)
   Call m_ReplaceMap.Add(rule)
   
   Set rule = New LMUItem
-  rule.repWhat = "01 Income-проекты\архивировать"
-  rule.repList.Add ("!В архив\Income")
-  rule.repList.Add ("00 Архив\01 Инкам")
+  ' 01 Income-проекты\архивировать
+  rule.repWhat = "01 Income-" & ChrW(1087) & ChrW(1088) & ChrW(1086) & ChrW(1077) & ChrW(1082) & ChrW(1090) & ChrW(1099) & _
+                "\" & ChrW(1072) & ChrW(1088) & ChrW(1093) & ChrW(1080) & ChrW(1074) & ChrW(1080) & ChrW(1088) & ChrW(1086) & _
+                ChrW(1074) & ChrW(1072) & ChrW(1090) & ChrW(1100)
+  ' !В архив\Income
+  rule.repList.Add ChrW(33) & ChrW(1042) & ChrW(32) & ChrW(1072) & ChrW(1088) & ChrW(1093) & ChrW(1080) & ChrW(1074) & "\Income"
+  ' 00 Архив\01 Инкам
+  rule.repList.Add ChrW(48) & ChrW(48) & ChrW(32) & ChrW(1040) & ChrW(1088) & ChrW(1093) & ChrW(1080) & ChrW(1074) & ChrW(92) & _
+           ChrW(48) & ChrW(49) & ChrW(32) & ChrW(1048) & ChrW(1085) & ChrW(1082) & ChrW(1072) & ChrW(1084)
   Call m_ReplaceMap.Add(rule)
   
   Set rule = New LMUItem
-  rule.repWhat = "01 Income-проекты"
-  rule.repList.Add ("!В архив\Income")
-  rule.repList.Add ("00 Архив\01 Инкам")
+  ' 01 Income-проекты
+  rule.repWhat = "01 Income-" & ChrW(1087) & ChrW(1088) & ChrW(1086) & ChrW(1077) & ChrW(1082) & ChrW(1090) & ChrW(1099)
+  ' !В архив\Income
+  rule.repList.Add ChrW(33) & ChrW(1042) & ChrW(32) & ChrW(1072) & ChrW(1088) & ChrW(1093) & ChrW(1080) & ChrW(1074) & "\Income"
+  ' 00 Архив\01 Инкам
+  rule.repList.Add ChrW(48) & ChrW(48) & ChrW(32) & ChrW(1040) & ChrW(1088) & ChrW(1093) & ChrW(1080) & ChrW(1074) & ChrW(92) & _
+           ChrW(48) & ChrW(49) & ChrW(32) & ChrW(1048) & ChrW(1085) & ChrW(1082) & ChrW(1072) & ChrW(1084)
   Call m_ReplaceMap.Add(rule)
   
   Set rule = New LMUItem
-  rule.repWhat = "02 Outcome-проекты"
-  rule.repList.Add ("!В архив\Outcome")
-  rule.repList.Add ("00 Архив\02 Ауткам")
-  Call m_ReplaceMap.Add(rule)
-  
-  Set rule = New LMUItem
-  rule.repWhat = "03 Переговоры Активные"
-  rule.repList.Add ("00 Архив\03 Переговоры")
-  rule.repList.Add ("!В архив\Переговоры")
-  rule.repList.Add ("!В архив\Income")
-  rule.repList.Add ("00 Архив\01 Инкам")
-  rule.repList.Add ("01 Income-проекты")
-  rule.repList.Add ("02 Outcome-проекты")
-  Call m_ReplaceMap.Add(rule)
-  
-  Set rule = New LMUItem
-  rule.repWhat = "03 1 Переговоры возможные"
-  rule.repList.Add ("00 Архив\03 Переговоры")
-  rule.repList.Add ("03 Переговоры Активные")
-  Call m_ReplaceMap.Add(rule)
-  
-  Set rule = New LMUItem
-  rule.repWhat = "05 СОУ Концепт\НТС"
-  rule.repList.Add ("05 СОУ Концепт\04 НТС")
+  ' 02 Outcome-проекты
+  rule.repWhat = "02 Outcome-" & ChrW(1087) & ChrW(1088) & ChrW(1086) & ChrW(1077) & ChrW(1082) & ChrW(1090) & ChrW(1099)
+  ' !В архив\Outcome
+  rule.repList.Add ChrW(33) & ChrW(1042) & ChrW(32) & ChrW(1072) & ChrW(1088) & ChrW(1093) & ChrW(1080) & ChrW(1074) & "\Outcome"
+  ' 00 Архив\02 Ауткам
+  rule.repList.Add ChrW(48) & ChrW(48) & ChrW(32) & ChrW(1040) & ChrW(1088) & ChrW(1093) & ChrW(1080) & ChrW(1074) & ChrW(92) & _
+           ChrW(48) & ChrW(50) & ChrW(32) & ChrW(1040) & ChrW(1091) & ChrW(1090) & ChrW(1082) & ChrW(1072) & ChrW(1084)
   Call m_ReplaceMap.Add(rule)
 End Sub
 
diff --git a/src/MainImpl.bas b/src/MainImpl.bas
index f3cf847..4624270 100644
--- a/src/MainImpl.bas
+++ b/src/MainImpl.bas
@@ -80,10 +80,9 @@ Public Function FixHyperlinksIn(target As Word.Range) As LMU_LinksInfo
       If linkRange.HighlightColorIndex = wdTurquoise Then _
         linkRange.HighlightColorIndex = wdAuto
       
-      If StrComp(linkRange.Text, SafeGetHLinkAddress(aLink)) Then _
+      If StrComp(LCase(linkRange.Text), LCase(aLink.Address), vbTextCompare) = 0 Then _
         linkRange.Text = linkAdr
-      
-      linkRange.Text = linkRange.Text
+
       Call ActiveDocument.Hyperlinks.Add(linkRange, linkAdr)
     
     Case RV_LINK_NOFIX: