rpms/openoffice.org/devel openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch, 1.2, 1.3

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch 
Log Message:
extend sheet name escaping

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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch	17 Apr 2008 18:56:18 -0000	1.2
+++ openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch	18 Apr 2008 07:35:42 -0000	1.3
@@ -143,7 +143,7 @@
          static const sal_Int32 nStartFlags = KParseTokens::ANY_LETTER_OR_NUMBER |
              KParseTokens::ASC_UNDERSCORE | KParseTokens::ASC_DOLLAR;
          static const sal_Int32 nContFlags = nStartFlags | KParseTokens::ASC_DOT |
-@@ -1021,23 +1035,12 @@
+@@ -1021,29 +1035,18 @@
  void ScCompiler::CheckTabQuotes( String& rString,
                                   const ScAddress::Convention eConv )
  {
@@ -173,25 +173,13 @@
  
      switch ( eConv ) {
          default :
-@@ -1146,6 +1149,7 @@
-     cSymbol[MAXSTRLEN-1] = 0;       // Stopper
-     sal_Unicode* pSym = cSymbol;
-     const sal_Unicode* const pStart = aFormula.GetBuffer();
-+
-     const sal_Unicode* pSrc = pStart + nSrcPos;
-     BOOL bi18n = FALSE;
-     sal_Unicode c = *pSrc;
-@@ -1413,8 +1417,10 @@
-         if ( *p == '(' && nType == NUMBERFORMAT_LOGICAL)
-             return FALSE;
-         else if( aFormula.GetChar(nSrcPos) == '.' )
-+		{
-             // numerical sheet name?
-             return FALSE;
-+		}
-         else
-         {
-             if( nType == NUMBERFORMAT_TEXT )
+         case ScAddress::CONV_UNSPECIFIED :
+-        case ScAddress::CONV_OOO :
+             break;
++        case ScAddress::CONV_OOO :
+         case ScAddress::CONV_XL_A1 :
+         case ScAddress::CONV_XL_R1C1 :
+             if( bNeedsQuote )
 Index: source/filter/excel/excimp8.cxx
 ===================================================================
 RCS file: /cvs/sc/sc/source/filter/excel/excimp8.cxx,v