From 04e0e56cda4b4eaebe3bb1565d9b3b1bde255e7e Mon Sep 17 00:00:00 2001 From: ivandroly Date: Tue, 30 Jun 2015 05:52:48 +0000 Subject: [PATCH 1/2] Store start characters in const string --- src/Logic/Dictionaries/OcrFixReplaceList.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/Logic/Dictionaries/OcrFixReplaceList.cs b/src/Logic/Dictionaries/OcrFixReplaceList.cs index 71c3ba419..67804db41 100644 --- a/src/Logic/Dictionaries/OcrFixReplaceList.cs +++ b/src/Logic/Dictionaries/OcrFixReplaceList.cs @@ -925,6 +925,7 @@ namespace Nikse.SubtitleEdit.Logic.Dictionaries var sb = new StringBuilder(); if (word != null && text != null && text.Contains(word)) { + const string startChars = @" ¡¿<>-""”“()[]'‘`´¶♪¿¡.…—!?,:;/"; int appendFrom = 0; for (int i = 0; i < text.Length; i++) { @@ -932,14 +933,14 @@ namespace Nikse.SubtitleEdit.Logic.Dictionaries { bool startOk = i == 0; if (!startOk) - startOk = (@" ¡¿<>-""”“()[]'‘`´¶♪¿¡.…—!?,:;/" + Environment.NewLine).Contains(text[i - 1]); + startOk = (startChars + Environment.NewLine).Contains(text[i - 1]); if (!startOk && word.StartsWith(' ')) startOk = true; if (startOk) { bool endOk = (i + word.Length == text.Length); if (!endOk) - endOk = (@" ¡¿<>-""”“()[]'‘`´¶♪¿¡.…—!?,:;/" + Environment.NewLine).Contains(text[i + word.Length]); + endOk = (startChars + Environment.NewLine).Contains(text[i + word.Length]); if (!endOk) endOk = newWord.EndsWith(' '); if (endOk) From 93d31e73f81fa3b483642fb799226c240c12a6a7 Mon Sep 17 00:00:00 2001 From: ivandroly Date: Tue, 30 Jun 2015 05:56:55 +0000 Subject: [PATCH 2/2] Use const to store xml text instead --- src/Logic/Dictionaries/OcrFixReplaceList.cs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Logic/Dictionaries/OcrFixReplaceList.cs b/src/Logic/Dictionaries/OcrFixReplaceList.cs index 67804db41..442ae05e0 100644 --- a/src/Logic/Dictionaries/OcrFixReplaceList.cs +++ b/src/Logic/Dictionaries/OcrFixReplaceList.cs @@ -775,6 +775,7 @@ namespace Nikse.SubtitleEdit.Logic.Dictionaries private XmlDocument LoadXmlReplaceListDocument() { + const string xmlText = ""; var doc = new XmlDocument(); if (File.Exists(_replaceListXmlFileName)) { @@ -784,12 +785,12 @@ namespace Nikse.SubtitleEdit.Logic.Dictionaries } catch { - doc.LoadXml(""); + doc.LoadXml(xmlText); } } else { - doc.LoadXml(""); + doc.LoadXml(xmlText); } return doc; } @@ -801,6 +802,7 @@ namespace Nikse.SubtitleEdit.Logic.Dictionaries private XmlDocument LoadXmlReplaceListUserDocument() { + const string xmlText = ""; var doc = new XmlDocument(); if (File.Exists(ReplaceListXmlFileNameUser)) { @@ -810,12 +812,12 @@ namespace Nikse.SubtitleEdit.Logic.Dictionaries } catch { - doc.LoadXml(""); + doc.LoadXml(xmlText); } } else { - doc.LoadXml(""); + doc.LoadXml(xmlText); } return doc; }