update to SRC680_m160
This commit is contained in:
parent
662815d1ee
commit
a4c5cdff1c
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=157680
20 changed files with 35 additions and 5715 deletions
|
@ -64,9 +64,9 @@ IGNORE= install lang/perl5.8 then try again
|
|||
|
||||
CODELINE= 680
|
||||
RELEASE_NR= 2.0
|
||||
MILESTONE?= 159
|
||||
MILESTONE?= 160
|
||||
OOOTAG?= SRC680_m${MILESTONE}
|
||||
SNAPDATE= 20060310
|
||||
SNAPDATE= 20060317
|
||||
INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG}
|
||||
EXECBASE?= openoffice.org-${OOOTAG}
|
||||
DIST_SUBDIR= openoffice.org2.0
|
||||
|
@ -140,7 +140,7 @@ TCSH?= /bin/tcsh
|
|||
PKGMESSAGE= ${WRKDIR}/pkg-message
|
||||
NUMOFPROCESSES?= 1
|
||||
|
||||
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --with-system-freetype --enable-crashdump=yes --enable-symbols=SMALL
|
||||
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --enable-crashdump=yes --enable-symbols=SMALL --with-system-freetype
|
||||
#workarounds
|
||||
CONFIGURE_ARGS+= --with-system-xrender-headers=yes #i62713#
|
||||
|
||||
|
@ -148,7 +148,7 @@ CONFIGURE_ARGS+= --with-system-xrender-headers=yes #i62713#
|
|||
EXTRA_PATCHES+= ${FILESDIR}/fbsd4-workaroundpatch
|
||||
.endif
|
||||
.if defined(WITH_GNUGCJ)
|
||||
EXTRA_PATCHES+= ${FILESDIR}/gcj-cws_jaxpapi ${FILESDIR}/gcj-patches ${FILESDIR}/cws-maho1.diff ${FILESDIR}/gcj-fbsdworkaround
|
||||
EXTRA_PATCHES+= ${FILESDIR}/gcj-patches ${FILESDIR}/cws-maho1.diff ${FILESDIR}/gcj-fbsdworkaround
|
||||
.endif
|
||||
#.if defined(WITH_TTF_BYTECODE_ENABLED)
|
||||
#EXTRA_PATCHES+= ${FILESDIR}/optpatch-freetype
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
MD5 (openoffice.org2.0/OOo_SRC680_m159_source.tar.bz2) = ec5a99d80cd3797dc60c52904db2c036
|
||||
SHA256 (openoffice.org2.0/OOo_SRC680_m159_source.tar.bz2) = 1795fdafb214449f316ba0279e8c79d098c1fbf55bdcb7501d5b0f866b8b37e9
|
||||
SIZE (openoffice.org2.0/OOo_SRC680_m159_source.tar.bz2) = 240880356
|
||||
MD5 (openoffice.org2.0/OOo_SRC680_m160_source.tar.bz2) = 0f9a00166c7a3e5f7425b5605f1b7270
|
||||
SHA256 (openoffice.org2.0/OOo_SRC680_m160_source.tar.bz2) = 8e934c980c5aee9cd99972373547545f7365476ac94d107e14f6e38029815c34
|
||||
SIZE (openoffice.org2.0/OOo_SRC680_m160_source.tar.bz2) = 241280072
|
||||
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
|
||||
SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
|
||||
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -1,48 +0,0 @@
|
|||
--- animations/source/animcore/targetpropertiescreator.cxx 2006-03-10 14:03:10.000000000 +0100
|
||||
+++ animations/source/animcore/targetpropertiescreator.cxx 2006-03-10 14:03:40.000000000 +0100
|
||||
@@ -518,7 +518,7 @@
|
||||
aCurr->first.mnParagraphIndex ) );
|
||||
}
|
||||
|
||||
- rCurrProps.Properties = ::comphelper::containerToSequence< beans::NamedValue >( aCurr->second );
|
||||
+ rCurrProps.Properties = ::comphelper::containerToSequence( aCurr->second );
|
||||
|
||||
++aCurr;
|
||||
}
|
||||
|
||||
--- framework/source/uielement/toolbarmanager.cxx 2006-01-07 09:14:50.000000000 +0100
|
||||
+++ framework/source/uielement/toolbarmanager.cxx 2006-03-10 16:01:04.000000000 +0100
|
||||
@@ -1002,7 +1002,7 @@
|
||||
aPropertyVector.push_back( makeAny( aPropValue ));
|
||||
}
|
||||
|
||||
- Sequence< Any > aArgs( comphelper::containerToSequence< Any >( aPropertyVector ));
|
||||
+ Sequence< Any > aArgs( comphelper::containerToSequence( aPropertyVector ));
|
||||
xController = Reference< XStatusListener >( xToolbarControllerFactory->createInstanceWithArgumentsAndContext(
|
||||
aCommandURL, aArgs, xComponentContext ),
|
||||
UNO_QUERY );
|
||||
@@ -1075,7 +1075,7 @@
|
||||
aPropertyVector.push_back( makeAny( aPropValue ));
|
||||
}
|
||||
|
||||
- Sequence< Any > aArgs( comphelper::containerToSequence< Any >( aPropertyVector ));
|
||||
+ Sequence< Any > aArgs( comphelper::containerToSequence( aPropertyVector ));
|
||||
xInit->initialize( aArgs );
|
||||
}
|
||||
|
||||
|
||||
--- framework/source/uielement/uicommanddescription.cxx 2005-12-16 09:11:31.000000000 +0100
|
||||
+++ framework/source/uielement/uicommanddescription.cxx 2006-03-10 16:01:13.000000000 +0100
|
||||
@@ -537,9 +537,9 @@
|
||||
}
|
||||
|
||||
// Create cached sequences for fast retrieving
|
||||
- m_aCommandImageList = comphelper::containerToSequence< rtl::OUString >( aImageCommandVector );
|
||||
- m_aCommandRotateImageList = comphelper::containerToSequence< rtl::OUString >( aImageRotateVector );
|
||||
- m_aCommandMirrorImageList = comphelper::containerToSequence< rtl::OUString >( aImageMirrorVector );
|
||||
+ m_aCommandImageList = comphelper::containerToSequence( aImageCommandVector );
|
||||
+ m_aCommandRotateImageList = comphelper::containerToSequence( aImageRotateVector );
|
||||
+ m_aCommandMirrorImageList = comphelper::containerToSequence( aImageMirrorVector );
|
||||
|
||||
m_bCacheFilled = sal_True;
|
||||
|
|
@ -64,9 +64,9 @@ IGNORE= install lang/perl5.8 then try again
|
|||
|
||||
CODELINE= 680
|
||||
RELEASE_NR= 2.0
|
||||
MILESTONE?= 159
|
||||
MILESTONE?= 160
|
||||
OOOTAG?= SRC680_m${MILESTONE}
|
||||
SNAPDATE= 20060310
|
||||
SNAPDATE= 20060317
|
||||
INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG}
|
||||
EXECBASE?= openoffice.org-${OOOTAG}
|
||||
DIST_SUBDIR= openoffice.org2.0
|
||||
|
@ -140,7 +140,7 @@ TCSH?= /bin/tcsh
|
|||
PKGMESSAGE= ${WRKDIR}/pkg-message
|
||||
NUMOFPROCESSES?= 1
|
||||
|
||||
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --with-system-freetype --enable-crashdump=yes --enable-symbols=SMALL
|
||||
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --enable-crashdump=yes --enable-symbols=SMALL --with-system-freetype
|
||||
#workarounds
|
||||
CONFIGURE_ARGS+= --with-system-xrender-headers=yes #i62713#
|
||||
|
||||
|
@ -148,7 +148,7 @@ CONFIGURE_ARGS+= --with-system-xrender-headers=yes #i62713#
|
|||
EXTRA_PATCHES+= ${FILESDIR}/fbsd4-workaroundpatch
|
||||
.endif
|
||||
.if defined(WITH_GNUGCJ)
|
||||
EXTRA_PATCHES+= ${FILESDIR}/gcj-cws_jaxpapi ${FILESDIR}/gcj-patches ${FILESDIR}/cws-maho1.diff ${FILESDIR}/gcj-fbsdworkaround
|
||||
EXTRA_PATCHES+= ${FILESDIR}/gcj-patches ${FILESDIR}/cws-maho1.diff ${FILESDIR}/gcj-fbsdworkaround
|
||||
.endif
|
||||
#.if defined(WITH_TTF_BYTECODE_ENABLED)
|
||||
#EXTRA_PATCHES+= ${FILESDIR}/optpatch-freetype
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
MD5 (openoffice.org2.0/OOo_SRC680_m159_source.tar.bz2) = ec5a99d80cd3797dc60c52904db2c036
|
||||
SHA256 (openoffice.org2.0/OOo_SRC680_m159_source.tar.bz2) = 1795fdafb214449f316ba0279e8c79d098c1fbf55bdcb7501d5b0f866b8b37e9
|
||||
SIZE (openoffice.org2.0/OOo_SRC680_m159_source.tar.bz2) = 240880356
|
||||
MD5 (openoffice.org2.0/OOo_SRC680_m160_source.tar.bz2) = 0f9a00166c7a3e5f7425b5605f1b7270
|
||||
SHA256 (openoffice.org2.0/OOo_SRC680_m160_source.tar.bz2) = 8e934c980c5aee9cd99972373547545f7365476ac94d107e14f6e38029815c34
|
||||
SIZE (openoffice.org2.0/OOo_SRC680_m160_source.tar.bz2) = 241280072
|
||||
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
|
||||
SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
|
||||
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -1,48 +0,0 @@
|
|||
--- animations/source/animcore/targetpropertiescreator.cxx 2006-03-10 14:03:10.000000000 +0100
|
||||
+++ animations/source/animcore/targetpropertiescreator.cxx 2006-03-10 14:03:40.000000000 +0100
|
||||
@@ -518,7 +518,7 @@
|
||||
aCurr->first.mnParagraphIndex ) );
|
||||
}
|
||||
|
||||
- rCurrProps.Properties = ::comphelper::containerToSequence< beans::NamedValue >( aCurr->second );
|
||||
+ rCurrProps.Properties = ::comphelper::containerToSequence( aCurr->second );
|
||||
|
||||
++aCurr;
|
||||
}
|
||||
|
||||
--- framework/source/uielement/toolbarmanager.cxx 2006-01-07 09:14:50.000000000 +0100
|
||||
+++ framework/source/uielement/toolbarmanager.cxx 2006-03-10 16:01:04.000000000 +0100
|
||||
@@ -1002,7 +1002,7 @@
|
||||
aPropertyVector.push_back( makeAny( aPropValue ));
|
||||
}
|
||||
|
||||
- Sequence< Any > aArgs( comphelper::containerToSequence< Any >( aPropertyVector ));
|
||||
+ Sequence< Any > aArgs( comphelper::containerToSequence( aPropertyVector ));
|
||||
xController = Reference< XStatusListener >( xToolbarControllerFactory->createInstanceWithArgumentsAndContext(
|
||||
aCommandURL, aArgs, xComponentContext ),
|
||||
UNO_QUERY );
|
||||
@@ -1075,7 +1075,7 @@
|
||||
aPropertyVector.push_back( makeAny( aPropValue ));
|
||||
}
|
||||
|
||||
- Sequence< Any > aArgs( comphelper::containerToSequence< Any >( aPropertyVector ));
|
||||
+ Sequence< Any > aArgs( comphelper::containerToSequence( aPropertyVector ));
|
||||
xInit->initialize( aArgs );
|
||||
}
|
||||
|
||||
|
||||
--- framework/source/uielement/uicommanddescription.cxx 2005-12-16 09:11:31.000000000 +0100
|
||||
+++ framework/source/uielement/uicommanddescription.cxx 2006-03-10 16:01:13.000000000 +0100
|
||||
@@ -537,9 +537,9 @@
|
||||
}
|
||||
|
||||
// Create cached sequences for fast retrieving
|
||||
- m_aCommandImageList = comphelper::containerToSequence< rtl::OUString >( aImageCommandVector );
|
||||
- m_aCommandRotateImageList = comphelper::containerToSequence< rtl::OUString >( aImageRotateVector );
|
||||
- m_aCommandMirrorImageList = comphelper::containerToSequence< rtl::OUString >( aImageMirrorVector );
|
||||
+ m_aCommandImageList = comphelper::containerToSequence( aImageCommandVector );
|
||||
+ m_aCommandRotateImageList = comphelper::containerToSequence( aImageRotateVector );
|
||||
+ m_aCommandMirrorImageList = comphelper::containerToSequence( aImageMirrorVector );
|
||||
|
||||
m_bCacheFilled = sal_True;
|
||||
|
|
@ -64,9 +64,9 @@ IGNORE= install lang/perl5.8 then try again
|
|||
|
||||
CODELINE= 680
|
||||
RELEASE_NR= 2.0
|
||||
MILESTONE?= 159
|
||||
MILESTONE?= 160
|
||||
OOOTAG?= SRC680_m${MILESTONE}
|
||||
SNAPDATE= 20060310
|
||||
SNAPDATE= 20060317
|
||||
INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG}
|
||||
EXECBASE?= openoffice.org-${OOOTAG}
|
||||
DIST_SUBDIR= openoffice.org2.0
|
||||
|
@ -140,7 +140,7 @@ TCSH?= /bin/tcsh
|
|||
PKGMESSAGE= ${WRKDIR}/pkg-message
|
||||
NUMOFPROCESSES?= 1
|
||||
|
||||
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --with-system-freetype --enable-crashdump=yes --enable-symbols=SMALL
|
||||
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --enable-crashdump=yes --enable-symbols=SMALL --with-system-freetype
|
||||
#workarounds
|
||||
CONFIGURE_ARGS+= --with-system-xrender-headers=yes #i62713#
|
||||
|
||||
|
@ -148,7 +148,7 @@ CONFIGURE_ARGS+= --with-system-xrender-headers=yes #i62713#
|
|||
EXTRA_PATCHES+= ${FILESDIR}/fbsd4-workaroundpatch
|
||||
.endif
|
||||
.if defined(WITH_GNUGCJ)
|
||||
EXTRA_PATCHES+= ${FILESDIR}/gcj-cws_jaxpapi ${FILESDIR}/gcj-patches ${FILESDIR}/cws-maho1.diff ${FILESDIR}/gcj-fbsdworkaround
|
||||
EXTRA_PATCHES+= ${FILESDIR}/gcj-patches ${FILESDIR}/cws-maho1.diff ${FILESDIR}/gcj-fbsdworkaround
|
||||
.endif
|
||||
#.if defined(WITH_TTF_BYTECODE_ENABLED)
|
||||
#EXTRA_PATCHES+= ${FILESDIR}/optpatch-freetype
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
MD5 (openoffice.org2.0/OOo_SRC680_m159_source.tar.bz2) = ec5a99d80cd3797dc60c52904db2c036
|
||||
SHA256 (openoffice.org2.0/OOo_SRC680_m159_source.tar.bz2) = 1795fdafb214449f316ba0279e8c79d098c1fbf55bdcb7501d5b0f866b8b37e9
|
||||
SIZE (openoffice.org2.0/OOo_SRC680_m159_source.tar.bz2) = 240880356
|
||||
MD5 (openoffice.org2.0/OOo_SRC680_m160_source.tar.bz2) = 0f9a00166c7a3e5f7425b5605f1b7270
|
||||
SHA256 (openoffice.org2.0/OOo_SRC680_m160_source.tar.bz2) = 8e934c980c5aee9cd99972373547545f7365476ac94d107e14f6e38029815c34
|
||||
SIZE (openoffice.org2.0/OOo_SRC680_m160_source.tar.bz2) = 241280072
|
||||
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
|
||||
SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
|
||||
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -1,48 +0,0 @@
|
|||
--- animations/source/animcore/targetpropertiescreator.cxx 2006-03-10 14:03:10.000000000 +0100
|
||||
+++ animations/source/animcore/targetpropertiescreator.cxx 2006-03-10 14:03:40.000000000 +0100
|
||||
@@ -518,7 +518,7 @@
|
||||
aCurr->first.mnParagraphIndex ) );
|
||||
}
|
||||
|
||||
- rCurrProps.Properties = ::comphelper::containerToSequence< beans::NamedValue >( aCurr->second );
|
||||
+ rCurrProps.Properties = ::comphelper::containerToSequence( aCurr->second );
|
||||
|
||||
++aCurr;
|
||||
}
|
||||
|
||||
--- framework/source/uielement/toolbarmanager.cxx 2006-01-07 09:14:50.000000000 +0100
|
||||
+++ framework/source/uielement/toolbarmanager.cxx 2006-03-10 16:01:04.000000000 +0100
|
||||
@@ -1002,7 +1002,7 @@
|
||||
aPropertyVector.push_back( makeAny( aPropValue ));
|
||||
}
|
||||
|
||||
- Sequence< Any > aArgs( comphelper::containerToSequence< Any >( aPropertyVector ));
|
||||
+ Sequence< Any > aArgs( comphelper::containerToSequence( aPropertyVector ));
|
||||
xController = Reference< XStatusListener >( xToolbarControllerFactory->createInstanceWithArgumentsAndContext(
|
||||
aCommandURL, aArgs, xComponentContext ),
|
||||
UNO_QUERY );
|
||||
@@ -1075,7 +1075,7 @@
|
||||
aPropertyVector.push_back( makeAny( aPropValue ));
|
||||
}
|
||||
|
||||
- Sequence< Any > aArgs( comphelper::containerToSequence< Any >( aPropertyVector ));
|
||||
+ Sequence< Any > aArgs( comphelper::containerToSequence( aPropertyVector ));
|
||||
xInit->initialize( aArgs );
|
||||
}
|
||||
|
||||
|
||||
--- framework/source/uielement/uicommanddescription.cxx 2005-12-16 09:11:31.000000000 +0100
|
||||
+++ framework/source/uielement/uicommanddescription.cxx 2006-03-10 16:01:13.000000000 +0100
|
||||
@@ -537,9 +537,9 @@
|
||||
}
|
||||
|
||||
// Create cached sequences for fast retrieving
|
||||
- m_aCommandImageList = comphelper::containerToSequence< rtl::OUString >( aImageCommandVector );
|
||||
- m_aCommandRotateImageList = comphelper::containerToSequence< rtl::OUString >( aImageRotateVector );
|
||||
- m_aCommandMirrorImageList = comphelper::containerToSequence< rtl::OUString >( aImageMirrorVector );
|
||||
+ m_aCommandImageList = comphelper::containerToSequence( aImageCommandVector );
|
||||
+ m_aCommandRotateImageList = comphelper::containerToSequence( aImageRotateVector );
|
||||
+ m_aCommandMirrorImageList = comphelper::containerToSequence( aImageMirrorVector );
|
||||
|
||||
m_bCacheFilled = sal_True;
|
||||
|
|
@ -64,9 +64,9 @@ IGNORE= install lang/perl5.8 then try again
|
|||
|
||||
CODELINE= 680
|
||||
RELEASE_NR= 2.0
|
||||
MILESTONE?= 159
|
||||
MILESTONE?= 160
|
||||
OOOTAG?= SRC680_m${MILESTONE}
|
||||
SNAPDATE= 20060310
|
||||
SNAPDATE= 20060317
|
||||
INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG}
|
||||
EXECBASE?= openoffice.org-${OOOTAG}
|
||||
DIST_SUBDIR= openoffice.org2.0
|
||||
|
@ -140,7 +140,7 @@ TCSH?= /bin/tcsh
|
|||
PKGMESSAGE= ${WRKDIR}/pkg-message
|
||||
NUMOFPROCESSES?= 1
|
||||
|
||||
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --with-system-freetype --enable-crashdump=yes --enable-symbols=SMALL
|
||||
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --enable-crashdump=yes --enable-symbols=SMALL --with-system-freetype
|
||||
#workarounds
|
||||
CONFIGURE_ARGS+= --with-system-xrender-headers=yes #i62713#
|
||||
|
||||
|
@ -148,7 +148,7 @@ CONFIGURE_ARGS+= --with-system-xrender-headers=yes #i62713#
|
|||
EXTRA_PATCHES+= ${FILESDIR}/fbsd4-workaroundpatch
|
||||
.endif
|
||||
.if defined(WITH_GNUGCJ)
|
||||
EXTRA_PATCHES+= ${FILESDIR}/gcj-cws_jaxpapi ${FILESDIR}/gcj-patches ${FILESDIR}/cws-maho1.diff ${FILESDIR}/gcj-fbsdworkaround
|
||||
EXTRA_PATCHES+= ${FILESDIR}/gcj-patches ${FILESDIR}/cws-maho1.diff ${FILESDIR}/gcj-fbsdworkaround
|
||||
.endif
|
||||
#.if defined(WITH_TTF_BYTECODE_ENABLED)
|
||||
#EXTRA_PATCHES+= ${FILESDIR}/optpatch-freetype
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
MD5 (openoffice.org2.0/OOo_SRC680_m159_source.tar.bz2) = ec5a99d80cd3797dc60c52904db2c036
|
||||
SHA256 (openoffice.org2.0/OOo_SRC680_m159_source.tar.bz2) = 1795fdafb214449f316ba0279e8c79d098c1fbf55bdcb7501d5b0f866b8b37e9
|
||||
SIZE (openoffice.org2.0/OOo_SRC680_m159_source.tar.bz2) = 240880356
|
||||
MD5 (openoffice.org2.0/OOo_SRC680_m160_source.tar.bz2) = 0f9a00166c7a3e5f7425b5605f1b7270
|
||||
SHA256 (openoffice.org2.0/OOo_SRC680_m160_source.tar.bz2) = 8e934c980c5aee9cd99972373547545f7365476ac94d107e14f6e38029815c34
|
||||
SIZE (openoffice.org2.0/OOo_SRC680_m160_source.tar.bz2) = 241280072
|
||||
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
|
||||
SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
|
||||
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -1,48 +0,0 @@
|
|||
--- animations/source/animcore/targetpropertiescreator.cxx 2006-03-10 14:03:10.000000000 +0100
|
||||
+++ animations/source/animcore/targetpropertiescreator.cxx 2006-03-10 14:03:40.000000000 +0100
|
||||
@@ -518,7 +518,7 @@
|
||||
aCurr->first.mnParagraphIndex ) );
|
||||
}
|
||||
|
||||
- rCurrProps.Properties = ::comphelper::containerToSequence< beans::NamedValue >( aCurr->second );
|
||||
+ rCurrProps.Properties = ::comphelper::containerToSequence( aCurr->second );
|
||||
|
||||
++aCurr;
|
||||
}
|
||||
|
||||
--- framework/source/uielement/toolbarmanager.cxx 2006-01-07 09:14:50.000000000 +0100
|
||||
+++ framework/source/uielement/toolbarmanager.cxx 2006-03-10 16:01:04.000000000 +0100
|
||||
@@ -1002,7 +1002,7 @@
|
||||
aPropertyVector.push_back( makeAny( aPropValue ));
|
||||
}
|
||||
|
||||
- Sequence< Any > aArgs( comphelper::containerToSequence< Any >( aPropertyVector ));
|
||||
+ Sequence< Any > aArgs( comphelper::containerToSequence( aPropertyVector ));
|
||||
xController = Reference< XStatusListener >( xToolbarControllerFactory->createInstanceWithArgumentsAndContext(
|
||||
aCommandURL, aArgs, xComponentContext ),
|
||||
UNO_QUERY );
|
||||
@@ -1075,7 +1075,7 @@
|
||||
aPropertyVector.push_back( makeAny( aPropValue ));
|
||||
}
|
||||
|
||||
- Sequence< Any > aArgs( comphelper::containerToSequence< Any >( aPropertyVector ));
|
||||
+ Sequence< Any > aArgs( comphelper::containerToSequence( aPropertyVector ));
|
||||
xInit->initialize( aArgs );
|
||||
}
|
||||
|
||||
|
||||
--- framework/source/uielement/uicommanddescription.cxx 2005-12-16 09:11:31.000000000 +0100
|
||||
+++ framework/source/uielement/uicommanddescription.cxx 2006-03-10 16:01:13.000000000 +0100
|
||||
@@ -537,9 +537,9 @@
|
||||
}
|
||||
|
||||
// Create cached sequences for fast retrieving
|
||||
- m_aCommandImageList = comphelper::containerToSequence< rtl::OUString >( aImageCommandVector );
|
||||
- m_aCommandRotateImageList = comphelper::containerToSequence< rtl::OUString >( aImageRotateVector );
|
||||
- m_aCommandMirrorImageList = comphelper::containerToSequence< rtl::OUString >( aImageMirrorVector );
|
||||
+ m_aCommandImageList = comphelper::containerToSequence( aImageCommandVector );
|
||||
+ m_aCommandRotateImageList = comphelper::containerToSequence( aImageRotateVector );
|
||||
+ m_aCommandMirrorImageList = comphelper::containerToSequence( aImageMirrorVector );
|
||||
|
||||
m_bCacheFilled = sal_True;
|
||||
|
|
@ -64,9 +64,9 @@ IGNORE= install lang/perl5.8 then try again
|
|||
|
||||
CODELINE= 680
|
||||
RELEASE_NR= 2.0
|
||||
MILESTONE?= 159
|
||||
MILESTONE?= 160
|
||||
OOOTAG?= SRC680_m${MILESTONE}
|
||||
SNAPDATE= 20060310
|
||||
SNAPDATE= 20060317
|
||||
INSTALLATION_BASEDIR?= openoffice.org-${OOOTAG}
|
||||
EXECBASE?= openoffice.org-${OOOTAG}
|
||||
DIST_SUBDIR= openoffice.org2.0
|
||||
|
@ -140,7 +140,7 @@ TCSH?= /bin/tcsh
|
|||
PKGMESSAGE= ${WRKDIR}/pkg-message
|
||||
NUMOFPROCESSES?= 1
|
||||
|
||||
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --with-system-freetype --enable-crashdump=yes --enable-symbols=SMALL
|
||||
CONFIGURE_ARGS+= --with-gnu-cp=${LOCALBASE}/bin/gcp --with-gnu-patch=${LOCALBASE}/bin/gpatch --with-epm=internal --enable-crashdump=yes --enable-symbols=SMALL --with-system-freetype
|
||||
#workarounds
|
||||
CONFIGURE_ARGS+= --with-system-xrender-headers=yes #i62713#
|
||||
|
||||
|
@ -148,7 +148,7 @@ CONFIGURE_ARGS+= --with-system-xrender-headers=yes #i62713#
|
|||
EXTRA_PATCHES+= ${FILESDIR}/fbsd4-workaroundpatch
|
||||
.endif
|
||||
.if defined(WITH_GNUGCJ)
|
||||
EXTRA_PATCHES+= ${FILESDIR}/gcj-cws_jaxpapi ${FILESDIR}/gcj-patches ${FILESDIR}/cws-maho1.diff ${FILESDIR}/gcj-fbsdworkaround
|
||||
EXTRA_PATCHES+= ${FILESDIR}/gcj-patches ${FILESDIR}/cws-maho1.diff ${FILESDIR}/gcj-fbsdworkaround
|
||||
.endif
|
||||
#.if defined(WITH_TTF_BYTECODE_ENABLED)
|
||||
#EXTRA_PATCHES+= ${FILESDIR}/optpatch-freetype
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
MD5 (openoffice.org2.0/OOo_SRC680_m159_source.tar.bz2) = ec5a99d80cd3797dc60c52904db2c036
|
||||
SHA256 (openoffice.org2.0/OOo_SRC680_m159_source.tar.bz2) = 1795fdafb214449f316ba0279e8c79d098c1fbf55bdcb7501d5b0f866b8b37e9
|
||||
SIZE (openoffice.org2.0/OOo_SRC680_m159_source.tar.bz2) = 240880356
|
||||
MD5 (openoffice.org2.0/OOo_SRC680_m160_source.tar.bz2) = 0f9a00166c7a3e5f7425b5605f1b7270
|
||||
SHA256 (openoffice.org2.0/OOo_SRC680_m160_source.tar.bz2) = 8e934c980c5aee9cd99972373547545f7365476ac94d107e14f6e38029815c34
|
||||
SIZE (openoffice.org2.0/OOo_SRC680_m160_source.tar.bz2) = 241280072
|
||||
MD5 (openoffice.org2.0/gpc231.tar.Z) = fdb06fdb5a4670b172f9fb738b717be9
|
||||
SHA256 (openoffice.org2.0/gpc231.tar.Z) = c1265948554a9882fe8342ecc9ccbdb423321a572a5a6b56f7dfad389540da4e
|
||||
SIZE (openoffice.org2.0/gpc231.tar.Z) = 27917
|
||||
|
|
File diff suppressed because it is too large
Load diff
|
@ -1,48 +0,0 @@
|
|||
--- animations/source/animcore/targetpropertiescreator.cxx 2006-03-10 14:03:10.000000000 +0100
|
||||
+++ animations/source/animcore/targetpropertiescreator.cxx 2006-03-10 14:03:40.000000000 +0100
|
||||
@@ -518,7 +518,7 @@
|
||||
aCurr->first.mnParagraphIndex ) );
|
||||
}
|
||||
|
||||
- rCurrProps.Properties = ::comphelper::containerToSequence< beans::NamedValue >( aCurr->second );
|
||||
+ rCurrProps.Properties = ::comphelper::containerToSequence( aCurr->second );
|
||||
|
||||
++aCurr;
|
||||
}
|
||||
|
||||
--- framework/source/uielement/toolbarmanager.cxx 2006-01-07 09:14:50.000000000 +0100
|
||||
+++ framework/source/uielement/toolbarmanager.cxx 2006-03-10 16:01:04.000000000 +0100
|
||||
@@ -1002,7 +1002,7 @@
|
||||
aPropertyVector.push_back( makeAny( aPropValue ));
|
||||
}
|
||||
|
||||
- Sequence< Any > aArgs( comphelper::containerToSequence< Any >( aPropertyVector ));
|
||||
+ Sequence< Any > aArgs( comphelper::containerToSequence( aPropertyVector ));
|
||||
xController = Reference< XStatusListener >( xToolbarControllerFactory->createInstanceWithArgumentsAndContext(
|
||||
aCommandURL, aArgs, xComponentContext ),
|
||||
UNO_QUERY );
|
||||
@@ -1075,7 +1075,7 @@
|
||||
aPropertyVector.push_back( makeAny( aPropValue ));
|
||||
}
|
||||
|
||||
- Sequence< Any > aArgs( comphelper::containerToSequence< Any >( aPropertyVector ));
|
||||
+ Sequence< Any > aArgs( comphelper::containerToSequence( aPropertyVector ));
|
||||
xInit->initialize( aArgs );
|
||||
}
|
||||
|
||||
|
||||
--- framework/source/uielement/uicommanddescription.cxx 2005-12-16 09:11:31.000000000 +0100
|
||||
+++ framework/source/uielement/uicommanddescription.cxx 2006-03-10 16:01:13.000000000 +0100
|
||||
@@ -537,9 +537,9 @@
|
||||
}
|
||||
|
||||
// Create cached sequences for fast retrieving
|
||||
- m_aCommandImageList = comphelper::containerToSequence< rtl::OUString >( aImageCommandVector );
|
||||
- m_aCommandRotateImageList = comphelper::containerToSequence< rtl::OUString >( aImageRotateVector );
|
||||
- m_aCommandMirrorImageList = comphelper::containerToSequence< rtl::OUString >( aImageMirrorVector );
|
||||
+ m_aCommandImageList = comphelper::containerToSequence( aImageCommandVector );
|
||||
+ m_aCommandRotateImageList = comphelper::containerToSequence( aImageRotateVector );
|
||||
+ m_aCommandMirrorImageList = comphelper::containerToSequence( aImageMirrorVector );
|
||||
|
||||
m_bCacheFilled = sal_True;
|
||||
|
Loading…
Reference in a new issue