mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add filter libs to libmerged

Browse Source 
Change-Id: I1891d1499aae87a87436bc9aaf4f70203dfbb585
This commit is contained in:
Peter Foley
2013-04-14 17:24:38 -04:00
parent 4960f66519
commit 1472c5ed16
33 changed files with 93 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Library_merged.mk
View File

@@ -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 \

2
drawinglayer/drawinglayer.component
View File

@@ -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"/>

4
drawinglayer/source/drawinglayeruno/drawinglayeruno.cxx
View File

@@ -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;

4
filter/qa/cppunit/filters-pict-test.cxx
View File

@@ -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

4
filter/qa/cppunit/filters-tga-test.cxx
View File

@@ -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

4
filter/qa/cppunit/filters-tiff-test.cxx
View File

@@ -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

2
filter/source/graphicfilter/egif/egif.cxx
View File

@@ -558,7 +558,7 @@ void GIFWriter::WriteTerminator()
// ------------------------------------------------------------------------
#ifdef DISABLE_DYNLOADING
#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS)
#define GraphicExport egiGraphicExport
#endif

2
filter/source/graphicfilter/eos2met/eos2met.cxx
View File

@@ -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

2
filter/source/graphicfilter/epbm/epbm.cxx
View File

@@ -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

2
filter/source/graphicfilter/epgm/epgm.cxx
View File

@@ -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

2
filter/source/graphicfilter/epict/epict.cxx
View File

@@ -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

2
filter/source/graphicfilter/eppm/eppm.cxx
View File

@@ -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

2
filter/source/graphicfilter/eps/eps.cxx
View File

@@ -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

2
filter/source/graphicfilter/eras/eras.cxx
View File

@@ -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

2
filter/source/graphicfilter/etiff/etiff.cxx
View File

@@ -596,7 +596,7 @@ void TIFFWriter::EndCompression()
// - exported function -
// ---------------------
#ifdef DISABLE_DYNLOADING
#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS)
#define GraphicExport etiGraphicExport
#endif

2
filter/source/graphicfilter/expm/expm.cxx
View File

@@ -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

2
filter/source/graphicfilter/idxf/idxf.cxx
View File

@@ -29,7 +29,7 @@ class FilterConfigItem;
//================== GraphicImport - die exportierte Funktion ================
#ifdef DISABLE_DYNLOADING
#if defined(DISABLE_DYNLOADING) || defined(LIBO_MERGELIBS)
#define GraphicImport idxGraphicImport
#endif

2
filter/source/graphicfilter/ieps/ieps.cxx
View File

@@ -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

2
filter/source/graphicfilter/ios2met/ios2met.cxx
View File

@@ -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

2
filter/source/graphicfilter/ipbm/ipbm.cxx
View File

@@ -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

2
filter/source/graphicfilter/ipcd/ipcd.cxx
View File

@@ -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

2
filter/source/graphicfilter/ipcx/ipcx.cxx
View File

@@ -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

2
filter/source/graphicfilter/ipict/ipict.cxx
View File

@@ -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

2
filter/source/graphicfilter/ipsd/ipsd.cxx
View File

@@ -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

2
filter/source/graphicfilter/iras/iras.cxx
View File

@@ -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

2
filter/source/graphicfilter/itga/itga.cxx
View File

@@ -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

2
filter/source/graphicfilter/itiff/itiff.cxx
View File

@@ -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

2
filter/source/odfflatxml/OdfFlatXml.cxx
View File

@@ -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 */ )
{

2
filter/source/odfflatxml/odfflatxml.component
View File

@@ -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"/>

4
filter/source/placeware/exporter.cxx
View File

@@ -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

26
filter/source/placeware/zip.cxx
View File

@@ -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 );

6
filter/source/placeware/zip.hxx
View File

@@ -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();

36
solenv/gbuild/extensions/pre_MergedLibsList.mk
View File

@@ -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 \