rpms/openoffice.org/devel openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch, NONE, 1.1 openoffice.org-3.0.0.ooo88375.filter.disablepdf.patch, NONE, 1.1 openoffice.org.spec, 1.1482, 1.1483
Caolan McNamara (caolanm)
fedora-extras-commits at redhat.com
Thu Apr 17 08:51:22 UTC 2008
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5846
Modified Files:
openoffice.org.spec
Added Files:
openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch
openoffice.org-3.0.0.ooo88375.filter.disablepdf.patch
Log Message:
next version
openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch:
--- NEW FILE openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch ---
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 16 Apr 2008 16:18:23 -0000
@@ -574,7 +574,6 @@
void SnapVisArea( Rectangle& rRect ) const; // 1/100 mm
SC_DLLPUBLIC BOOL ValidTabName( const String& rName ) const;
- static SC_DLLPUBLIC void ConvertToValidTabName( String& rName, sal_Unicode cReplaceChar );
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 16 Apr 2008 16:18:26 -0000
@@ -176,40 +178,7 @@
BOOL ScDocument::ValidTabName( const String& rName ) const
{
- // behaviour must be equal to ConvertToValidTabName(), see below
- using namespace ::com::sun::star::i18n;
- sal_Int32 nStartFlags = KParseTokens::ANY_LETTER_OR_NUMBER |
- KParseTokens::ASC_UNDERSCORE;
- sal_Int32 nContFlags = nStartFlags;
- String aContChars( RTL_CONSTASCII_USTRINGPARAM(" ") );
- ParseResult aRes = ScGlobal::pCharClass->parsePredefinedToken(
- KParseType::IDENTNAME, rName, 0, nStartFlags, EMPTY_STRING, nContFlags, aContChars );
- return (aRes.TokenType & KParseType::IDENTNAME) && aRes.EndPos == rName.Len();
-}
-
-
-void ScDocument::ConvertToValidTabName( String& rName, sal_Unicode cReplaceChar )
-{
- // behaviour must be equal to ValidTabName(), see above
- using namespace ::com::sun::star::i18n;
- sal_Int32 nStartFlags = KParseTokens::ANY_LETTER_OR_NUMBER |
- KParseTokens::ASC_UNDERSCORE;
- sal_Int32 nContFlags = nStartFlags;
- String aStartChars;
- String aContChars( RTL_CONSTASCII_USTRINGPARAM(" ") );
- sal_Int32 nStartPos = 0;
- while( nStartPos < rName.Len() )
- {
- ParseResult aRes = ScGlobal::pCharClass->parsePredefinedToken( KParseType::IDENTNAME,
- rName, nStartPos, nStartFlags, aStartChars, nContFlags, aContChars );
- if( aRes.EndPos < rName.Len() )
- {
- rName.SetChar( static_cast< xub_StrLen >( aRes.EndPos ), cReplaceChar );
- nStartFlags = nContFlags;
- aStartChars = aContChars;
- }
- nStartPos = aRes.EndPos + 1;
- }
+ return rName.Len() > 0;
}
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 16 Apr 2008 16:18:27 -0000
@@ -685,8 +685,11 @@
BOOL bQuote = FALSE;
if( *p == '\'' )
p++, bQuote = TRUE;
- while (*p && (*p != '.'))
+ while (*p)
{
+ if( *p == '.' && !bQuote)
+ break;
+
if( bQuote && *p == '\'' )
{
p++; break;
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 @@
void ScCompiler::CheckTabQuotes( String& rString,
const ScAddress::Convention eConv )
{
- register const xub_StrLen nLen = rString.Len();
- register xub_StrLen i;
-
- bool bNeedsQuote = false;
-
- for ( i = 0 ; i < nLen ; i++ )
- {
- if( !IsWordChar( rString, i ) )
- {
- bNeedsQuote = true;
- break;
- }
- }
- if ( !bNeedsQuote && CharClass::isAsciiNumeric( rString ) )
- {
- bNeedsQuote = true;
- }
+ using namespace ::com::sun::star::i18n;
+ sal_Int32 nStartFlags = KParseTokens::ANY_LETTER_OR_NUMBER | KParseTokens::ASC_UNDERSCORE;
+ sal_Int32 nContFlags = nStartFlags;
+ ParseResult aRes = ScGlobal::pCharClass->parsePredefinedToken(
+ KParseType::IDENTNAME, rString, 0, nStartFlags, EMPTY_STRING, nContFlags, EMPTY_STRING);
+ bool bNeedsQuote = !((aRes.TokenType & KParseType::IDENTNAME) && aRes.EndPos == rString.Len());
switch ( eConv ) {
default :
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
@@ -218,7 +218,6 @@
String aName( aIn.ReadUniString( nLen ) );
GetTabInfo().AppendXclTabName( aName, nBdshtTab );
- ScfTools::ConvertToScSheetName( aName );
*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 16 Apr 2008 16:18:33 -0000
@@ -401,7 +401,6 @@
ScDocument& r = rRoot.GetDoc();
ExcScenarioCell* p = EXCSCFIRST();
String aSzenName( *pName );
- ScfTools::ConvertToScSheetName( aSzenName );
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 16 Apr 2008 16:18:34 -0000
@@ -440,7 +440,6 @@
bool bSameWorkBook;
String aEncodedUrl( aIn.ReadByteString( false ) );
XclImpUrlHelper::DecodeUrl( aUrl, aTabName, bSameWorkBook, *pExcRoot->pIR, aEncodedUrl );
- ScfTools::ConvertToScSheetName( aTabName );
pExcRoot->pExtSheetBuff->Add( aUrl, aTabName, bSameWorkBook );
}
@@ -691,7 +690,6 @@
}
String aName( aIn.ReadByteString( FALSE ) );
- ScfTools::ConvertToScSheetName( aName );
*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 16 Apr 2008 16:18:34 -0000
@@ -434,12 +434,7 @@
{
bInQuote = !bInQuote;
if (!bInQuote && aTabName.Len() > 0)
- {
- // Sheet name exists. Convert it to valid name the same way the
- // sheet names are converted.
- ScDocument::ConvertToValidTabName(aTabName, sal_Unicode('_'));
aNewUrl.Append(aTabName);
- }
}
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 16 Apr 2008 16:18:35 -0000
@@ -446,7 +446,6 @@
for( sal_uInt16 nSBTab = 0; nSBTab < nSBTabCnt; ++nSBTab )
{
String aTabName( rStrm.ReadUniString() );
- ScfTools::ConvertToScSheetName( aTabName );
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 16 Apr 2008 16:18:35 -0000
@@ -700,7 +700,6 @@
String aDummyName = CREATE_STRING( "DPCache" );
if( maTabName.Len() > 0 )
aDummyName.Append( '_' ).Append( maTabName );
- ScfTools::ConvertToScSheetName( aDummyName );
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 16 Apr 2008 16:18:36 -0000
@@ -190,11 +190,6 @@
// *** conversion of names *** ------------------------------------------------
-void ScfTools::ConvertToScSheetName( String& rName )
-{
- ScDocument::ConvertToValidTabName( rName, '_' );
-}
-
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 16 Apr 2008 16:18:38 -0000
@@ -304,10 +304,6 @@
// *** conversion of names *** ------------------------------------------------
- /** Converts a string to a valid Calc sheet name.
- @descr Sheet names in Calc may contain letters, digits, underscores, and spaces
- (space characters are not allowed at first position). */
- static void ConvertToScSheetName( String& rName );
/** 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 16 Apr 2008 16:18:38 -0000
@@ -204,7 +204,6 @@
pStrm->Ignore( 1 );
// - sheet name, always separated from URL
String aTabName( pStrm->ReadUniString() );
- ScfTools::ConvertToScSheetName( aTabName );
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 16 Apr 2008 16:18:42 -0000
@@ -407,9 +407,7 @@
uno::Any
ScVbaWorksheets::getItemByStringIndex( const rtl::OUString& sIndex ) throw (uno::RuntimeException)
{
- String sScIndex = sIndex;
- ScDocument::ConvertToValidTabName( sScIndex, '_' );
- return ScVbaWorksheets_BASE::getItemByStringIndex( sScIndex );
+ return ScVbaWorksheets_BASE::getItemByStringIndex( sIndex );
}
rtl::OUString&
openoffice.org-3.0.0.ooo88375.filter.disablepdf.patch:
--- NEW FILE openoffice.org-3.0.0.ooo88375.filter.disablepdf.patch ---
Index: source/pdfimport/test/makefile.mk
===================================================================
RCS file: /cvs/framework/filter/source/pdfimport/test/makefile.mk,v
retrieving revision 1.5
diff -u -r1.5 makefile.mk
--- openoffice.org.orig/filter/source/pdfimport/test/makefile.mk 11 Apr 2008 10:51:44 -0000 1.5
+++ openoffice.org/filter/source/pdfimport/test/makefile.mk 17 Apr 2008 07:53:23 -0000
@@ -41,6 +41,11 @@
# --- test lib ------------------------------------------------------
+.IF "$(ENABLE_PDFIMPORT)" == "NO"
+ at all:
+ @echo "PDF Import extension disabled."
+.ENDIF
+
.IF "$(SYSTEM_ZLIB)" == "YES"
CFLAGS+=-DSYSTEM_ZLIB
.ENDIF
Index: source/pdfimport/test/testdocs/makefile.mk
===================================================================
RCS file: /cvs/framework/filter/source/pdfimport/test/testdocs/makefile.mk,v
retrieving revision 1.3
diff -u -r1.3 makefile.mk
--- openoffice.org.orig/filter/source/pdfimport/test/testdocs/makefile.mk 11 Apr 2008 10:53:50 -0000 1.3
+++ openoffice.org/filter/source/pdfimport/test/testdocs/makefile.mk 17 Apr 2008 07:53:23 -0000
@@ -46,6 +46,7 @@
verticaltext.pdf
# --- Fake uno bootstrap ------------------------
+.IF "$(ENABLE_PDFIMPORT)" != "NO"
$(BIN)$/pdfi_unittest_test.ini : makefile.mk
rm -f $@
@@ -80,3 +81,5 @@
$(foreach,i,$(TESTFILES:s/.pdf/_pdfi_unittest_writer_succeeded/:f) $(MISC)$/$i) : $(BIN)$/pdfi_unittest_test.ini $(BIN)$/pdf2xml$(EXECPOST)
$(foreach,i,$(TESTFILES:s/.pdf/_pdfi_unittest_impress_succeeded/:f) $(MISC)$/$i) : $(BIN)$/pdfi_unittest_test.ini $(BIN)$/pdf2xml$(EXECPOST)
$(foreach,i,$(TESTFILES:s/.pdf/_pdfi_unittest_draw_succeeded/:f) $(MISC)$/$i) : $(BIN)$/pdfi_unittest_test.ini $(BIN)$/pdf2xml$(EXECPOST)
+
+.ENDIF
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1482
retrieving revision 1.1483
diff -u -r1.1482 -r1.1483
--- openoffice.org.spec 16 Apr 2008 12:55:16 -0000 1.1482
+++ openoffice.org.spec 17 Apr 2008 08:50:46 -0000 1.1483
@@ -1,5 +1,5 @@
%define oootag DEV300
-%define ooomilestone 7
+%define ooomilestone 8
%define rh_rpm_release 1
# undef to get english only and no-langpacks for a faster smoketest build
@@ -143,6 +143,8 @@
Patch70: openoffice.org-3.0.0.ooo88303.vcl.dynamicfontoptions.patch
Patch71: openoffice.org-3.0.0.ooo88319.setup_native.missing.patch
Patch72: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
+Patch73: openoffice.org-3.0.0.ooo88375.filter.disablepdf.patch
+Patch74: openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch
%define instdir %{_libdir}
%define baseinstdir %{instdir}/openoffice.org
@@ -1255,6 +1257,8 @@
%patch70 -p1 -b .ooo88303.vcl.dynamicfontoptions.patch
%patch71 -p1 -b .oo88319.setup_native.missing.patch
%patch72 -p1 -b .ooo88341.sc.verticalboxes.patch
+%patch73 -p1 -b .ooo88375.filter.disablepdf.patch
+%patch74 -p1 -b .ooo6087.sc.sheetnames.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3285,6 +3289,10 @@
%{python_py_sitearch}/unohelper.py*
%changelog
+* Thu Apr 17 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.8.1
+- add openoffice.org-3.0.0.ooo88375.filter.disablepdf.patch
+- add openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch
+
* Wed Apr 16 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.7.1
- next version
- drop integrated openoffice.org-2.3.0.ooo86882.vcl.unsigned_int_to_long.patch
More information about the fedora-extras-commits
mailing list