diff options
author | Peter Jentsch <pjotr@guineapics.de> | 2011-03-26 14:14:51 +0100 |
---|---|---|
committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-29 14:46:38 +0200 |
commit | dfb4b897267079fb3aa92bfcdff981dbacb864c2 (patch) | |
tree | 5165fc56957899e7d90de80a1832fd0019c4c9c5 /package | |
parent | WaE: parentheses around '&&' within '||' (diff) | |
download | core-dfb4b897267079fb3aa92bfcdff981dbacb864c2.tar.gz core-dfb4b897267079fb3aa92bfcdff981dbacb864c2.zip |
make Inflater and Deflater classes available for other packages to use
Currently, those are used within an extension function used by the
Word 2003 ML XSLT filters
Diffstat (limited to 'package')
-rw-r--r-- | package/inc/Deflater.hxx | 3 | ||||
-rw-r--r-- | package/inc/Inflater.hxx | 3 | ||||
-rw-r--r-- | package/inc/packagedllapi.hxx | 15 | ||||
-rw-r--r-- | package/prj/d.lst | 3 | ||||
-rw-r--r-- | package/source/zipapi/makefile.mk | 2 | ||||
-rw-r--r-- | package/util/makefile.mk | 1 | ||||
-rw-r--r-- | package/util/package.pmk | 2 |
7 files changed, 26 insertions, 3 deletions
diff --git a/package/inc/Deflater.hxx b/package/inc/Deflater.hxx index 6a45978de44b..cf1229d8a9fa 100644 --- a/package/inc/Deflater.hxx +++ b/package/inc/Deflater.hxx @@ -29,13 +29,14 @@ #define _DEFLATER_HXX_ #include <com/sun/star/uno/Sequence.hxx> +#include "packagedllapi.hxx" extern "C" { typedef struct z_stream_s z_stream; } -class Deflater +class DLLPUBLIC_PACKAGE Deflater { protected: com::sun::star::uno::Sequence< sal_Int8 > sInBuffer; diff --git a/package/inc/Inflater.hxx b/package/inc/Inflater.hxx index 47fe8d2b4b95..a7adcf371477 100644 --- a/package/inc/Inflater.hxx +++ b/package/inc/Inflater.hxx @@ -29,12 +29,13 @@ #define _INFLATER_HXX_ #include <com/sun/star/uno/Sequence.hxx> +#include "packagedllapi.hxx" extern "C" { typedef struct z_stream_s z_stream; } -class Inflater +class DLLPUBLIC_PACKAGE Inflater { protected: sal_Bool bFinish, bFinished, bSetParams, bNeedDict; diff --git a/package/inc/packagedllapi.hxx b/package/inc/packagedllapi.hxx new file mode 100644 index 000000000000..41e8efa4dae4 --- /dev/null +++ b/package/inc/packagedllapi.hxx @@ -0,0 +1,15 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +#ifndef INCLUDED_PACKAGEDLLAPI_H +#define INCLUDED_PACKAGEDLLAPI_H + +#include "sal/types.h" + +#if defined(DLLIMPLEMENTATION_PACKAGE) +#define DLLPUBLIC_PACKAGE SAL_DLLPUBLIC_EXPORT +#else +#define DLLPUBLIC_PACKAGE SAL_DLLPUBLIC_IMPORT +#endif + +#endif /* INCLUDED_PACKAGEDLLAPI_H */ + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/package/prj/d.lst b/package/prj/d.lst index 919a1719aa09..85f8c192df3c 100644 --- a/package/prj/d.lst +++ b/package/prj/d.lst @@ -5,3 +5,6 @@ ..\dtd\*.dtd %_DEST%\bin%_EXT%\*.* ..\%__SRC%\misc\package2.component %_DEST%\xml%_EXT%\package2.component ..\%__SRC%\misc\xstor.component %_DEST%\xml%_EXT%\xstor.component +..\inc\Inflater.hxx %_DEST%\inc%_EXT%\package\Inflater.hxx +..\inc\Deflater.hxx %_DEST%\inc%_EXT%\package\Deflater.hxx +..\inc\packagedllapi.hxx %_DEST%\inc%_EXT%\package\packagedllapi.hxx diff --git a/package/source/zipapi/makefile.mk b/package/source/zipapi/makefile.mk index 1b941fadd99b..ec8d63694ec6 100644 --- a/package/source/zipapi/makefile.mk +++ b/package/source/zipapi/makefile.mk @@ -34,12 +34,14 @@ ENABLE_EXCEPTIONS=TRUE # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk +.INCLUDE : $(PRJ)$/util$/package.pmk # --- Files -------------------------------------------------------- .IF "$(L10N_framework)"=="" .IF "$(SYSTEM_ZLIB)" == "YES" CFLAGS+=-DSYSTEM_ZLIB .ENDIF + SLOFILES= \ $(SLO)$/CRC32.obj \ $(SLO)$/ByteChucker.obj \ diff --git a/package/util/makefile.mk b/package/util/makefile.mk index 344b2cf1346f..827060accd4d 100644 --- a/package/util/makefile.mk +++ b/package/util/makefile.mk @@ -55,7 +55,6 @@ LIB1FILES= \ SHL1TARGET=$(TARGET)$(MAJOR_VERSION) SHL1IMPLIB=i$(TARGET) -SHL1VERSIONMAP=$(SOLARENV)$/src$/component.map SHL1STDLIBS=\ $(CPPULIB) \ diff --git a/package/util/package.pmk b/package/util/package.pmk new file mode 100644 index 000000000000..7d3d412b89a0 --- /dev/null +++ b/package/util/package.pmk @@ -0,0 +1,2 @@ +VISIBILITY_HIDDEN = TRUE +CDEFS += -DDLLIMPLEMENTATION_PACKAGE
\ No newline at end of file |