diff options
33 files changed, 93 insertions, 46 deletions
diff --git a/Library_merged.mk b/Library_merged.mk index 009cfb216ce4..044df38720db 100644 --- a/Library_merged.mk +++ b/Library_merged.mk @@ -57,7 +57,8 @@ $(eval $(call gb_Library_use_externals,merged,\ jpeg \ lcms2 \ libxml2 \ - $(call gb_Helper_optional,DESKTOP,libxslt) \ + libxslt \ + libexslt \ $(if $(filter-out IOS,$(OS)),lpsolve) \ mythes \ nss3 \ diff --git a/drawinglayer/drawinglayer.component b/drawinglayer/drawinglayer.component index 9f3c0c079099..2f1d89262a8f 100644 --- a/drawinglayer/drawinglayer.component +++ b/drawinglayer/drawinglayer.component @@ -17,7 +17,7 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . --> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="drawinglayer" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="drawinglayer::unorenderer::XPrimitive2DRenderer"> <service name="com.sun.star.graphic.Primitive2DTools"/> diff --git a/drawinglayer/source/drawinglayeruno/drawinglayeruno.cxx b/drawinglayer/source/drawinglayeruno/drawinglayeruno.cxx index f2ef2d3e5981..43795bc90ad7 100644 --- a/drawinglayer/source/drawinglayeruno/drawinglayeruno.cxx +++ b/drawinglayer/source/drawinglayeruno/drawinglayeruno.cxx @@ -50,7 +50,7 @@ namespace drawinglayer extern "C" { - DRAWINGLAYER_DLLPUBLIC void SAL_CALL component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ ) + DRAWINGLAYER_DLLPUBLIC void SAL_CALL drawinglayer_component_getImplementationEnvironment( const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; } @@ -61,7 +61,7 @@ extern "C" extern "C" { - DRAWINGLAYER_DLLPUBLIC void* SAL_CALL component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ ) + DRAWINGLAYER_DLLPUBLIC void* SAL_CALL drawinglayer_component_getFactory( const sal_Char* pImplName, void* pServiceManager, void* /* pRegistryKey */ ) { uno::Reference< lang::XSingleServiceFactory > xFactory; void* pRet = 0; diff --git a/filter/qa/cppunit/filters-pict-test.cxx b/filter/qa/cppunit/filters-pict-test.cxx index d69cf3011071..36d8d226cc56 100644 --- a/filter/qa/cppunit/filters-pict-test.cxx +++ b/filter/qa/cppunit/filters-pict-test.cxx @@ -16,6 +16,10 @@ #include <osl/file.hxx> #include <osl/process.h> +#ifdef LIBO_MERGELIBS +#define GraphicImport iptGraphicImport +#endif + extern "C" { SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL diff --git a/filter/qa/cppunit/filters-tga-test.cxx b/filter/qa/cppunit/filters-tga-test.cxx index cc831b1f003b..a30c277c99d4 100644 --- a/filter/qa/cppunit/filters-tga-test.cxx +++ b/filter/qa/cppunit/filters-tga-test.cxx @@ -36,6 +36,10 @@ #include <osl/file.hxx> #include <osl/process.h> +#ifdef LIBO_MERGELIBS +#define GraphicImport itgGraphicImport +#endif + extern "C" { SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL diff --git a/filter/qa/cppunit/filters-tiff-test.cxx b/filter/qa/cppunit/filters-tiff-test.cxx index 542522b97a5c..1c9f03f51e7b 100644 --- a/filter/qa/cppunit/filters-tiff-test.cxx +++ b/filter/qa/cppunit/filters-tiff-test.cxx @@ -36,6 +36,10 @@ #include <osl/file.hxx> #include <osl/process.h> +#ifdef LIBO_MERGELIBS +#define GraphicImport itiGraphicImport +#endif + extern "C" { SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL diff --git a/filter/source/graphicfilter/egif/egif.cxx b/filter/source/graphicfilter/egif/egif.cxx index 08628202837f..0f701f9f6ab2 100644 --- a/filter/source/graphicfilter/egif/egif.cxx +++ b/filter/source/graphicfilter/egif/egif.cxx @@ -558,7 +558,7 @@ void GIFWriter::WriteTerminator() // ------------------------------------------------------------------------ -#ifdef DISABLE_DYNLOADING +#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) #define GraphicExport egiGraphicExport #endif diff --git a/filter/source/graphicfilter/eos2met/eos2met.cxx b/filter/source/graphicfilter/eos2met/eos2met.cxx index 9e5ae3bf20e3..f5a5a23965dc 100644 --- a/filter/source/graphicfilter/eos2met/eos2met.cxx +++ b/filter/source/graphicfilter/eos2met/eos2met.cxx @@ -2552,7 +2552,7 @@ sal_Bool METWriter::WriteMET( const GDIMetaFile& rMTF, SvStream& rTargetStream, //================== GraphicExport - the exported Function ================ -#ifdef DISABLE_DYNLOADING +#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) #define GraphicExport emeGraphicExport #endif diff --git a/filter/source/graphicfilter/epbm/epbm.cxx b/filter/source/graphicfilter/epbm/epbm.cxx index 19f6b43319e2..4080d70f0dba 100644 --- a/filter/source/graphicfilter/epbm/epbm.cxx +++ b/filter/source/graphicfilter/epbm/epbm.cxx @@ -189,7 +189,7 @@ void PBMWriter::ImplWriteNumber(sal_Int32 nNumber) // - exported function - // --------------------- -#ifdef DISABLE_DYNLOADING +#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) #define GraphicExport epbGraphicExport #endif diff --git a/filter/source/graphicfilter/epgm/epgm.cxx b/filter/source/graphicfilter/epgm/epgm.cxx index 5c7738bca8f9..47c0860715d2 100644 --- a/filter/source/graphicfilter/epgm/epgm.cxx +++ b/filter/source/graphicfilter/epgm/epgm.cxx @@ -213,7 +213,7 @@ void PGMWriter::ImplWriteNumber(sal_Int32 nNumber) // - exported function - // --------------------- -#ifdef DISABLE_DYNLOADING +#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) #define GraphicExport epgGraphicExport #endif diff --git a/filter/source/graphicfilter/epict/epict.cxx b/filter/source/graphicfilter/epict/epict.cxx index 3c02e0ae98fc..155a7dfc3331 100644 --- a/filter/source/graphicfilter/epict/epict.cxx +++ b/filter/source/graphicfilter/epict/epict.cxx @@ -2266,7 +2266,7 @@ sal_Bool PictWriter::WritePict(const GDIMetaFile & rMTF, SvStream & rTargetStrea //================== GraphicExport - the exported Function ================ -#ifdef DISABLE_DYNLOADING +#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) #define GraphicExport eptGraphicExport #endif diff --git a/filter/source/graphicfilter/eppm/eppm.cxx b/filter/source/graphicfilter/eppm/eppm.cxx index e23bbbc8f2e0..666135ae74b8 100644 --- a/filter/source/graphicfilter/eppm/eppm.cxx +++ b/filter/source/graphicfilter/eppm/eppm.cxx @@ -222,7 +222,7 @@ void PPMWriter::ImplWriteNumber(sal_Int32 nNumber) // - exported function - // --------------------- -#ifdef DISABLE_DYNLOADING +#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) #define GraphicExport eppGraphicExport #endif diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx index 4d9cd3ec2266..b48fba706ada 100644 --- a/filter/source/graphicfilter/eps/eps.cxx +++ b/filter/source/graphicfilter/eps/eps.cxx @@ -2752,7 +2752,7 @@ sal_Bool PSWriter::ImplGetBoundingBox( double* nNumb, sal_uInt8* pSource, sal_uL //================== GraphicExport - die exportierte Funktion ================ -#ifdef DISABLE_DYNLOADING +#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) #define GraphicExport epsGraphicExport #endif diff --git a/filter/source/graphicfilter/eras/eras.cxx b/filter/source/graphicfilter/eras/eras.cxx index 44506c4228e5..77d6009e2f60 100644 --- a/filter/source/graphicfilter/eras/eras.cxx +++ b/filter/source/graphicfilter/eras/eras.cxx @@ -269,7 +269,7 @@ void RASWriter::ImplPutByte( sal_uInt8 nPutThis ) // - exported function - // --------------------- -#ifdef DISABLE_DYNLOADING +#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) #define GraphicExport eraGraphicExport #endif diff --git a/filter/source/graphicfilter/etiff/etiff.cxx b/filter/source/graphicfilter/etiff/etiff.cxx index 9949974bd27c..6475c90ecdb2 100644 --- a/filter/source/graphicfilter/etiff/etiff.cxx +++ b/filter/source/graphicfilter/etiff/etiff.cxx @@ -596,7 +596,7 @@ void TIFFWriter::EndCompression() // - exported function - // --------------------- -#ifdef DISABLE_DYNLOADING +#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) #define GraphicExport etiGraphicExport #endif diff --git a/filter/source/graphicfilter/expm/expm.cxx b/filter/source/graphicfilter/expm/expm.cxx index 43fe370ea2f3..7af3eca251eb 100644 --- a/filter/source/graphicfilter/expm/expm.cxx +++ b/filter/source/graphicfilter/expm/expm.cxx @@ -251,7 +251,7 @@ void XPMWriter::ImplWriteColor( sal_uInt16 nNumber ) // - exported function - // --------------------- -#ifdef DISABLE_DYNLOADING +#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) #define GraphicExport expGraphicExport #endif diff --git a/filter/source/graphicfilter/idxf/idxf.cxx b/filter/source/graphicfilter/idxf/idxf.cxx index bfb1edc193c9..b2639b30f24b 100644 --- a/filter/source/graphicfilter/idxf/idxf.cxx +++ b/filter/source/graphicfilter/idxf/idxf.cxx @@ -29,7 +29,7 @@ class FilterConfigItem; //================== GraphicImport - die exportierte Funktion ================ -#ifdef DISABLE_DYNLOADING +#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) #define GraphicImport idxGraphicImport #endif diff --git a/filter/source/graphicfilter/ieps/ieps.cxx b/filter/source/graphicfilter/ieps/ieps.cxx index 6c6265c9e14f..e45b1dd57beb 100644 --- a/filter/source/graphicfilter/ieps/ieps.cxx +++ b/filter/source/graphicfilter/ieps/ieps.cxx @@ -475,7 +475,7 @@ void MakePreview(sal_uInt8* pBuf, sal_uInt32 nBytesRead, //================== GraphicImport - the exported function ================ -#ifdef DISABLE_DYNLOADING +#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) #define GraphicImport ipsGraphicImport #endif diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx b/filter/source/graphicfilter/ios2met/ios2met.cxx index b5634498716d..834bd1155f6e 100644 --- a/filter/source/graphicfilter/ios2met/ios2met.cxx +++ b/filter/source/graphicfilter/ios2met/ios2met.cxx @@ -2704,7 +2704,7 @@ void OS2METReader::ReadOS2MET( SvStream & rStreamOS2MET, GDIMetaFile & rGDIMetaF //================== GraphicImport - the exported function ================ -#ifdef DISABLE_DYNLOADING +#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) #define GraphicImport imeGraphicImport #endif diff --git a/filter/source/graphicfilter/ipbm/ipbm.cxx b/filter/source/graphicfilter/ipbm/ipbm.cxx index 4d92b48504ae..f9b7f932f4ed 100644 --- a/filter/source/graphicfilter/ipbm/ipbm.cxx +++ b/filter/source/graphicfilter/ipbm/ipbm.cxx @@ -520,7 +520,7 @@ sal_Bool PBMReader::ImplReadBody() //================== GraphicImport - the exported function ================ -#ifdef DISABLE_DYNLOADING +#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) #define GraphicImport ipbGraphicImport #endif diff --git a/filter/source/graphicfilter/ipcd/ipcd.cxx b/filter/source/graphicfilter/ipcd/ipcd.cxx index a463aa6e9ade..d9f249b0b625 100644 --- a/filter/source/graphicfilter/ipcd/ipcd.cxx +++ b/filter/source/graphicfilter/ipcd/ipcd.cxx @@ -367,7 +367,7 @@ void PCDReader::ReadImage(sal_uLong nMinPercent, sal_uLong nMaxPercent) //================== GraphicImport - the exported Function ================ -#ifdef DISABLE_DYNLOADING +#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) #define GraphicImport icdGraphicImport #endif diff --git a/filter/source/graphicfilter/ipcx/ipcx.cxx b/filter/source/graphicfilter/ipcx/ipcx.cxx index 859a90250947..a73c64b6b071 100644 --- a/filter/source/graphicfilter/ipcx/ipcx.cxx +++ b/filter/source/graphicfilter/ipcx/ipcx.cxx @@ -399,7 +399,7 @@ void PCXReader::ImplReadPalette( sal_uLong nCol ) //================== GraphicImport - the exported function ================ -#ifdef DISABLE_DYNLOADING +#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) #define GraphicImport ipxGraphicImport #endif diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx index 9a254a535ac3..583250967d34 100644 --- a/filter/source/graphicfilter/ipict/ipict.cxx +++ b/filter/source/graphicfilter/ipict/ipict.cxx @@ -1864,7 +1864,7 @@ void PictReader::ReadPict( SvStream & rStreamPict, GDIMetaFile & rGDIMetaFile ) //================== GraphicImport - the exported function ================ -#ifdef DISABLE_DYNLOADING +#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) #define GraphicImport iptGraphicImport #endif diff --git a/filter/source/graphicfilter/ipsd/ipsd.cxx b/filter/source/graphicfilter/ipsd/ipsd.cxx index ce565ae9a3de..50c2f8e5bbe1 100644 --- a/filter/source/graphicfilter/ipsd/ipsd.cxx +++ b/filter/source/graphicfilter/ipsd/ipsd.cxx @@ -720,7 +720,7 @@ sal_Bool PSDReader::ImplReadBody() //================== GraphicImport - the exported function ================ -#ifdef DISABLE_DYNLOADING +#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) #define GraphicImport ipdGraphicImport #endif diff --git a/filter/source/graphicfilter/iras/iras.cxx b/filter/source/graphicfilter/iras/iras.cxx index 93d92737616b..c5f94626a03b 100644 --- a/filter/source/graphicfilter/iras/iras.cxx +++ b/filter/source/graphicfilter/iras/iras.cxx @@ -338,7 +338,7 @@ sal_uInt8 RASReader::ImplGetByte() //================== GraphicImport - die exportierte Funktion ================ -#ifdef DISABLE_DYNLOADING +#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) #define GraphicImport iraGraphicImport #endif diff --git a/filter/source/graphicfilter/itga/itga.cxx b/filter/source/graphicfilter/itga/itga.cxx index 60715b107500..b17c70a68fa6 100644 --- a/filter/source/graphicfilter/itga/itga.cxx +++ b/filter/source/graphicfilter/itga/itga.cxx @@ -797,7 +797,7 @@ sal_Bool TGAReader::ImplReadPalette() //================== GraphicImport - die exportierte Funktion ================ -#ifdef DISABLE_DYNLOADING +#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) #define GraphicImport itgGraphicImport #endif diff --git a/filter/source/graphicfilter/itiff/itiff.cxx b/filter/source/graphicfilter/itiff/itiff.cxx index 2f4403197461..94dbed6460d3 100644 --- a/filter/source/graphicfilter/itiff/itiff.cxx +++ b/filter/source/graphicfilter/itiff/itiff.cxx @@ -1366,7 +1366,7 @@ sal_Bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & rGraphic ) //================== GraphicImport - the exported function ================ -#ifdef DISABLE_DYNLOADING +#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS) #define GraphicImport itiGraphicImport #endif diff --git a/filter/source/odfflatxml/OdfFlatXml.cxx b/filter/source/odfflatxml/OdfFlatXml.cxx index b31b7bd1cee9..009a22104971 100644 --- a/filter/source/odfflatxml/OdfFlatXml.cxx +++ b/filter/source/odfflatxml/OdfFlatXml.cxx @@ -222,7 +222,7 @@ Reference< XInterface > SAL_CALL OdfFlatXml::impl_createInstance(const Reference } extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL -component_getFactory( const sal_Char* pImplementationName, +odfflatxml_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, void* /* pRegistryKey */ ) { diff --git a/filter/source/odfflatxml/odfflatxml.component b/filter/source/odfflatxml/odfflatxml.component index 35238af22ccd..b3ac6363ac21 100644 --- a/filter/source/odfflatxml/odfflatxml.component +++ b/filter/source/odfflatxml/odfflatxml.component @@ -28,7 +28,7 @@ * instead of those above. */ --> -<component loader="com.sun.star.loader.SharedLibrary" +<component loader="com.sun.star.loader.SharedLibrary" prefix="odfflatxml" xmlns="http://openoffice.org/2010/uno-components"> <implementation name="com.sun.star.comp.filter.OdfFlatXml"> <service name="com.sun.star.document.ImportFilter"/> diff --git a/filter/source/placeware/exporter.cxx b/filter/source/placeware/exporter.cxx index 393394c6097a..9c93c16491fa 100644 --- a/filter/source/placeware/exporter.cxx +++ b/filter/source/placeware/exporter.cxx @@ -181,7 +181,7 @@ static OString convertString( OUString aInput ) return aRet; } -static void createSlideFile( Reference< XComponent > xDoc, ZipFile& rZipFile, const OUString& rURL, vector< PageEntry* >& rPageEntries ) throw( ::com::sun::star::uno::Exception ) +static void createSlideFile( Reference< XComponent > xDoc, PlacewareZipFile& rZipFile, const OUString& rURL, vector< PageEntry* >& rPageEntries ) throw( ::com::sun::star::uno::Exception ) { OString aInfo; @@ -326,7 +326,7 @@ sal_Bool PlaceWareExporter::doExport( Reference< XComponent > xDoc, Reference < // Create new package... try { - ZipFile aZipFile(aTempFile); + PlacewareZipFile aZipFile(aTempFile); // export slides as gifs and collect information for slides diff --git a/filter/source/placeware/zip.cxx b/filter/source/placeware/zip.cxx index 57a86fa0f6d2..37de64a4316b 100644 --- a/filter/source/placeware/zip.cxx +++ b/filter/source/placeware/zip.cxx @@ -44,8 +44,8 @@ static osl::File::RC putC( unsigned char c, osl::File& rFile ) return nRC; } -/** write a short to the ZipFile */ -void ZipFile::writeShort( sal_Int16 s) +/** write a short to the PlacewareZipFile */ +void PlacewareZipFile::writeShort( sal_Int16 s) { if( !isError() ) { @@ -55,9 +55,9 @@ void ZipFile::writeShort( sal_Int16 s) } } -/** write a long to the ZipFile */ +/** write a long to the PlacewareZipFile */ -void ZipFile::writeLong( sal_Int32 l ) +void PlacewareZipFile::writeLong( sal_Int32 l ) { if( !isError() ) { @@ -78,7 +78,7 @@ void ZipFile::writeLong( sal_Int32 l ) } /** copy the zipentries file to the zipfile and updates the crc of that zipentry */ -void ZipFile::copyAndCRC(ZipEntry *e, osl::File& rFile) +void PlacewareZipFile::copyAndCRC(ZipEntry *e, osl::File& rFile) { char buf[2048]; sal_uInt64 n, nWritten; @@ -112,7 +112,7 @@ void ZipFile::copyAndCRC(ZipEntry *e, osl::File& rFile) } /** write a yet empty local header for a zipentry to the zipfile */ -void ZipFile::writeDummyLocalHeader(ZipEntry *e) +void PlacewareZipFile::writeDummyLocalHeader(ZipEntry *e) { sal_Int32 len = zf_lfhSIZE + e->name.getLength(); sal_Int32 i; @@ -129,7 +129,7 @@ void ZipFile::writeDummyLocalHeader(ZipEntry *e) } /** write the local header for a zipentry to the zipfile */ -void ZipFile::writeLocalHeader(ZipEntry *e) +void PlacewareZipFile::writeLocalHeader(ZipEntry *e) { TimeValue aTime; osl_getSystemTime( &aTime ); @@ -171,7 +171,7 @@ void ZipFile::writeLocalHeader(ZipEntry *e) } /* write a zipentry in the central dir to the zipfile */ -void ZipFile::writeCentralDir(ZipEntry *e) +void PlacewareZipFile::writeCentralDir(ZipEntry *e) { writeLong(zf_CDHSIGValue); // magic number writeShort(zf_Vers(1, 0)); // version made by @@ -198,7 +198,7 @@ void ZipFile::writeCentralDir(ZipEntry *e) } /* write the end of the central dir to the zipfile */ -void ZipFile::writeEndCentralDir(sal_Int32 nCdOffset, sal_Int32 nCdSize) +void PlacewareZipFile::writeEndCentralDir(sal_Int32 nCdOffset, sal_Int32 nCdSize) { writeLong(zf_ECDSIGValue); // magic number writeShort(0); // disk num @@ -218,12 +218,12 @@ void ZipFile::writeEndCentralDir(sal_Int32 nCdOffset, sal_Int32 nCdSize) /* Create a zip file for writing, return a handle for it. * RETURNS: A new zip-file output object, or NULL if it failed, in * which case *errMsgBuffer will contain an error message string. */ -ZipFile::ZipFile(osl::File& rFile ) +PlacewareZipFile::PlacewareZipFile(osl::File& rFile ) : mrFile( rFile ), mbOpen( true ), mnRC( osl::File::E_None ) { } -ZipFile::~ZipFile() +PlacewareZipFile::~PlacewareZipFile() { if( mbOpen ) close(); @@ -233,7 +233,7 @@ ZipFile::~ZipFile() * RETURNS: true if successful, else false. If false, the caller should * call zip_Close() and delete the bum zip file. */ -bool ZipFile::addFile( osl::File& rFile, const OString& rName ) +bool PlacewareZipFile::addFile( osl::File& rFile, const OString& rName ) { OSL_ASSERT( mbOpen ); @@ -272,7 +272,7 @@ bool ZipFile::addFile( osl::File& rFile, const OString& rName ) /* Finish up the zip file, close it, and deallocate the zip file object. * RETURNS: true if successful, else false. */ -bool ZipFile::close() +bool PlacewareZipFile::close() { OSL_ASSERT( mbOpen ); diff --git a/filter/source/placeware/zip.hxx b/filter/source/placeware/zip.hxx index 909400f3f95a..1dd7a65c4739 100644 --- a/filter/source/placeware/zip.hxx +++ b/filter/source/placeware/zip.hxx @@ -25,11 +25,11 @@ struct ZipEntry; -class ZipFile +class PlacewareZipFile { public: - ZipFile( osl::File& rFile ); - ~ZipFile(); + PlacewareZipFile( osl::File& rFile ); + ~PlacewareZipFile(); bool addFile( osl::File& rFile, const OString& rName ); bool close(); diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index b0cb22fb8851..a0209c8c4422 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -33,23 +33,57 @@ gb_EXTRAMERGEDLIBS := \ $(call gb_Helper_optional,DBCONNECTIVITY,dba) \ $(call gb_Helper_optional,DBCONNECTIVITY,dbtools) \ $(call gb_Helper_optional,DBCONNECTIVITY,dbu) \ + $(call gb_Helper_optional,EXPORT,egi) \ + $(call gb_Helper_optional,EXPORT,eme) \ + $(call gb_Helper_optional,EXPORT,epb) \ + $(call gb_Helper_optional,EXPORT,epg) \ + $(call gb_Helper_optional,EXPORT,epp) \ + $(call gb_Helper_optional,EXPORT,eps) \ + $(call gb_Helper_optional,EXPORT,ept) \ + $(call gb_Helper_optional,EXPORT,era) \ + $(call gb_Helper_optional,EXPORT,eti) \ + $(call gb_Helper_optional,EXPORT,exp) \ $(call gb_Helper_optional,DBCONNECTIVITY,file) \ + flash \ for \ forui \ fwl \ + graphicfilter \ + icd \ + icg \ + idx \ + ime \ + ipb \ + ipd \ + ips \ + ipt \ + ipx \ + ira \ + itg \ + iti \ $(if $(filter-out ANDROID IOS,$(OS)),odbcbase) \ + odfflatxml \ oox \ + pdffilter \ + placeware \ $(call gb_Helper_optional,PYUNO,pyuno) \ $(call gb_Helper_optional,DBCONNECTIVITY,rpt) \ sd \ + svgfilter \ swd \ + t602filter \ test \ + textfd \ unotest \ $(if $(DISABLE_SCRIPTING),,vbahelper) \ - xmlsecurity + xmlfa \ + xmlfd \ + xmlsecurity \ + xsltfilter # FIXME: just retaining these for now - they currently crash & need thought. #gb_EXTRAMERGEDLIBS := \ + comphelper \ sc \ sw \ |