[Winmerge-svn] SF.net SVN: winmerge:[5800] trunk/Src/editlib/ccrystaltextview.cpp

[<ki...@us...>]

Revision: 5800
          http://winmerge.svn.sourceforge.net/winmerge/?rev=5800&view=rev
Author:   kimmov
Date:     2008-08-14 15:38:05 +0000 (Thu, 14 Aug 2008)

Log Message:
-----------
PATCH: [ 1991259 ] Convert editor find/replace to use PCRE regexps
 Bugfix to non-ascii chars in unicode build from Takashi

Modified Paths:
--------------
    trunk/Src/editlib/ccrystaltextview.cpp

Modified: trunk/Src/editlib/ccrystaltextview.cpp
===================================================================
--- trunk/Src/editlib/ccrystaltextview.cpp	2008-08-14 14:51:57 UTC (rev 5799)
+++ trunk/Src/editlib/ccrystaltextview.cpp	2008-08-14 15:38:05 UTC (rev 5800)
@@ -104,6 +104,7 @@
 #include "ViewableWhitespace.h"
 #include "SyntaxColors.h"
 #include "Ucs2Utf8.h"
+#include "unicoder.h"
 #include "pcre.h"
 
 // Escaped character constants in range 0x80-0xFF are interpreted in current codepage
@@ -4551,9 +4552,14 @@
 
       if (result >= 0)
         {
+#ifdef UNICODE
+          pos = ucr::stringlen_of_utf8(compString, ovector[0]);
+          nLen = ucr::stringlen_of_utf8(compString, ovector[1]) - pos;
+#else
           pos = ovector[0];
           nLen = ovector[1] - ovector[0];
-        }
+#endif
+		}
       else
         pos = -1;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.