Library_merged.mk | 3 - drawinglayer/drawinglayer.component | 2 drawinglayer/source/drawinglayeruno/drawinglayeruno.cxx | 4 - filter/qa/cppunit/filters-pict-test.cxx | 4 + filter/qa/cppunit/filters-tga-test.cxx | 4 + filter/qa/cppunit/filters-tiff-test.cxx | 4 + filter/source/graphicfilter/egif/egif.cxx | 2 filter/source/graphicfilter/eos2met/eos2met.cxx | 2 filter/source/graphicfilter/epbm/epbm.cxx | 2 filter/source/graphicfilter/epgm/epgm.cxx | 2 filter/source/graphicfilter/epict/epict.cxx | 2 filter/source/graphicfilter/eppm/eppm.cxx | 2 filter/source/graphicfilter/eps/eps.cxx | 2 filter/source/graphicfilter/eras/eras.cxx | 2 filter/source/graphicfilter/etiff/etiff.cxx | 2 filter/source/graphicfilter/expm/expm.cxx | 2 filter/source/graphicfilter/idxf/idxf.cxx | 2 filter/source/graphicfilter/ieps/ieps.cxx | 2 filter/source/graphicfilter/ios2met/ios2met.cxx | 2 filter/source/graphicfilter/ipbm/ipbm.cxx | 2 filter/source/graphicfilter/ipcd/ipcd.cxx | 2 filter/source/graphicfilter/ipcx/ipcx.cxx | 2 filter/source/graphicfilter/ipict/ipict.cxx | 2 filter/source/graphicfilter/ipsd/ipsd.cxx | 2 filter/source/graphicfilter/iras/iras.cxx | 2 filter/source/graphicfilter/itga/itga.cxx | 2 filter/source/graphicfilter/itiff/itiff.cxx | 2 filter/source/odfflatxml/OdfFlatXml.cxx | 2 filter/source/odfflatxml/odfflatxml.component | 2 filter/source/placeware/exporter.cxx | 4 - filter/source/placeware/zip.cxx | 26 ++++----- filter/source/placeware/zip.hxx | 6 +- solenv/gbuild/LinkTarget.mk | 28 ++++++++- solenv/gbuild/extensions/pre_MergedLibsList.mk | 45 +++++++++++++++- 34 files changed, 126 insertions(+), 50 deletions(-)
New commits: commit bd956534b696faec24d2dbf2ca064585099d0704 Author: Peter Foley <[email protected]> Date: Sun Apr 14 18:31:03 2013 -0400 add connectivity libs to libmerged Change-Id: Ia82c3a036ef04e24f7494b6a5a54d01e1b5a58d2 diff --git a/solenv/gbuild/extensions/pre_MergedLibsList.mk b/solenv/gbuild/extensions/pre_MergedLibsList.mk index a0209c8..bf4bd06 100644 --- a/solenv/gbuild/extensions/pre_MergedLibsList.mk +++ b/solenv/gbuild/extensions/pre_MergedLibsList.mk @@ -29,8 +29,10 @@ ifneq ($(MERGELIBS),) # set of libraries to link even more stuff into one merged library gb_EXTRAMERGEDLIBS := \ $(if $(filter unx,$(GUIBASE)),basebmp) \ + $(call gb_Helper_optional,DBCONNECTIVITY,calc) \ chartcore \ $(call gb_Helper_optional,DBCONNECTIVITY,dba) \ + $(call gb_Helper_optional,DBCONNECTIVITY,dbase) \ $(call gb_Helper_optional,DBCONNECTIVITY,dbtools) \ $(call gb_Helper_optional,DBCONNECTIVITY,dbu) \ $(call gb_Helper_optional,EXPORT,egi) \ @@ -44,11 +46,13 @@ gb_EXTRAMERGEDLIBS := \ $(call gb_Helper_optional,EXPORT,eti) \ $(call gb_Helper_optional,EXPORT,exp) \ $(call gb_Helper_optional,DBCONNECTIVITY,file) \ + $(call gb_Helper_optional,DBCONNECTIVITY,flat) \ flash \ for \ forui \ fwl \ graphicfilter \ + $(if $(filter TRUE,$(SOLAR_JAVA)),hsqldb) \ icd \ icg \ idx \ @@ -61,6 +65,10 @@ gb_EXTRAMERGEDLIBS := \ ira \ itg \ iti \ + $(if $(filter TRUE,$(SOLAR_JAVA)),jdbc) \ + $(call gb_Helper_optional,DBCONNECTIVITY,mork) \ + $(call gb_Helper_optional,DBCONNECTIVITY,mysql) \ + $(if $(filter-out ANDROID IOS,$(OS)),odbc) \ $(if $(filter-out ANDROID IOS,$(OS)),odbcbase) \ odfflatxml \ oox \ @@ -69,6 +77,7 @@ gb_EXTRAMERGEDLIBS := \ $(call gb_Helper_optional,PYUNO,pyuno) \ $(call gb_Helper_optional,DBCONNECTIVITY,rpt) \ sd \ + $(call gb_Helper_optional,DBCONNECTIVITY,sdbc2) \ svgfilter \ swd \ t602filter \ commit 1472c5ed16744e1ec918fdb18feaf868dd5a1c47 Author: Peter Foley <[email protected]> Date: Sun Apr 14 17:24:38 2013 -0400 add filter libs to libmerged Change-Id: I1891d1499aae87a87436bc9aaf4f70203dfbb585 diff --git a/Library_merged.mk b/Library_merged.mk index 009cfb2..044df38 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 9f3c0c0..2f1d892 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 f2ef2d3..43795bc 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 d69cf30..36d8d22 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 cc831b1..a30c277 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 542522b..1c9f03f 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 0862820..0f701f9 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 9e5ae3b..f5a5a23 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 19f6b43..4080d70 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 5c7738b..47c0860 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 3c02e0a..155a7df 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 e23bbbc..666135a 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 4d9cd3e..b48fba7 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 44506c4..77d6009 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 9949974..6475c90 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 43fe370..7af3eca 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 bfb1edc..b2639b3 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 6c6265c..e45b1dd 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 b563449..834bd11 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 4d92b48..f9b7f93 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 a463aa6..d9f249b 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 859a902..a73c64b 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 9a254a5..5832509 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 ce565ae..50c2f8e 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 93d9273..c5f9462 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 60715b1..b17c70a 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 2f44031..94dbed6 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 b31b7bd..009a221 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 35238af..b3ac636 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 393394c..9c93c16 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 57a86fa..37de64a 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 909400f..1dd7a65 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 b0cb22f..a0209c8 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 \ commit 4960f665194760fc913cbfb97d35c1c182bbdd0d Author: Peter Foley <[email protected]> Date: Sun Apr 14 16:59:08 2013 -0400 Don't build unneccesary libraries twice Only the libs that are deps of build-time tools need to be built twice to avoid circular deps. all other merged libraries are never linked to. Change-Id: I75b85ed3056413adae12f1d55764fa7c117b3f45 diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk index 98964d7..0d5f24b 100644 --- a/solenv/gbuild/LinkTarget.mk +++ b/solenv/gbuild/LinkTarget.mk @@ -443,7 +443,9 @@ mv $${TEMPFILE} $(call gb_LinkTarget_get_objects_list,$(2)) endef $(call gb_LinkTarget_get_target,%) : $(call gb_LinkTarget_get_headers_target,%) $(gb_Helper_MISCDUMMY) - $(call gb_LinkTarget__command,$@,$*) + $(if $(filter $*,$(foreach lib,$(gb_MERGEDLIBS) $(gb_URELIBS),$(call gb_Library_get_linktargetname,$(lib)))),\ + $(if $(filter $(true),$(call gb_LinkTarget__is_build_lib,$*)),\ + $(call gb_LinkTarget__command,$@,$*),mkdir -p $(dir $@) && echo invalid > $@),$(call gb_LinkTarget__command,$@,$*)) $(call gb_LinkTarget__command_objectlist,$@,$*) ifeq ($(gb_FULLDEPS),$(true)) @@ -836,8 +838,26 @@ $(call gb_LinkTarget_get_external_headers_target,$(1)) : \ endef -define gb_Linktarget__is_build_tool -$(if $(filter $(1),$(addprefix Executable/,cppumaker idlc regcompare regmerge rsc svidl)),$(true),$(false)) +gb_BUILD_LIBS := basegfx \ + reg \ + sal \ + salhelper \ + store \ + tl \ + unoidl + +gb_BUILD_TOOLS := cppumaker \ + idlc \ + regmerge \ + rsc \ + svidl + +define gb_LinkTarget__is_build_lib +$(if $(filter $(1),$(foreach lib,$(gb_BUILD_LIBS),$(call gb_Library_get_linktargetname,$(lib)))),$(true),$(false)) +endef + +define gb_LinkTarget__is_build_tool +$(if $(filter $(1),$(addprefix Executable/,$(gb_BUILD_TOOLS))),$(true),$(false)) endef define gb_LinkTarget_use_libraries @@ -846,7 +866,7 @@ $$(eval $$(call gb_Output_info,currently known libraries are: $(sort $(gb_Librar $$(eval $$(call gb_Output_error,Cannot link against library/libraries $$(filter-out $(gb_Library_KNOWNLIBS),$(2)). Libraries must be registered in Repository.mk)) endif -ifeq ($(call gb_Linktarget__is_build_tool,$(1)),$(true)) +ifeq ($(call gb_LinkTarget__is_build_tool,$(1)),$(true)) $(call gb_LinkTarget__use_libraries,$(1),$(2),$(2),$(4)) else _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
