rpms/openoffice.org/devel openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch, 1.3, 1.4
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Thu May 1 13:30:59 UTC 2008
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv12513
Modified Files:
openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch
Log Message:
handle a # in a sheet name
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.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch 18 Apr 2008 07:35:42 -0000 1.3
+++ openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch 1 May 2008 13:30:21 -0000 1.4
@@ -1,11 +1,7 @@
-Index: inc/document.hxx
-===================================================================
-RCS file: /cvs/sc/sc/inc/document.hxx,v
-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 17 Apr 2008 16:52:05 -0000
-@@ -574,7 +574,6 @@
+diff -ru sc/inc/document.hxx sc/inc/document.hxx
+--- openoffice.org.orig/sc/inc/document.hxx 2008-05-01 14:06:46.000000000 +0100
++++ openofficeorg/sc/inc/document.hxx 2008-05-01 14:07:19.000000000 +0100
+@@ -559,7 +559,6 @@
void SnapVisArea( Rectangle& rRect ) const; // 1/100 mm
SC_DLLPUBLIC BOOL ValidTabName( const String& rName ) const;
@@ -13,14 +9,10 @@
SC_DLLPUBLIC BOOL ValidNewTabName( const String& rName ) const;
SC_DLLPUBLIC void CreateValidTabName(String& rName) const;
BOOL InsertTab( SCTAB nPos, const String& rName,
-Index: source/core/data/document.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/core/data/document.cxx,v
-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 17 Apr 2008 16:52:08 -0000
-@@ -176,40 +181,7 @@
+diff -ru sc/source/core/data/document.cxx sc/source/core/data/document.cxx
+--- openoffice.org.orig/sc/source/core/data/document.cxx 2008-05-01 14:06:24.000000000 +0100
++++ openoffice.org/sc/source/core/data/document.cxx 2008-05-01 14:07:19.000000000 +0100
+@@ -167,40 +167,7 @@
BOOL ScDocument::ValidTabName( const String& rName ) const
{
@@ -62,14 +54,44 @@
}
-Index: source/core/tool/address.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/core/tool/address.cxx,v
-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 17 Apr 2008 16:52:09 -0000
-@@ -682,12 +682,33 @@
+diff -ru sc/source/core/tool/address.cxx sc/source/core/tool/address.cxx
+--- openoffice.org.orig/sc/source/core/tool/address.cxx 2008-05-01 14:06:24.000000000 +0100
++++ openoffice.org/sc/source/core/tool/address.cxx 2008-05-01 14:07:50.000000000 +0100
+@@ -651,23 +651,30 @@
+ BOOL bExtDoc = FALSE;
+ BOOL bNeedExtTab = FALSE;
+
++ //Lets see if this is a reference to something in an external file
++ //A Documentname is always quoted and has a trailing #
+ if ( *p == '\'' && ScGlobal::UnicodeStrChr( p, SC_COMPILER_FILE_TAB_SEP ) )
+ {
+- BOOL bQuote = TRUE; // Dokumentenname ist immer quoted
++ const sal_Unicode *pStart = p;
++ BOOL bQuote = TRUE; // A Documentname is always quoted
+ aDocTab += *p++;
+ while ( bQuote && *p )
+ {
+ if ( *p == '\'' && *(p-1) != '\\' )
+ bQuote = FALSE;
+ else if( !(*p == '\\' && *(p+1) == '\'') )
+- aDocName += *p; // falls escaped Quote: nur Quote in den Namen
++ aDocName += *p; // An escaped Quote in the Documentname
+ aDocTab += *p++;
+ }
+ aDocTab += *p; // den SC_COMPILER_FILE_TAB_SEP mitnehmen
+ if( *p++ == SC_COMPILER_FILE_TAB_SEP )
+ bExtDoc = TRUE;
+ else
+- return nRes;
++ {
++ //It wasn't a document after all, reset and continue as normal
++ p = pStart;
++ aDocTab = String();
++ }
+ }
+
+ SCCOL nCol = 0;
+@@ -682,12 +689,33 @@
nRes |= SCA_TAB_ABSOLUTE;
if (*p == '$')
nRes |= SCA_TAB_ABSOLUTE, p++;
@@ -107,7 +129,7 @@
{
p++; break;
}
-@@ -736,6 +757,7 @@
+@@ -736,6 +764,7 @@
}
nRes |= nBits;
@@ -115,14 +137,10 @@
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 17 Apr 2008 16:52:12 -0000
-@@ -416,6 +416,20 @@
+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 @@
xub_StrLen nSrcPos,
const CharClass* pCharClass) const
{
@@ -142,8 +160,8 @@
+
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,29 +1035,18 @@
+ static const sal_Int32 nContFlags = nStartFlags | KParseTokens::ASC_DOT;
+@@ -1524,29 +1538,18 @@
void ScCompiler::CheckTabQuotes( String& rString,
const ScAddress::Convention eConv )
{
@@ -180,14 +198,10 @@
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
-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 17 Apr 2008 16:52:15 -0000
-@@ -218,7 +218,6 @@
+diff -ru sc/source/filter/excel/excimp8.cxx sc/source/filter/excel/excimp8.cxx
+--- openoffice.org.orig/sc/source/filter/excel/excimp8.cxx 2008-05-01 14:06:26.000000000 +0100
++++ openoffice.org/sc/source/filter/excel/excimp8.cxx 2008-05-01 14:07:19.000000000 +0100
+@@ -186,7 +186,6 @@
String aName( aIn.ReadUniString( nLen ) );
GetTabInfo().AppendXclTabName( aName, nBdshtTab );
@@ -195,14 +209,10 @@
*pExcRoot->pTabNameBuff << aName;
SCTAB nScTab = static_cast< SCTAB >( nBdshtTab );
-Index: source/filter/excel/exctools.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/filter/excel/exctools.cxx,v
-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 17 Apr 2008 16:52:15 -0000
-@@ -401,7 +401,6 @@
+diff -ru sc/source/filter/excel/exctools.cxx sc/source/filter/excel/exctools.cxx
+--- openoffice.org.orig/sc/source/filter/excel/exctools.cxx 2008-05-01 14:06:26.000000000 +0100
++++ openoffice.org/sc/source/filter/excel/exctools.cxx 2008-05-01 14:07:19.000000000 +0100
+@@ -391,7 +391,6 @@
ScDocument& r = rRoot.GetDoc();
ExcScenarioCell* p = EXCSCFIRST();
String aSzenName( *pName );
@@ -210,14 +220,10 @@
UINT16 nNewTab = nTab + 1;
if( !r.InsertTab( nNewTab, aSzenName ) )
-Index: source/filter/excel/impop.cxx
-===================================================================
-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 17 Apr 2008 16:52:16 -0000
-@@ -440,7 +440,6 @@
+diff -ru sc/source/filter/excel/impop.cxx sc/source/filter/excel/impop.cxx
+--- openoffice.org.orig/sc/source/filter/excel/impop.cxx 2008-05-01 14:06:26.000000000 +0100
++++ openoffice.org/sc/source/filter/excel/impop.cxx 2008-05-01 14:07:19.000000000 +0100
+@@ -435,7 +435,6 @@
bool bSameWorkBook;
String aEncodedUrl( aIn.ReadByteString( false ) );
XclImpUrlHelper::DecodeUrl( aUrl, aTabName, bSameWorkBook, *pExcRoot->pIR, aEncodedUrl );
@@ -225,7 +231,7 @@
pExcRoot->pExtSheetBuff->Add( aUrl, aTabName, bSameWorkBook );
}
-@@ -691,7 +690,6 @@
+@@ -686,7 +685,6 @@
}
String aName( aIn.ReadByteString( FALSE ) );
@@ -233,14 +239,10 @@
*pExcRoot->pTabNameBuff << aName;
-Index: source/filter/excel/xicontent.cxx
-===================================================================
-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 17 Apr 2008 16:52:17 -0000
-@@ -434,12 +434,7 @@
+diff -ru sc/source/filter/excel/xicontent.cxx sc/source/filter/excel/xicontent.cxx
+--- openoffice.org.orig/sc/source/filter/excel/xicontent.cxx 2008-05-01 14:06:26.000000000 +0100
++++ openoffice.org/sc/source/filter/excel/xicontent.cxx 2008-05-01 14:07:19.000000000 +0100
+@@ -354,12 +354,7 @@
{
bInQuote = !bInQuote;
if (!bInQuote && aTabName.Len() > 0)
@@ -253,14 +255,10 @@
}
else if (bInQuote)
aTabName.Append(c);
-Index: source/filter/excel/xilink.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/filter/excel/xilink.cxx,v
-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 17 Apr 2008 16:52:17 -0000
-@@ -446,7 +446,6 @@
+diff -ru sc/source/filter/excel/xilink.cxx sc/source/filter/excel/xilink.cxx
+--- openoffice.org.orig/sc/source/filter/excel/xilink.cxx 2008-05-01 14:06:26.000000000 +0100
++++ openoffice.org/sc/source/filter/excel/xilink.cxx 2008-05-01 14:07:19.000000000 +0100
+@@ -422,7 +422,6 @@
for( sal_uInt16 nSBTab = 0; nSBTab < nSBTabCnt; ++nSBTab )
{
String aTabName( rStrm.ReadUniString() );
@@ -268,14 +266,10 @@
maSupbTabList.Append( new XclImpSupbookTab( aTabName ) );
}
}
-Index: source/filter/excel/xipivot.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/filter/excel/xipivot.cxx,v
-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 17 Apr 2008 16:52:18 -0000
-@@ -700,7 +700,6 @@
+diff -ru sc/source/filter/excel/xipivot.cxx sc/source/filter/excel/xipivot.cxx
+--- openoffice.org.orig/sc/source/filter/excel/xipivot.cxx 2008-05-01 14:06:26.000000000 +0100
++++ openoffice.org/sc/source/filter/excel/xipivot.cxx 2008-05-01 14:07:19.000000000 +0100
+@@ -695,7 +695,6 @@
String aDummyName = CREATE_STRING( "DPCache" );
if( maTabName.Len() > 0 )
aDummyName.Append( '_' ).Append( maTabName );
@@ -283,14 +277,10 @@
rDoc.CreateValidTabName( aDummyName );
rDoc.RenameTab( nScTab, aDummyName );
// set sheet index to source range
-Index: source/filter/ftools/ftools.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/filter/ftools/ftools.cxx,v
-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 17 Apr 2008 16:52:19 -0000
-@@ -190,11 +190,6 @@
+diff -ru sc/source/filter/ftools/ftools.cxx sc/source/filter/ftools/ftools.cxx
+--- openoffice.org.orig/sc/source/filter/ftools/ftools.cxx 2008-05-01 14:06:25.000000000 +0100
++++ openoffice.org/sc/source/filter/ftools/ftools.cxx 2008-05-01 14:07:19.000000000 +0100
+@@ -158,11 +158,6 @@
// *** conversion of names *** ------------------------------------------------
@@ -302,14 +292,10 @@
void ScfTools::ConvertToScDefinedName( String& rName )
{
xub_StrLen nLen = rName.Len();
-Index: source/filter/inc/ftools.hxx
-===================================================================
-RCS file: /cvs/sc/sc/source/filter/inc/ftools.hxx,v
-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 17 Apr 2008 16:52:20 -0000
-@@ -304,10 +304,6 @@
+diff -ru sc/source/filter/inc/ftools.hxx sc/source/filter/inc/ftools.hxx
+--- openoffice.org.orig/sc/source/filter/inc/ftools.hxx 2008-05-01 14:06:25.000000000 +0100
++++ openoffice.org/sc/source/filter/inc/ftools.hxx 2008-05-01 14:07:19.000000000 +0100
+@@ -292,10 +292,6 @@
// *** conversion of names *** ------------------------------------------------
@@ -320,14 +306,10 @@
/** Converts a string to a valid Calc defined name or database range name.
@descr Defined names in Calc may contain letters, digits (*), underscores, periods (*),
colons (*), question marks, and dollar signs.
-Index: source/filter/xcl97/XclImpChangeTrack.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/filter/xcl97/XclImpChangeTrack.cxx,v
-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 17 Apr 2008 16:52:21 -0000
-@@ -204,7 +204,6 @@
+diff -ru sc/source/filter/xcl97/XclImpChangeTrack.cxx sc/source/filter/xcl97/XclImpChangeTrack.cxx
+--- openoffice.org.orig/sc/source/filter/xcl97/XclImpChangeTrack.cxx 2008-05-01 14:06:25.000000000 +0100
++++ openoffice.org/sc/source/filter/xcl97/XclImpChangeTrack.cxx 2008-05-01 14:07:19.000000000 +0100
+@@ -179,7 +179,6 @@
pStrm->Ignore( 1 );
// - sheet name, always separated from URL
String aTabName( pStrm->ReadUniString() );
@@ -335,14 +317,10 @@
pStrm->Ignore( 1 );
rFirstTab = rLastTab = static_cast<SCTAB>(GetLinkManager().GetScTab( aUrl, aTabName ));
}
-Index: source/ui/vba/vbaworksheets.cxx
-===================================================================
-RCS file: /cvs/sc/sc/source/ui/vba/vbaworksheets.cxx,v
-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 17 Apr 2008 16:52:24 -0000
-@@ -407,9 +407,7 @@
+diff -ru sc/source/ui/vba/vbaworksheets.cxx sc/source/ui/vba/vbaworksheets.cxx
+--- openoffice.org.orig/sc/source/ui/vba/vbaworksheets.cxx 2008-05-01 14:06:23.000000000 +0100
++++ openoffice.org/sc/source/ui/vba/vbaworksheets.cxx 2008-05-01 14:07:19.000000000 +0100
+@@ -402,9 +402,7 @@
uno::Any
ScVbaWorksheets::getItemByStringIndex( const rtl::OUString& sIndex ) throw (uno::RuntimeException)
{
More information about the fedora-extras-commits
mailing list