[ooo-build-commit] .: sc/source

Kohei Yoshida kohei at kemper.freedesktop.org
Fri Oct 1 19:36:51 PDT 2010


 sc/source/core/tool/reffind.cxx |   11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 9d3ac5fea51dc634251dc555bf01bd95d82f4459
Author: Kohei Yoshida <kyoshida at novell.com>
Date:   Fri Oct 1 22:35:15 2010 -0400

    Ported calc-toggle-relative-ref-fix.diff from ooo-build.
    
    This corrects the code used for the Shift-F4 toggle relative / absolute
    reference feature in Calc, to adopt for configurable argument separators.

diff --git a/sc/source/core/tool/reffind.cxx b/sc/source/core/tool/reffind.cxx
index 5e30e16..166833d 100644
--- a/sc/source/core/tool/reffind.cxx
+++ b/sc/source/core/tool/reffind.cxx
@@ -43,14 +43,21 @@
 
 //	incl. Doppelpunkt -> Doppelte Referenzen werden einzeln behandelt
 const sal_Unicode __FAR_DATA ScRefFinder::pDelimiters[] = {
-    '=','(',')',';','+','-','*','/','^','&',' ','{','}','<','>',':', 0
+    '=','(',')','+','-','*','/','^','&',' ','{','}','<','>',':', 0
 };
 
 // =======================================================================
 
 inline BOOL IsText( sal_Unicode c )
 {
-    return !ScGlobal::UnicodeStrChr( ScRefFinder::pDelimiters, c );
+    bool bFound = ScGlobal::UnicodeStrChr( ScRefFinder::pDelimiters, c );
+    if (bFound)
+        // This is one of delimiters, therefore not text.
+        return false;
+
+    // argument separator is configurable.
+    const sal_Unicode sep = ScCompiler::GetNativeSymbol(ocSep).GetChar(0);
+    return c != sep;
 }
 
 inline BOOL IsText( BOOL& bQuote, sal_Unicode c )


More information about the ooo-build-commit mailing list