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-1.0/files/patch-package::source::zippackage::ZipPackageFolder.cxx | |
| 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>
Notes
Notes:
svn path=/head/; revision=61176
Diffstat (limited to '')
| -rw-r--r-- | editors/openoffice-1.0/files/patch-package::source::zippackage::ZipPackageFolder.cxx | 41 |
1 files changed, 41 insertions, 0 deletions
diff --git a/editors/openoffice-1.0/files/patch-package::source::zippackage::ZipPackageFolder.cxx b/editors/openoffice-1.0/files/patch-package::source::zippackage::ZipPackageFolder.cxx new file mode 100644 index 000000000000..bb504c834eef --- /dev/null +++ b/editors/openoffice-1.0/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 ); |