diff options
author | Martin Blapp <mbr@FreeBSD.org> | 2002-06-12 21:19:50 +0000 |
---|---|---|
committer | Martin Blapp <mbr@FreeBSD.org> | 2002-06-12 21:19:50 +0000 |
commit | b42d78ff3869ef2d31825d86943b032578775e5f (patch) | |
tree | ae133284ea856bc6950954712410f5d7fca34119 /editors/openoffice-3-devel | |
parent | Enable the exported symbols map files again. A missing map file has been added (diff) |
Fix gcc 2.95.3 crash resulting from a symbol conflict
between libpackage2.so and libsvx641fi.so.
Enable gcc 2.95.3 build again. OO should build and work now
in STABLE with the system gcc.
Obtained from: Alexander Kabaev <ak03@gte.com>
Diffstat (limited to 'editors/openoffice-3-devel')
4 files changed, 106 insertions, 0 deletions
diff --git a/editors/openoffice-3-devel/files/patch-package+inc+HashMaps.hxx b/editors/openoffice-3-devel/files/patch-package+inc+HashMaps.hxx new file mode 100644 index 000000000000..35052d291ef7 --- /dev/null +++ b/editors/openoffice-3-devel/files/patch-package+inc+HashMaps.hxx @@ -0,0 +1,20 @@ +--- ../package/inc/HashMaps.hxx.orig Tue Oct 30 14:52:18 2001 ++++ ../package/inc/HashMaps.hxx Wed Jun 12 23:10:42 2002 +@@ -79,7 +79,7 @@ + }; + + class ZipPackageFolder; +-class ContentInfo; ++class ZipContentInfo; + + typedef std::hash_map < rtl::OUString, + ZipPackageFolder *, +@@ -87,7 +87,7 @@ + eqFunc > FolderHash; + + typedef std::hash_map < rtl::OUString, +- vos::ORef < ContentInfo >, ++ vos::ORef < ZipContentInfo >, + ::rtl::OUStringHash, + eqFunc > ContentHash; + diff --git a/editors/openoffice-3-devel/files/patch-package+inc+ZipPackageFolder.hxx b/editors/openoffice-3-devel/files/patch-package+inc+ZipPackageFolder.hxx new file mode 100644 index 000000000000..014c61403380 --- /dev/null +++ b/editors/openoffice-3-devel/files/patch-package+inc+ZipPackageFolder.hxx @@ -0,0 +1,11 @@ +--- ../package/inc/ZipPackageFolder.hxx.orig Thu Nov 15 21:01:49 2001 ++++ ../package/inc/ZipPackageFolder.hxx Wed Jun 12 23:10:42 2002 +@@ -106,7 +106,7 @@ + + void doInsertByName ( ZipPackageEntry *pEntry, sal_Bool bSetParent ) + throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::container::ElementExistException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); +- ContentInfo & doGetByName( const ::rtl::OUString& aName ) ++ ZipContentInfo & doGetByName( const ::rtl::OUString& aName ) + throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException); + static void copyZipEntry( ZipEntry &rDest, const ZipEntry &rSource); + static ::com::sun::star::uno::Sequence < sal_Int8 > static_getImplementationId() diff --git a/editors/openoffice-3-devel/files/patch-package+source+zippackage+ContentInfo.hxx b/editors/openoffice-3-devel/files/patch-package+source+zippackage+ContentInfo.hxx new file mode 100644 index 000000000000..c4bf35e79f64 --- /dev/null +++ b/editors/openoffice-3-devel/files/patch-package+source+zippackage+ContentInfo.hxx @@ -0,0 +1,34 @@ +--- ../package/source/zippackage/ContentInfo.hxx.orig Tue Oct 30 14:54:47 2001 ++++ ../package/source/zippackage/ContentInfo.hxx Wed Jun 12 23:10:42 2002 +@@ -75,7 +75,7 @@ + #endif + #include <hash_map> + +-class ContentInfo : public cppu::OWeakObject ++class ZipContentInfo : public cppu::OWeakObject + { + public: + com::sun::star::uno::Reference < com::sun::star::lang::XUnoTunnel > xTunnel; +@@ -85,19 +85,19 @@ + ZipPackageFolder *pFolder; + ZipPackageStream *pStream; + }; +- ContentInfo ( ZipPackageStream * pNewStream ) ++ ZipContentInfo ( ZipPackageStream * pNewStream ) + : bFolder ( false ) + , pStream ( pNewStream ) + , xTunnel ( pNewStream ) + { + } +- ContentInfo ( ZipPackageFolder * pNewFolder ) ++ ZipContentInfo ( ZipPackageFolder * pNewFolder ) + : bFolder ( true ) + , pFolder ( pNewFolder ) + , xTunnel ( pNewFolder ) + { + } +- virtual ~ContentInfo () ++ virtual ~ZipContentInfo () + { + if ( bFolder ) + pFolder->releaseUpwardRef(); diff --git a/editors/openoffice-3-devel/files/patch-package+source+zippackage+ZipPackageFolder.cxx b/editors/openoffice-3-devel/files/patch-package+source+zippackage+ZipPackageFolder.cxx new file mode 100644 index 000000000000..bb504c834eef --- /dev/null +++ b/editors/openoffice-3-devel/files/patch-package+source+zippackage+ZipPackageFolder.cxx @@ -0,0 +1,41 @@ +--- ../package/source/zippackage/ZipPackageFolder.cxx.orig Wed Jun 12 23:09:16 2002 ++++ ../package/source/zippackage/ZipPackageFolder.cxx Wed Jun 12 23:10:42 2002 +@@ -212,7 +212,7 @@ + return maContents.size() > 0; + } + // XNameAccess +-ContentInfo& ZipPackageFolder::doGetByName( const OUString& aName ) ++ZipContentInfo& ZipPackageFolder::doGetByName( const OUString& aName ) + throw(NoSuchElementException, WrappedTargetException, RuntimeException) + { + ContentHash::iterator aIter = maContents.find ( aName ); +@@ -286,7 +286,7 @@ + aCI++) + { + const OUString &rShortName = (*aCI).first; +- const ContentInfo &rInfo = *(*aCI).second; ++ const ZipContentInfo &rInfo = *(*aCI).second; + + Sequence < PropertyValue > aPropSet (2); + PropertyValue *pValue = aPropSet.getArray(); +@@ -533,7 +533,7 @@ + aCI!=maContents.end(); + aCI++) + { +- ContentInfo &rInfo = * (*aCI).second; ++ ZipContentInfo &rInfo = * (*aCI).second; + if ( rInfo.bFolder )// && ! rInfo.pFolder->HasReleased () ) + rInfo.pFolder->releaseUpwardRef(); + else //if ( !rInfo.bFolder && !rInfo.pStream->HasReleased() ) +@@ -577,9 +577,9 @@ + throw(IllegalArgumentException, ElementExistException, WrappedTargetException, RuntimeException) + { + if ( pEntry->IsFolder() ) +- maContents[pEntry->aEntry.sName] = new ContentInfo ( static_cast < ZipPackageFolder *> ( pEntry ) ); ++ maContents[pEntry->aEntry.sName] = new ZipContentInfo ( static_cast < ZipPackageFolder *> ( pEntry ) ); + else +- maContents[pEntry->aEntry.sName] = new ContentInfo ( static_cast < ZipPackageStream *> ( pEntry ) ); ++ maContents[pEntry->aEntry.sName] = new ZipContentInfo ( static_cast < ZipPackageStream *> ( pEntry ) ); + + if ( bSetParent ) + pEntry->setParent ( *this ); |