rpms/openoffice.org/devel openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch, 1.1, 1.2
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Thu Apr 17 18:56:26 UTC 2008
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv24338
Modified Files:
openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch
Log Message:
update sheet naming patch for '' escaping mechanism
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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch 17 Apr 2008 08:50:46 -0000 1.1
+++ openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch 17 Apr 2008 18:56:18 -0000 1.2
@@ -4,7 +4,7 @@
retrieving revision 1.105.8.1
diff -u -r1.105.8.1 document.hxx
--- openoffice.org.orig/sc/inc/document.hxx 18 Jan 2008 11:28:27 -0000 1.105.8.1
-+++ openoffice.org/sc/inc/document.hxx 16 Apr 2008 16:18:23 -0000
++++ openoffice.org/sc/inc/document.hxx 17 Apr 2008 16:52:05 -0000
@@ -574,7 +574,6 @@
void SnapVisArea( Rectangle& rRect ) const; // 1/100 mm
@@ -19,8 +19,8 @@
retrieving revision 1.80.94.2
diff -u -r1.80.94.2 document.cxx
--- openoffice.org.orig/sc/source/core/data/document.cxx 6 Feb 2008 18:16:42 -0000 1.80.94.2
-+++ openoffice.org/sc/source/core/data/document.cxx 16 Apr 2008 16:18:26 -0000
-@@ -176,40 +178,7 @@
++++ openoffice.org/sc/source/core/data/document.cxx 17 Apr 2008 16:52:08 -0000
+@@ -176,40 +181,7 @@
BOOL ScDocument::ValidTabName( const String& rName ) const
{
@@ -68,28 +68,82 @@
retrieving revision 1.9.248.1
diff -u -r1.9.248.1 address.cxx
--- openoffice.org.orig/sc/source/core/tool/address.cxx 18 Jan 2008 14:33:24 -0000 1.9.248.1
-+++ openoffice.org/sc/source/core/tool/address.cxx 16 Apr 2008 16:18:27 -0000
-@@ -685,8 +685,11 @@
- BOOL bQuote = FALSE;
++++ openoffice.org/sc/source/core/tool/address.cxx 17 Apr 2008 16:52:09 -0000
+@@ -682,12 +682,33 @@
+ nRes |= SCA_TAB_ABSOLUTE;
+ if (*p == '$')
+ nRes |= SCA_TAB_ABSOLUTE, p++;
+- BOOL bQuote = FALSE;
++
++ //Tokens that start at ' can have anything in them until a final '
++ //but '' marks an escaped '
++ //We've earlier guaranteed that a string containing '' will be
++ //surrounded by '
if( *p == '\'' )
- p++, bQuote = TRUE;
+- p++, bQuote = TRUE;
- while (*p && (*p != '.'))
-+ while (*p)
{
-+ if( *p == '.' && !bQuote)
+- if( bQuote && *p == '\'' )
++ ++p;
++ while (*p)
++ {
++ if (*p == '\'')
++ {
++ if ( (*(p+1) != '\'') )
++ break;
++ else
++ *p++;
++ }
++ aTab += *p++;
++ }
++ }
++
++ while (*p)
++ {
++ if( *p == '.')
+ break;
+
- if( bQuote && *p == '\'' )
++ if( *p == '\'' )
{
p++; break;
+ }
+@@ -736,6 +757,7 @@
+ }
+ nRes |= nBits;
+
++
+ q = p;
+ if (*p)
+ {
Index: source/core/tool/compiler.cxx
===================================================================
RCS file: /cvs/sc/sc/source/core/tool/compiler.cxx,v
retrieving revision 1.71.84.1
diff -u -r1.71.84.1 compiler.cxx
--- openoffice.org.orig/sc/source/core/tool/compiler.cxx 18 Jan 2008 11:35:21 -0000 1.71.84.1
-+++ openoffice.org/sc/source/core/tool/compiler.cxx 16 Apr 2008 16:18:30 -0000
-@@ -1021,23 +1021,12 @@
++++ openoffice.org/sc/source/core/tool/compiler.cxx 17 Apr 2008 16:52:12 -0000
+@@ -416,6 +416,20 @@
+ xub_StrLen nSrcPos,
+ const CharClass* pCharClass) const
+ {
++ //Tokens that start at ' can have anything in them until a final '
++ //but '' marks an escaped '
++ //We've earlier guaranteed that a string containing '' will be
++ //surrounded by '
++ if (rFormula.GetChar(nSrcPos) == '\'')
++ {
++ ++nSrcPos;
++ for (; nSrcPos < rFormula.Len(); ++nSrcPos)
++ {
++ if ((rFormula.GetChar(nSrcPos) == '\'') && (rFormula.GetChar(nSrcPos+1) != '\''))
++ break;
++ }
++ }
++
+ 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 @@
void ScCompiler::CheckTabQuotes( String& rString,
const ScAddress::Convention eConv )
{
@@ -119,13 +173,32 @@
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 )
Index: source/filter/excel/excimp8.cxx
===================================================================
RCS file: /cvs/sc/sc/source/filter/excel/excimp8.cxx,v
retrieving revision 1.121.10.1
diff -u -r1.121.10.1 excimp8.cxx
---- openoffice.org.orig.sc/source/filter/excel/excimp8.cxx 18 Jan 2008 11:37:27 -0000 1.121.10.1
-+++ openoffice.org/sc/source/filter/excel/excimp8.cxx 16 Apr 2008 16:18:33 -0000
+--- openoffice.org.orig/sc/source/filter/excel/excimp8.cxx 18 Jan 2008 11:37:27 -0000 1.121.10.1
++++ openoffice.org/sc/source/filter/excel/excimp8.cxx 17 Apr 2008 16:52:15 -0000
@@ -218,7 +218,6 @@
String aName( aIn.ReadUniString( nLen ) );
GetTabInfo().AppendXclTabName( aName, nBdshtTab );
@@ -140,7 +213,7 @@
retrieving revision 1.60
diff -u -r1.60 exctools.cxx
--- openoffice.org.orig/sc/source/filter/excel/exctools.cxx 10 May 2007 16:47:30 -0000 1.60
-+++ openoffice.org/sc/source/filter/excel/exctools.cxx 16 Apr 2008 16:18:33 -0000
++++ openoffice.org/sc/source/filter/excel/exctools.cxx 17 Apr 2008 16:52:15 -0000
@@ -401,7 +401,6 @@
ScDocument& r = rRoot.GetDoc();
ExcScenarioCell* p = EXCSCFIRST();
@@ -154,8 +227,8 @@
RCS file: /cvs/sc/sc/source/filter/excel/impop.cxx,v
retrieving revision 1.90.42.1
diff -u -r1.90.42.1 impop.cxx
---- openoffice.org.orig.sc/source/filter/excel/impop.cxx 18 Jan 2008 11:37:41 -0000 1.90.42.1
-+++ openoffice.org/sc/source/filter/excel/impop.cxx 16 Apr 2008 16:18:34 -0000
+--- openoffice.org.orig/sc/source/filter/excel/impop.cxx 18 Jan 2008 11:37:41 -0000 1.90.42.1
++++ openoffice.org/sc/source/filter/excel/impop.cxx 17 Apr 2008 16:52:16 -0000
@@ -440,7 +440,6 @@
bool bSameWorkBook;
String aEncodedUrl( aIn.ReadByteString( false ) );
@@ -177,8 +250,8 @@
RCS file: /cvs/sc/sc/source/filter/excel/xicontent.cxx,v
retrieving revision 1.29.138.1
diff -u -r1.29.138.1 xicontent.cxx
---- openoffice.org.orig.sc/source/filter/excel/xicontent.cxx 18 Jan 2008 11:40:06 -0000 1.29.138.1
-+++ openoffice.org/sc/source/filter/excel/xicontent.cxx 16 Apr 2008 16:18:34 -0000
+--- openoffice.org.orig/sc/source/filter/excel/xicontent.cxx 18 Jan 2008 11:40:06 -0000 1.29.138.1
++++ openoffice.org/sc/source/filter/excel/xicontent.cxx 17 Apr 2008 16:52:17 -0000
@@ -434,12 +434,7 @@
{
bInQuote = !bInQuote;
@@ -198,7 +271,7 @@
retrieving revision 1.22
diff -u -r1.22 xilink.cxx
--- openoffice.org.orig/sc/source/filter/excel/xilink.cxx 27 Jun 2007 12:44:39 -0000 1.22
-+++ openoffice.org/sc/source/filter/excel/xilink.cxx 16 Apr 2008 16:18:35 -0000
++++ openoffice.org/sc/source/filter/excel/xilink.cxx 17 Apr 2008 16:52:17 -0000
@@ -446,7 +446,6 @@
for( sal_uInt16 nSBTab = 0; nSBTab < nSBTabCnt; ++nSBTab )
{
@@ -213,7 +286,7 @@
retrieving revision 1.15.246.1
diff -u -r1.15.246.1 xipivot.cxx
--- openoffice.org.orig/sc/source/filter/excel/xipivot.cxx 18 Jan 2008 11:40:50 -0000 1.15.246.1
-+++ openoffice,org/sc/source/filter/excel/xipivot.cxx 16 Apr 2008 16:18:35 -0000
++++ openoffice.org/sc/source/filter/excel/xipivot.cxx 17 Apr 2008 16:52:18 -0000
@@ -700,7 +700,6 @@
String aDummyName = CREATE_STRING( "DPCache" );
if( maTabName.Len() > 0 )
@@ -228,7 +301,7 @@
retrieving revision 1.18
diff -u -r1.18 ftools.cxx
--- openoffice.org.orig/sc/source/filter/ftools/ftools.cxx 22 May 2007 19:53:12 -0000 1.18
-+++ openoffice.org/sc/source/filter/ftools/ftools.cxx 16 Apr 2008 16:18:36 -0000
++++ openoffice.org/sc/source/filter/ftools/ftools.cxx 17 Apr 2008 16:52:19 -0000
@@ -190,11 +190,6 @@
// *** conversion of names *** ------------------------------------------------
@@ -247,7 +320,7 @@
retrieving revision 1.22
diff -u -r1.22 ftools.hxx
--- openoffice.org.orig/sc/source/filter/inc/ftools.hxx 22 May 2007 19:54:56 -0000 1.22
-+++ openoffice.org/sc/source/filter/inc/ftools.hxx 16 Apr 2008 16:18:38 -0000
++++ openoffice.org/sc/source/filter/inc/ftools.hxx 17 Apr 2008 16:52:20 -0000
@@ -304,10 +304,6 @@
// *** conversion of names *** ------------------------------------------------
@@ -265,7 +338,7 @@
retrieving revision 1.31
diff -u -r1.31 XclImpChangeTrack.cxx
--- openoffice.org.orig/sc/source/filter/xcl97/XclImpChangeTrack.cxx 13 Jun 2007 09:12:45 -0000 1.31
-+++ openoffice.org/sc/source/filter/xcl97/XclImpChangeTrack.cxx 16 Apr 2008 16:18:38 -0000
++++ openoffice.org/sc/source/filter/xcl97/XclImpChangeTrack.cxx 17 Apr 2008 16:52:21 -0000
@@ -204,7 +204,6 @@
pStrm->Ignore( 1 );
// - sheet name, always separated from URL
@@ -280,7 +353,7 @@
retrieving revision 1.5
diff -u -r1.5 vbaworksheets.cxx
--- openoffice.org.orig/sc/source/ui/vba/vbaworksheets.cxx 14 Dec 2007 11:02:02 -0000 1.5
-+++ openoffice.org/sc/source/ui/vba/vbaworksheets.cxx 16 Apr 2008 16:18:42 -0000
++++ openoffice.org/sc/source/ui/vba/vbaworksheets.cxx 17 Apr 2008 16:52:24 -0000
@@ -407,9 +407,7 @@
uno::Any
ScVbaWorksheets::getItemByStringIndex( const rtl::OUString& sIndex ) throw (uno::RuntimeException)
More information about the fedora-extras-commits
mailing list