rpms/openoffice.org/devel openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch, 1.4, 1.5

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv31613

Modified Files:
	openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch 
Log Message:
and break into a suitable quoted token

openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch:

Index: openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch	1 May 2008 13:30:21 -0000	1.4
+++ openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch	1 May 2008 15:54:05 -0000	1.5
@@ -140,7 +140,7 @@
 diff -ru sc/source/core/tool/compiler.cxx sc/source/core/tool/compiler.cxx
 --- openoffice.org.orig/sc/source/core/tool/compiler.cxx	2008-05-01 14:06:24.000000000 +0100
 +++ openoffice.org/sc/source/core/tool/compiler.cxx	2008-05-01 14:07:19.000000000 +0100
-@@ -993,6 +993,20 @@
+@@ -993,6 +993,30 @@
                                 xub_StrLen nSrcPos,
                                 const CharClass* pCharClass) const
      {
@@ -150,11 +150,21 @@
 +        //surrounded by '
 +        if (rFormula.GetChar(nSrcPos) == '\'')
 +        {
-+	    ++nSrcPos;
-+            for (; nSrcPos < rFormula.Len(); ++nSrcPos)
++            xub_StrLen nPos = nSrcPos+1;
++            while (nPos < rFormula.Len())
 +            {
-+                if ((rFormula.GetChar(nSrcPos) == '\'') && (rFormula.GetChar(nSrcPos+1) != '\''))
-+                    break;
++                if (rFormula.GetChar(nPos) == '\'')
++                {
++                    if ( (nPos+1 == rFormula.Len()) || (rFormula.GetChar(nPos+1) != '\'') )
++                    {
++                        ParseResult aRet;
++                        aRet.TokenType = KParseType::SINGLE_QUOTE_NAME;
++                        aRet.EndPos = nPos+1;
++                        return aRet;
++                    }
++                    ++nPos;
++                }
++                ++nPos;
 +            }
 +        }
 +