diff options
| author | Mathias Bauer <mba@openoffice.org> | 2009-10-08 16:48:26 +0200 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2009-10-08 16:48:26 +0200 |
| commit | cf2b56f39d57c62b17c444025f8dfe14e6149cba (patch) | |
| tree | 4f78ce1a3be92679ad3085b60ff57f4cd30bda37 /svl | |
| parent | e6b4345c7f4026cb9b3e8dee6ecc84b3531e1950 (diff) | |
#i103496#: make svl buildable
Diffstat (limited to 'svl')
170 files changed, 493 insertions, 1324 deletions
diff --git a/svl/source/svsql/converter.hxx b/svl/inc/converter.hxx index f6a5d67ca966..f6a5d67ca966 100644 --- a/svl/source/svsql/converter.hxx +++ b/svl/inc/converter.hxx diff --git a/svl/inc/makefile.mk b/svl/inc/makefile.mk index a9974d75065c..9368bce7cde1 100644 --- a/svl/inc/makefile.mk +++ b/svl/inc/makefile.mk @@ -30,13 +30,13 @@ #************************************************************************* PRJ=.. -PRJNAME=svtools +PRJNAME=svl TARGET=inc # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/svt.pmk +.INCLUDE : $(PRJ)$/util$/svl.pmk # --- Files -------------------------------------------------------- # --- Targets ------------------------------------------------------- diff --git a/svl/inc/misccfg.hxx b/svl/inc/misccfg.hxx index 3f897e1cecc3..9689b04cef89 100644 --- a/svl/inc/misccfg.hxx +++ b/svl/inc/misccfg.hxx @@ -30,7 +30,7 @@ #ifndef _SFX_MISCCFG_HXX #define _SFX_MISCCFG_HXX -#include "svtools/svtdllapi.h" +#include "svtools/svldllapi.h" #include "tools/solar.h" #include "unotools/configitem.hxx" @@ -38,7 +38,7 @@ Beschreibung: --------------------------------------------------------------------*/ -class SVT_DLLPUBLIC SfxMiscCfg : public utl::ConfigItem +class SVL_DLLPUBLIC SfxMiscCfg : public utl::ConfigItem { BOOL bPaperSize; // printer warnings BOOL bPaperOrientation; diff --git a/svl/inc/numuno.hxx b/svl/inc/numuno.hxx index c31829dec020..d6f5621246fd 100644 --- a/svl/inc/numuno.hxx +++ b/svl/inc/numuno.hxx @@ -30,7 +30,7 @@ #ifndef _NUMUNO_HXX #define _NUMUNO_HXX -#include "svtools/svtdllapi.h" +#include "svtools/svldllapi.h" #include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <cppuhelper/implbase2.hxx> @@ -57,7 +57,7 @@ com::sun::star::uno::Reference<com::sun::star::uno::XInterface> SAL_CALL // SvNumberFormatsSupplierObj: aggregate to document, // construct with SvNumberFormatter -class SVT_DLLPUBLIC SvNumberFormatsSupplierObj : public cppu::WeakAggImplHelper2< +class SVL_DLLPUBLIC SvNumberFormatsSupplierObj : public cppu::WeakAggImplHelper2< com::sun::star::util::XNumberFormatsSupplier, com::sun::star::lang::XUnoTunnel> { diff --git a/svl/inc/pch/precompiled_svtools.cxx b/svl/inc/pch/precompiled_svl.cxx index 2346d52b68af..da41b68a5eae 100644 --- a/svl/inc/pch/precompiled_svtools.cxx +++ b/svl/inc/pch/precompiled_svl.cxx @@ -28,5 +28,5 @@ * ************************************************************************/ -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" diff --git a/svl/inc/pch/precompiled_svtools.hxx b/svl/inc/pch/precompiled_svl.hxx index cab81cac04ec..b41e2ca89fc6 100644 --- a/svl/inc/pch/precompiled_svtools.hxx +++ b/svl/inc/pch/precompiled_svl.hxx @@ -421,11 +421,6 @@ #include <unotools/numberformatcodewrapper.hxx> #include <unotools/processfactory.hxx> -#include <vcl/dndhelp.hxx> -#include <vcl/fldunit.hxx> -#include <vcl/mapunit.hxx> -#include <vcl/unohelp.hxx> - #include <vos/mutex.hxx> #include <vos/process.hxx> #include <vos/ref.hxx> diff --git a/svl/inc/poolcach.hxx b/svl/inc/poolcach.hxx index 20d9e4d19c43..8e7cf3ddbfa7 100644 --- a/svl/inc/poolcach.hxx +++ b/svl/inc/poolcach.hxx @@ -30,7 +30,7 @@ #ifndef _SFXPOOLCACH_HXX #define _SFXPOOLCACH_HXX -#include "svtools/svtdllapi.h" +#include "svtools/svldllapi.h" #include <tools/solar.h> class SfxItemModifyArr_Impl; @@ -39,7 +39,7 @@ class SfxItemSet; class SfxPoolItem; class SfxSetItem; -class SVT_DLLPUBLIC SfxItemPoolCache +class SVL_DLLPUBLIC SfxItemPoolCache { SfxItemPool *pPool; SfxItemModifyArr_Impl *pCache; diff --git a/svl/inc/svl/aeitem.hxx b/svl/inc/svl/aeitem.hxx index 5cfd3d0fc15e..e10b3f7a8e70 100644 --- a/svl/inc/svl/aeitem.hxx +++ b/svl/inc/svl/aeitem.hxx @@ -30,14 +30,14 @@ #ifndef _AEITEM_HXX #define _AEITEM_HXX -#include "svtools/svtdllapi.h" +#include "svtools/svldllapi.h" #include <svtools/poolitem.hxx> #include <svtools/eitem.hxx> class SfxAllEnumValueArr; class SvUShorts; -class SVT_DLLPUBLIC SfxAllEnumItem: public SfxEnumItem +class SVL_DLLPUBLIC SfxAllEnumItem: public SfxEnumItem { SfxAllEnumValueArr* pValues; SvUShorts* pDisabledValues; diff --git a/svl/inc/svl/cjkoptions.hxx b/svl/inc/svl/cjkoptions.hxx index 1573a029f29f..03a4e0216e82 100644 --- a/svl/inc/svl/cjkoptions.hxx +++ b/svl/inc/svl/cjkoptions.hxx @@ -30,7 +30,7 @@ #ifndef _SVTOOLS_CJKOPTIONS_HXX #define _SVTOOLS_CJKOPTIONS_HXX -#include "svtools/svtdllapi.h" +#include "svtools/svldllapi.h" #include <sal/types.h> #include <unotools/options.hxx> @@ -38,7 +38,7 @@ class SvtCJKOptions_Impl; // class SvtCJKOptions -------------------------------------------------- -class SVT_DLLPUBLIC SvtCJKOptions: public utl::detail::Options +class SVL_DLLPUBLIC SvtCJKOptions: public utl::detail::Options { private: SvtCJKOptions_Impl* pImp; diff --git a/svl/inc/svl/ctloptions.hxx b/svl/inc/svl/ctloptions.hxx index 4157d129cce1..fae5e13dfbb8 100644 --- a/svl/inc/svl/ctloptions.hxx +++ b/svl/inc/svl/ctloptions.hxx @@ -30,7 +30,7 @@ #ifndef _SVTOOLS_CTLOPTIONS_HXX #define _SVTOOLS_CTLOPTIONS_HXX -#include "svtools/svtdllapi.h" +#include "svtools/svldllapi.h" #include <sal/types.h> #include <svtools/brdcst.hxx> #include <svtools/lstner.hxx> @@ -40,7 +40,7 @@ class SvtCTLOptions_Impl; // class SvtCTLOptions -------------------------------------------------------- -class SVT_DLLPUBLIC SvtCTLOptions: +class SVL_DLLPUBLIC SvtCTLOptions: public utl::detail::Options, public SfxBroadcaster, public SfxListener { private: diff --git a/svl/inc/svl/documentlockfile.hxx b/svl/inc/svl/documentlockfile.hxx index f2625f7955bb..91074908cf8a 100644 --- a/svl/inc/svl/documentlockfile.hxx +++ b/svl/inc/svl/documentlockfile.hxx @@ -32,7 +32,7 @@ #ifndef _SVT_DOCUMENTLOCKFILE_HXX #define _SVT_DOCUMENTLOCKFILE_HXX -#include <svtools/svtdllapi.h> +#include <svtools/svldllapi.h> #include <com/sun/star/io/XStream.hpp> #include <com/sun/star/io/XInputStream.hpp> @@ -45,7 +45,7 @@ namespace svt { -class SVT_DLLPUBLIC DocumentLockFile : public LockFileCommon +class SVL_DLLPUBLIC DocumentLockFile : public LockFileCommon { // the workaround for automated testing! static sal_Bool m_bAllowInteraction; diff --git a/svl/inc/svl/eitem.hxx b/svl/inc/svl/eitem.hxx index f9e1927a881d..1a9aa8fd63a0 100644 --- a/svl/inc/svl/eitem.hxx +++ b/svl/inc/svl/eitem.hxx @@ -31,11 +31,11 @@ #ifndef _SFXENUMITEM_HXX #define _SFXENUMITEM_HXX -#include "svtools/svtdllapi.h" +#include "svtools/svldllapi.h" #include <svtools/cenumitm.hxx> //============================================================================ -class SVT_DLLPUBLIC SfxEnumItem: public CntEnumItem +class SVL_DLLPUBLIC SfxEnumItem: public CntEnumItem { protected: SfxEnumItem(USHORT which = 0, USHORT nValue = 0): @@ -50,7 +50,7 @@ public: }; //============================================================================ -class SVT_DLLPUBLIC SfxBoolItem: public CntBoolItem +class SVL_DLLPUBLIC SfxBoolItem: public CntBoolItem { public: TYPEINFO(); diff --git a/svl/inc/svl/flagitem.hxx b/svl/inc/svl/flagitem.hxx index 5298bbd1678b..1ea04db955c5 100644 --- a/svl/inc/svl/flagitem.hxx +++ b/svl/inc/svl/flagitem.hxx @@ -30,7 +30,7 @@ #ifndef _SFXFLAGITEM_HXX #define _SFXFLAGITEM_HXX -#include "svtools/svtdllapi.h" +#include "svtools/svldllapi.h" #include <tools/solar.h> #include <tools/rtti.hxx> #include <svtools/poolitem.hxx> @@ -41,9 +41,9 @@ extern USHORT nSfxFlagVal[16]; // ----------------------------------------------------------------------- -DBG_NAMEEX_VISIBILITY(SfxFlagItem, SVT_DLLPUBLIC) +DBG_NAMEEX_VISIBILITY(SfxFlagItem, SVL_DLLPUBLIC) -class SVT_DLLPUBLIC SfxFlagItem: public SfxPoolItem +class SVL_DLLPUBLIC SfxFlagItem: public SfxPoolItem { USHORT nVal; diff --git a/svl/inc/svl/globalnameitem.hxx b/svl/inc/svl/globalnameitem.hxx index f19ea1dd8457..7e01d3487d95 100644 --- a/svl/inc/svl/globalnameitem.hxx +++ b/svl/inc/svl/globalnameitem.hxx @@ -30,7 +30,7 @@ #ifndef _GLOBALNAMEITEM_HXX #define _GLOBALNAMEITEM_HXX -#include "svtools/svtdllapi.h" +#include "svtools/svldllapi.h" #include <tools/solar.h> #include <tools/rtti.hxx> #include <tools/globname.hxx> @@ -38,7 +38,7 @@ // ----------------------------------------------------------------------- -class SVT_DLLPUBLIC SfxGlobalNameItem: public SfxPoolItem +class SVL_DLLPUBLIC SfxGlobalNameItem: public SfxPoolItem { SvGlobalName m_aName; diff --git a/svl/inc/svl/imageitm.hxx b/svl/inc/svl/imageitm.hxx index e0151729c2e0..ec5552e3d217 100644 --- a/svl/inc/svl/imageitm.hxx +++ b/svl/inc/svl/imageitm.hxx @@ -31,13 +31,13 @@ #ifndef _SVT_IMAGEITM_HXX #define _SVT_IMAGEITM_HXX -#include "svtools/svtdllapi.h" +#include "svtools/svldllapi.h" #include <svtools/intitem.hxx> class String; struct SfxImageItem_Impl; -class SVT_DLLPUBLIC SfxImageItem : public SfxInt16Item +class SVL_DLLPUBLIC SfxImageItem : public SfxInt16Item { SfxImageItem_Impl* pImp; public: diff --git a/svl/inc/svl/intitem.hxx b/svl/inc/svl/intitem.hxx index fe2a3543e630..d54267eb4de1 100644 --- a/svl/inc/svl/intitem.hxx +++ b/svl/inc/svl/intitem.hxx @@ -31,11 +31,11 @@ #ifndef _SFXINTITEM_HXX #define _SFXINTITEM_HXX -#include "svtools/svtdllapi.h" +#include "svtools/svldllapi.h" #include <svtools/cintitem.hxx> //============================================================================ -class SVT_DLLPUBLIC SfxByteItem: public CntByteItem +class SVL_DLLPUBLIC SfxByteItem: public CntByteItem { public: TYPEINFO(); @@ -53,9 +53,9 @@ public: }; //============================================================================ -DBG_NAMEEX_VISIBILITY(SfxInt16Item, SVT_DLLPUBLIC) +DBG_NAMEEX_VISIBILITY(SfxInt16Item, SVL_DLLPUBLIC) -class SVT_DLLPUBLIC SfxInt16Item: public SfxPoolItem +class SVL_DLLPUBLIC SfxInt16Item: public SfxPoolItem { INT16 m_nValue; @@ -115,7 +115,7 @@ inline void SfxInt16Item::SetValue(INT16 nTheValue) } //============================================================================ -class SVT_DLLPUBLIC SfxUInt16Item: public CntUInt16Item +class SVL_DLLPUBLIC SfxUInt16Item: public CntUInt16Item { public: TYPEINFO(); @@ -134,7 +134,7 @@ public: }; //============================================================================ -class SVT_DLLPUBLIC SfxInt32Item: public CntInt32Item +class SVL_DLLPUBLIC SfxInt32Item: public CntInt32Item { public: TYPEINFO(); @@ -154,7 +154,7 @@ public: }; //============================================================================ -class SVT_DLLPUBLIC SfxUInt32Item: public CntUInt32Item +class SVL_DLLPUBLIC SfxUInt32Item: public CntUInt32Item { public: TYPEINFO(); diff --git a/svl/inc/svl/languageoptions.hxx b/svl/inc/svl/languageoptions.hxx index ed247ac01fa3..52ec53089b8a 100644 --- a/svl/inc/svl/languageoptions.hxx +++ b/svl/inc/svl/languageoptions.hxx @@ -30,7 +30,7 @@ #ifndef _SVTOOLS_LANGUAGEOPTIONS_HXX #define _SVTOOLS_LANGUAGEOPTIONS_HXX -#include "svtools/svtdllapi.h" +#include "svtools/svldllapi.h" #include <sal/types.h> #include <svtools/brdcst.hxx> #include <svtools/lstner.hxx> @@ -47,7 +47,7 @@ class SvtCJKOptions; class SvtCTLOptions; -class SVT_DLLPUBLIC SvtLanguageOptions : public SfxBroadcaster, public SfxListener +class SVL_DLLPUBLIC SvtLanguageOptions : public SfxBroadcaster, public SfxListener { private: SvtCJKOptions* m_pCJKOptions; @@ -113,7 +113,7 @@ public: }; /** #i42730# Gives access to the Windows 16bit system locale */ -class SVT_DLLPUBLIC SvtSystemLanguageOptions : public utl::ConfigItem +class SVL_DLLPUBLIC SvtSystemLanguageOptions : public utl::ConfigItem { private: ::rtl::OUString m_sWin16SystemLocale; diff --git a/svl/inc/svl/lockfilecommon.hxx b/svl/inc/svl/lockfilecommon.hxx index c8bd6251f9cb..7d97d6c952cd 100644 --- a/svl/inc/svl/lockfilecommon.hxx +++ b/svl/inc/svl/lockfilecommon.hxx @@ -32,7 +32,7 @@ #ifndef _SVT_LOCKFILECOMMON_HXX #define _SVT_LOCKFILECOMMON_HXX -#include <svtools/svtdllapi.h> +#include <svtools/svldllapi.h> #include <com/sun/star/io/XStream.hpp> #include <com/sun/star/io/XInputStream.hpp> @@ -54,7 +54,7 @@ namespace svt { // This is a general implementation that is used in document lock file implementation and in sharing control file implementation -class SVT_DLLPUBLIC LockFileCommon +class SVL_DLLPUBLIC LockFileCommon { protected: ::osl::Mutex m_aMutex; diff --git a/svl/inc/svl/macitem.hxx b/svl/inc/svl/macitem.hxx index 2e43120f653d..f1790bf5f294 100644 --- a/svl/inc/svl/macitem.hxx +++ b/svl/inc/svl/macitem.hxx @@ -32,7 +32,7 @@ // class SvxMacroItem ---------------------------------------------------- -#include "svtools/svtdllapi.h" +#include "svtools/svldllapi.h" #include <svtools/poolitem.hxx> #include <tools/rtti.hxx> #include <tools/debug.hxx> @@ -72,7 +72,7 @@ public: class SjJSbxObject; -class SVT_DLLPUBLIC SvxMacro +class SVL_DLLPUBLIC SvxMacro { String aMacName; String aLibName; @@ -125,7 +125,7 @@ DECLARE_TABLE( _SvxMacroTableDtor, SvxMacro* ) #define SVX_MACROTBL_AKTVERSION SVX_MACROTBL_VERSION40 -class SVT_DLLPUBLIC SvxMacroTableDtor : public _SvxMacroTableDtor +class SVL_DLLPUBLIC SvxMacroTableDtor : public _SvxMacroTableDtor { public: inline SvxMacroTableDtor( const USHORT nInitSz = 0, const USHORT nReSz = 1 ); @@ -152,7 +152,7 @@ inline SvxMacroTableDtor::SvxMacroTableDtor( const USHORT nInitSz, Dieses Item beschreibt eine Makro-Tabelle. */ -class SVT_DLLPUBLIC SvxMacroItem: public SfxPoolItem +class SVL_DLLPUBLIC SvxMacroItem: public SfxPoolItem { public: TYPEINFO(); diff --git a/svl/inc/svl/metitem.hxx b/svl/inc/svl/metitem.hxx index a37d119d57c1..0289d5cb8e00 100644 --- a/svl/inc/svl/metitem.hxx +++ b/svl/inc/svl/metitem.hxx @@ -30,14 +30,14 @@ #ifndef _SFXMETRICITEM_HXX #define _SFXMETRICITEM_HXX -#include "svtools/svtdllapi.h" +#include "svtools/svldllapi.h" #include <svtools/intitem.hxx> -DBG_NAMEEX_VISIBILITY(SfxMetricItem, SVT_DLLPUBLIC) +DBG_NAMEEX_VISIBILITY(SfxMetricItem, SVL_DLLPUBLIC) // ----------------------------------------------------------------------- -class SVT_DLLPUBLIC SfxMetricItem: public SfxInt32Item +class SVL_DLLPUBLIC SfxMetricItem: public SfxInt32Item { public: TYPEINFO(); diff --git a/svl/inc/svl/ownlist.hxx b/svl/inc/svl/ownlist.hxx index 472f50e6ef60..397e4f532521 100644 --- a/svl/inc/svl/ownlist.hxx +++ b/svl/inc/svl/ownlist.hxx @@ -31,7 +31,7 @@ #ifndef _OWNLIST_HXX #define _OWNLIST_HXX -#include "svtools/svtdllapi.h" +#include "svtools/svldllapi.h" #include <tools/stream.hxx> #include <tools/ownlist.hxx> #include <com/sun/star/uno/Sequence.hxx> @@ -79,7 +79,7 @@ public: }; //========================================================================= -class SVT_DLLPUBLIC SvCommandList +class SVL_DLLPUBLIC SvCommandList /* [Beschreibung] Die Liste enth"alt Objekte vom Typ SvCommand. Wird ein Objekt @@ -95,8 +95,8 @@ class SVT_DLLPUBLIC SvCommandList BOOL FillFromSequence( const com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& ); void FillSequence( com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue >& ); - SVT_DLLPUBLIC friend SvStream& operator >> ( SvStream& rStm, SvCommandList & ); - SVT_DLLPUBLIC friend SvStream& operator << ( SvStream&, const SvCommandList & ); + SVL_DLLPUBLIC friend SvStream& operator >> ( SvStream& rStm, SvCommandList & ); + SVL_DLLPUBLIC friend SvStream& operator << ( SvStream&, const SvCommandList & ); }; #endif // _OWNLIST_HXX diff --git a/svl/inc/svl/ptitem.hxx b/svl/inc/svl/ptitem.hxx index 923ab73da1d5..5ce99c09b98f 100644 --- a/svl/inc/svl/ptitem.hxx +++ b/svl/inc/svl/ptitem.hxx @@ -30,17 +30,17 @@ #ifndef _SFXPTITEM_HXX #define _SFXPTITEM_HXX -#include "svtools/svtdllapi.h" +#include "svtools/svldllapi.h" #include <svtools/poolitem.hxx> #include <tools/gen.hxx> class SvStream; -DBG_NAMEEX_VISIBILITY(SfxPointItem, SVT_DLLPUBLIC) +DBG_NAMEEX_VISIBILITY(SfxPointItem, SVL_DLLPUBLIC) // ----------------------------------------------------------------------- -class SVT_DLLPUBLIC SfxPointItem: public SfxPoolItem +class SVL_DLLPUBLIC SfxPointItem: public SfxPoolItem { Point aVal; diff --git a/svl/inc/svl/rectitem.hxx b/svl/inc/svl/rectitem.hxx index 39c85d9ab228..b71705fc2047 100644 --- a/svl/inc/svl/rectitem.hxx +++ b/svl/inc/svl/rectitem.hxx @@ -30,18 +30,18 @@ #ifndef _SFXRECTITEM_HXX #define _SFXRECTITEM_HXX -#include "svtools/svtdllapi.h" +#include "svtools/svldllapi.h" #include <tools/debug.hxx> #include <tools/gen.hxx> #include <svtools/poolitem.hxx> class SvStream; -DBG_NAMEEX_VISIBILITY(SfxRectangleItem, SVT_DLLPUBLIC) +DBG_NAMEEX_VISIBILITY(SfxRectangleItem, SVL_DLLPUBLIC) // ----------------------------------------------------------------------- -class SVT_DLLPUBLIC SfxRectangleItem: public SfxPoolItem +class SVL_DLLPUBLIC SfxRectangleItem: public SfxPoolItem { Rectangle aVal; diff --git a/svl/inc/svl/restrictedpaths.hxx b/svl/inc/svl/restrictedpaths.hxx index 218e34cd4556..057c83cac7d1 100644 --- a/svl/inc/svl/restrictedpaths.hxx +++ b/svl/inc/svl/restrictedpaths.hxx @@ -32,14 +32,14 @@ #define SVTOOLS_RESTRICTEDPATHS_HXX #include <svtools/urlfilter.hxx> -#include <svtools/svtdllapi.h> +#include <svtools/svldllapi.h> #include <tools/string.hxx> #include <vector> namespace svt { - class SVT_DLLPUBLIC RestrictedPaths : public IUrlFilter + class SVL_DLLPUBLIC RestrictedPaths : public IUrlFilter { private: ::std::vector< String > m_aUnrestrictedURLs; diff --git a/svl/inc/svl/rngitem.hxx b/svl/inc/svl/rngitem.hxx index 52831f93f71f..92ab50b751e6 100644 --- a/svl/inc/svl/rngitem.hxx +++ b/svl/inc/svl/rngitem.hxx @@ -53,14 +53,14 @@ #define _SFXRNGITEM_HXX #else -#include "svtools/svtdllapi.h" +#include "svtools/svldllapi.h" #include <svtools/poolitem.hxx> class SvStream; // ----------------------------------------------------------------------- -class SVT_DLLPUBLIC SfxXRangeItem : public SfxPoolItem +class SVL_DLLPUBLIC SfxXRangeItem : public SfxPoolItem { private: NUMTYPE nFrom; @@ -89,7 +89,7 @@ public: // ----------------------------------------------------------------------- -class SVT_DLLPUBLIC SfxXRangesItem : public SfxPoolItem +class SVL_DLLPUBLIC SfxXRangesItem : public SfxPoolItem { private: NUMTYPE* _pRanges; diff --git a/svl/inc/svl/sharecontrolfile.hxx b/svl/inc/svl/sharecontrolfile.hxx index 8735f8c5ccf7..a926e6124e8c 100644 --- a/svl/inc/svl/sharecontrolfile.hxx +++ b/svl/inc/svl/sharecontrolfile.hxx @@ -31,7 +31,7 @@ #ifndef _SVT_SHARECONTROLFILE_HXX #define _SVT_SHARECONTROLFILE_HXX -#include <svtools/svtdllapi.h> +#include <svtools/svldllapi.h> #include <com/sun/star/io/XStream.hpp> #include <com/sun/star/io/XInputStream.hpp> @@ -51,7 +51,7 @@ namespace svt { -class SVT_DLLPUBLIC ShareControlFile : public LockFileCommon +class SVL_DLLPUBLIC ShareControlFile : public LockFileCommon { ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > m_xStream; ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > m_xInputStream; diff --git a/svl/inc/svl/stritem.hxx b/svl/inc/svl/stritem.hxx index a2430b142c1d..84a0be6b9fd1 100644 --- a/svl/inc/svl/stritem.hxx +++ b/svl/inc/svl/stritem.hxx @@ -31,11 +31,11 @@ #ifndef _SFXSTRITEM_HXX #define _SFXSTRITEM_HXX -#include "svtools/svtdllapi.h" +#include "svtools/svldllapi.h" #include <svtools/custritm.hxx> //============================================================================ -class SVT_DLLPUBLIC SfxStringItem: public CntUnencodedStringItem +class SVL_DLLPUBLIC SfxStringItem: public CntUnencodedStringItem { public: TYPEINFO(); diff --git a/svl/inc/svl/style.hxx b/svl/inc/svl/style.hxx index 17e4bf7b9c06..f560c10e8901 100644 --- a/svl/inc/svl/style.hxx +++ b/svl/inc/svl/style.hxx @@ -38,7 +38,7 @@ #include <vector> #include <comphelper/weak.hxx> #include <cppuhelper/implbase2.hxx> -#include "svtools/svtdllapi.h" +#include "svtools/svldllapi.h" #include <rsc/rscsfx.hxx> #include <tools/string.hxx> #include <svtools/hint.hxx> @@ -91,7 +91,7 @@ SfxStyleSheetHint( SFX_STYLESHEET_ERASED, *p ) from: #define VIRTUAL510 virtual -class SVT_DLLPUBLIC SfxStyleSheetBase : public comphelper::OWeakTypeObject +class SVL_DLLPUBLIC SfxStyleSheetBase : public comphelper::OWeakTypeObject { friend class SfxStyleSheetBasePool; @@ -165,7 +165,7 @@ typedef std::vector< rtl::Reference< SfxStyleSheetBase > > SfxStyles; //========================================================================= -class SVT_DLLPUBLIC SfxStyleSheetIterator +class SVL_DLLPUBLIC SfxStyleSheetIterator /* [Beschreibung] @@ -195,8 +195,8 @@ protected: private: USHORT GetPos(){return nAktPosition;} - SVT_DLLPRIVATE BOOL IsTrivialSearch(); - SVT_DLLPRIVATE BOOL DoesStyleMatch(SfxStyleSheetBase *pStyle); + SVL_DLLPRIVATE BOOL IsTrivialSearch(); + SVL_DLLPRIVATE BOOL DoesStyleMatch(SfxStyleSheetBase *pStyle); void* pImp; SfxStyleSheetBase* pAktStyle; @@ -210,7 +210,7 @@ friend class SfxStyleSheetBasePool; class SfxStyleSheetBasePool_Impl; -class SVT_DLLPUBLIC SfxStyleSheetBasePool: public SfxBroadcaster, public comphelper::OWeakTypeObject +class SVL_DLLPUBLIC SfxStyleSheetBasePool: public SfxBroadcaster, public comphelper::OWeakTypeObject { friend class SfxStyleSheetIterator; friend class SfxStyleSheetBase; @@ -218,8 +218,8 @@ friend class SfxStyleSheetBase; SfxStyleSheetBasePool_Impl *pImp; private: - SVT_DLLPRIVATE BOOL Load1_Impl( SvStream& ); - SVT_DLLPRIVATE SfxStyleSheetIterator& GetIterator_Impl(); + SVL_DLLPRIVATE BOOL Load1_Impl( SvStream& ); + SVL_DLLPRIVATE SfxStyleSheetIterator& GetIterator_Impl(); protected: String aAppName; SfxItemPool& rPool; @@ -287,7 +287,7 @@ public: //========================================================================= -class SVT_DLLPUBLIC SfxStyleSheet: public SfxStyleSheetBase, +class SVL_DLLPUBLIC SfxStyleSheet: public SfxStyleSheetBase, public SfxListener, public SfxBroadcaster { public: @@ -306,7 +306,7 @@ protected: //========================================================================= -class SVT_DLLPUBLIC SfxStyleSheetPool: public SfxStyleSheetBasePool +class SVL_DLLPUBLIC SfxStyleSheetPool: public SfxStyleSheetBasePool { protected: using SfxStyleSheetBasePool::Create; @@ -334,7 +334,7 @@ public: //======================================================================== -class SVT_DLLPUBLIC SfxStyleSheetPoolHint : public SfxHint +class SVL_DLLPUBLIC SfxStyleSheetPoolHint : public SfxHint { USHORT nHint; @@ -348,7 +348,7 @@ public: //========================================================================= -class SVT_DLLPUBLIC SfxStyleSheetHint: public SfxHint +class SVL_DLLPUBLIC SfxStyleSheetHint: public SfxHint { SfxStyleSheetBase* pStyleSh; USHORT nHint; @@ -364,7 +364,7 @@ public: { return nHint; } }; -class SVT_DLLPUBLIC SfxStyleSheetHintExtended: public SfxStyleSheetHint +class SVL_DLLPUBLIC SfxStyleSheetHintExtended: public SfxStyleSheetHint { String aName; @@ -379,7 +379,7 @@ public: const String& GetOldName() { return aName; } }; -class SVT_DLLPUBLIC SfxUnoStyleSheet : public ::cppu::ImplInheritanceHelper2< SfxStyleSheet, ::com::sun::star::style::XStyle, ::com::sun::star::lang::XUnoTunnel > +class SVL_DLLPUBLIC SfxUnoStyleSheet : public ::cppu::ImplInheritanceHelper2< SfxStyleSheet, ::com::sun::star::style::XStyle, ::com::sun::star::lang::XUnoTunnel > { public: SfxUnoStyleSheet( const UniString& _rName, const SfxStyleSheetBasePool& _rPool, SfxStyleFamily _eFamily, USHORT _nMaske ); diff --git a/svl/inc/svl/svdde.hxx b/svl/inc/svl/svdde.hxx index 82681ed9d240..4e0063e2477b 100644 --- a/svl/inc/svl/svdde.hxx +++ b/svl/inc/svl/svdde.hxx @@ -31,7 +31,7 @@ #ifndef _SVDDE_HXX #define _SVDDE_HXX -#include "svtools/svtdllapi.h" +#include "svtools/svldllapi.h" #include <sot/exchange.hxx> #include <tools/string.hxx> #include <tools/list.hxx> @@ -84,7 +84,7 @@ DECLARE_LIST( StringList, String * ) // - DdeData - // ----------- -class SVT_DLLPUBLIC DdeData +class SVL_DLLPUBLIC DdeData { friend class DdeInternal; friend class DdeService; @@ -93,7 +93,7 @@ class SVT_DLLPUBLIC DdeData DdeDataImp* pImp; //#if 0 // _SOLAR__PRIVATE - SVT_DLLPRIVATE void Lock(); + SVL_DLLPRIVATE void Lock(); //#endif void SetFormat( ULONG nFmt ); @@ -155,7 +155,7 @@ public: // - DdeTransaction - // ------------------ -class SVT_DLLPUBLIC DdeTransaction +class SVL_DLLPUBLIC DdeTransaction { public: virtual void Data( const DdeData* ); @@ -205,7 +205,7 @@ private: // - DdeLink - // ----------- -class SVT_DLLPUBLIC DdeLink : public DdeTransaction +class SVL_DLLPUBLIC DdeLink : public DdeTransaction { Link aNotify; @@ -222,7 +222,7 @@ public: // - DdeWarmLink - // --------------- -class SVT_DLLPUBLIC DdeWarmLink : public DdeLink +class SVL_DLLPUBLIC DdeWarmLink : public DdeLink { public: DdeWarmLink( DdeConnection&, const String&, long = 0 ); @@ -232,7 +232,7 @@ public: // - DdeHotLink - // -------------- -class SVT_DLLPUBLIC DdeHotLink : public DdeLink +class SVL_DLLPUBLIC DdeHotLink : public DdeLink { public: DdeHotLink( DdeConnection&, const String&, long = 0 ); @@ -242,7 +242,7 @@ public: // - DdeRequest - // -------------- -class SVT_DLLPUBLIC DdeRequest : public DdeTransaction +class SVL_DLLPUBLIC DdeRequest : public DdeTransaction { public: DdeRequest( DdeConnection&, const String&, long = 0 ); @@ -252,7 +252,7 @@ public: // - DdePoke - // ----------- -class SVT_DLLPUBLIC DdePoke : public DdeTransaction +class SVL_DLLPUBLIC DdePoke : public DdeTransaction { public: DdePoke( DdeConnection&, const String&, const char*, long, @@ -265,7 +265,7 @@ public: // - DdeExecute - // -------------- -class SVT_DLLPUBLIC DdeExecute : public DdeTransaction +class SVL_DLLPUBLIC DdeExecute : public DdeTransaction { public: DdeExecute( DdeConnection&, const String&, long = 0 ); @@ -275,7 +275,7 @@ public: // - DdeConnection - // ----------------- -class SVT_DLLPUBLIC DdeConnection +class SVL_DLLPUBLIC DdeConnection { friend class DdeInternal; friend class DdeTransaction; @@ -307,7 +307,7 @@ private: // - DdeItem - // ----------- -class SVT_DLLPUBLIC DdeItem +class SVL_DLLPUBLIC DdeItem { friend class DdeInternal; friend class DdeTopic; @@ -336,7 +336,7 @@ public: // - DdeItem - // ----------- -class SVT_DLLPUBLIC DdeGetPutItem : public DdeItem +class SVL_DLLPUBLIC DdeGetPutItem : public DdeItem { public: DdeGetPutItem( const sal_Unicode* p ); @@ -352,9 +352,9 @@ public: // - DdeTopic - // ------------ -class SVT_DLLPUBLIC DdeTopic +class SVL_DLLPUBLIC DdeTopic { - SVT_DLLPRIVATE void _Disconnect( long ); + SVL_DLLPRIVATE void _Disconnect( long ); public: virtual void Connect( long ); @@ -421,7 +421,7 @@ private: // - DdeService - // -------------- -class SVT_DLLPUBLIC DdeService +class SVL_DLLPUBLIC DdeService { friend class DdeInternal; @@ -448,7 +448,7 @@ private: ConvList* pConv; short nStatus; - SVT_DLLPRIVATE BOOL HasCbFormat( USHORT ); + SVL_DLLPRIVATE BOOL HasCbFormat( USHORT ); public: DdeService( const String& ); diff --git a/svl/inc/svl/svldata.hxx b/svl/inc/svl/svldata.hxx index c929faad3d13..468e6025cb5a 100644 --- a/svl/inc/svl/svldata.hxx +++ b/svl/inc/svl/svldata.hxx @@ -6,7 +6,7 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svtdata.hxx,v $ + * $RCSfile: svldata.hxx,v $ * $Revision: 1.4 $ * * This file is part of OpenOffice.org. @@ -28,28 +28,18 @@ * ************************************************************************/ -#ifndef _SVTOOLS_SVTDATA_HXX -#define _SVTOOLS_SVTDATA_HXX +#ifndef _SVL_SVLDATA_HXX +#define _SVL_SVLDATA_HXX -#include <tools/resid.hxx> #include <tools/simplerm.hxx> -class ResMgr; -class SfxItemDesruptorList_Impl; class SfxItemPool; -class Twain; //============================================================================ -class ImpSvtData +class ImpSvlData { public: - Twain * pTwain; const SfxItemPool * pStoringPool; - SfxItemDesruptorList_Impl * pItemDesruptList; - - ResMgr * pResMgr; - ResMgr * pPatchResMgr; - void* m_pThreadsafeRMs; // one SimpleResMgr for each language for which a resource was requested // (When using the 'non-simple' resmgr, the first request for any language wins, any @@ -57,47 +47,15 @@ public: // For the simple resmgr we have a mgr for each language ever requested). private: - ImpSvtData(): - pTwain(0), pStoringPool(0), pItemDesruptList(0), pResMgr(0), - pPatchResMgr(NULL), m_pThreadsafeRMs(NULL) + ImpSvlData(): + pStoringPool(0), m_pThreadsafeRMs(NULL) {} - ~ImpSvtData(); + ~ImpSvlData(); public: - ResMgr * GetResMgr(const ::com::sun::star::lang::Locale aLocale); - ResMgr * GetResMgr(); // VCL dependant, only available in SVT, not in SVL! - - ResMgr * GetPatchResMgr(); - ResMgr * GetPatchResMgr(const ::com::sun::star::lang::Locale& aLocale); - - SimpleResMgr * GetSimpleRM(const ::com::sun::star::lang::Locale& rLocale); - - static ImpSvtData & GetSvtData(); -}; - -//============================================================================ - -class SvpResId: public ResId -{ -public: - SvpResId( USHORT nId, const ::com::sun::star::lang::Locale aLocale ): - ResId( nId, *ImpSvtData::GetSvtData().GetResMgr( aLocale ) ) {} - - // VCL dependant, only available in SVT, not in SVL! - SvpResId( USHORT nId ); -}; - - -class SvtResId: public ResId -{ -public: - SvtResId(USHORT nId, const ::com::sun::star::lang::Locale aLocale): - ResId(nId, *ImpSvtData::GetSvtData().GetResMgr(aLocale)) {} - - SvtResId(USHORT nId): ResId(nId, *ImpSvtData::GetSvtData().GetResMgr()) {} - // VCL dependant, only available in SVT, not in SVL! + static ImpSvlData & GetSvlData(); }; //============================================================================ @@ -106,12 +64,12 @@ class SvtSimpleResId String m_sValue; public: - SvtSimpleResId(USHORT nId, const ::com::sun::star::lang::Locale aLocale) : m_sValue(ImpSvtData::GetSvtData().GetSimpleRM(aLocale)->ReadString(nId)) { }; + SvtSimpleResId(USHORT nId, const ::com::sun::star::lang::Locale aLocale) : m_sValue(ImpSvlData::GetSvlData().GetSimpleRM(aLocale)->ReadString(nId)) { }; operator String () const { return m_sValue; } }; -#endif // _SVTOOLS_SVTDATA_HXX +#endif // _SVL_SVLDATA_HXX diff --git a/svl/inc/svl/syslocale.hxx b/svl/inc/svl/syslocale.hxx index bd853d0d4eeb..de5962fa0d1a 100644 --- a/svl/inc/svl/syslocale.hxx +++ b/svl/inc/svl/syslocale.hxx @@ -31,7 +31,7 @@ #ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX #define INCLUDED_SVTOOLS_SYSLOCALE_HXX -#include "svtools/svtdllapi.h" +#include "svtools/svldllapi.h" #include <unotools/localedatawrapper.hxx> #include <unotools/charclass.hxx> #include <sal/types.h> @@ -50,14 +50,14 @@ class LocaleDataWrapper; SvtSysLocale is not expensive as long as there is at least one instance left. */ -class SVT_DLLPUBLIC SvtSysLocale +class SVL_DLLPUBLIC SvtSysLocale { friend class SvtSysLocale_Impl; // access to mutex static SvtSysLocale_Impl* pImpl; static sal_Int32 nRefCount; - SVT_DLLPRIVATE static ::osl::Mutex& GetMutex(); + SVL_DLLPRIVATE static ::osl::Mutex& GetMutex(); public: SvtSysLocale(); diff --git a/svl/inc/svl/syslocaleoptions.hxx b/svl/inc/svl/syslocaleoptions.hxx index 8b03785d541e..a5884c7bbcaa 100644 --- a/svl/inc/svl/syslocaleoptions.hxx +++ b/svl/inc/svl/syslocaleoptions.hxx @@ -31,7 +31,7 @@ #ifndef INCLUDED_SVTOOLS_SYSLOCALEOPTIONS_HXX #define INCLUDED_SVTOOLS_SYSLOCALEOPTIONS_HXX -#include "svtools/svtdllapi.h" +#include "svtools/svldllapi.h" #include <sal/types.h> #include <rtl/ustring.hxx> #include <tools/solar.h> @@ -48,12 +48,12 @@ class SvtSysLocaleOptions_Impl; class SvtListener; namespace osl { class Mutex; } -class SVT_DLLPUBLIC SvtSysLocaleOptions: public utl::detail::Options +class SVL_DLLPUBLIC SvtSysLocaleOptions: public utl::detail::Options { static SvtSysLocaleOptions_Impl* pOptions; static sal_Int32 nRefCount; - SVT_DLLPRIVATE static ::osl::Mutex& GetMutex(); + SVL_DLLPRIVATE static ::osl::Mutex& GetMutex(); public: diff --git a/svl/inc/svl/undo.hxx b/svl/inc/svl/undo.hxx index 38cbfb227f1b..5bd48342f530 100644 --- a/svl/inc/svl/undo.hxx +++ b/svl/inc/svl/undo.hxx @@ -30,14 +30,14 @@ #ifndef _UNDO_HXX #define _UNDO_HXX -#include "svtools/svtdllapi.h" +#include "svtools/svldllapi.h" #include <tools/rtti.hxx> #include <tools/string.hxx> #include <svtools/svarray.hxx> //==================================================================== -class SVT_DLLPUBLIC SfxRepeatTarget +class SVL_DLLPUBLIC SfxRepeatTarget { public: TYPEINFO(); @@ -46,7 +46,7 @@ public: //==================================================================== -class SVT_DLLPUBLIC SfxUndoAction +class SVL_DLLPUBLIC SfxUndoAction { BOOL bLinked; public: @@ -79,7 +79,7 @@ SV_DECL_PTRARR( SfxUndoActions, SfxUndoAction*, 20, 8 ) /** do not make use of this implementation details, unless you really really have to! */ -struct SVT_DLLPUBLIC SfxUndoArray +struct SVL_DLLPUBLIC SfxUndoArray { SfxUndoActions aUndoActions; USHORT nMaxUndoActions; @@ -95,7 +95,7 @@ struct SVT_DLLPUBLIC SfxUndoArray /** do not make use of this implementation details, unless you really really have to! */ -class SVT_DLLPUBLIC SfxListUndoAction : public SfxUndoAction, public SfxUndoArray +class SVL_DLLPUBLIC SfxListUndoAction : public SfxUndoAction, public SfxUndoArray /* [Beschreibung] @@ -135,7 +135,7 @@ class SVT_DLLPUBLIC SfxListUndoAction : public SfxUndoAction, public SfxUndoArra //========================================================================= -class SVT_DLLPUBLIC SfxUndoManager +class SVL_DLLPUBLIC SfxUndoManager { friend class SfxLinkUndoAction; @@ -197,7 +197,7 @@ public: //========================================================================= -class SVT_DLLPUBLIC SfxLinkUndoAction : public SfxUndoAction +class SVL_DLLPUBLIC SfxLinkUndoAction : public SfxUndoAction /* [Beschreibung] diff --git a/svl/inc/svl/zforlist.hxx b/svl/inc/svl/zforlist.hxx index 22a258d32f88..5862a1312039 100644 --- a/svl/inc/svl/zforlist.hxx +++ b/svl/inc/svl/zforlist.hxx @@ -30,7 +30,7 @@ #ifndef _ZFORLIST_HXX #define _ZFORLIST_HXX -#include "svtools/svtdllapi.h" +#include "svtools/svldllapi.h" #include <tools/string.hxx> #ifndef _TABLE_HXX //autogen #include <tools/table.hxx> @@ -231,7 +231,7 @@ typedef ::std::map< sal_uInt32, sal_uInt32 > SvNumberFormatterMergeMap; /** Language/country dependent currency entries */ -class SVT_DLLPUBLIC NfCurrencyEntry +class SVL_DLLPUBLIC NfCurrencyEntry { String aSymbol; /// currency symbol String aBankSymbol; /// currency abbreviation @@ -251,7 +251,7 @@ private: //#if 0 // _SOLAR__PRIVATE // nDecimalFormat := 0, 1, 2 // #,##0 or #,##0.00 or #,##0.-- are assigned - SVT_DLLPRIVATE void Impl_BuildFormatStringNumChars( String&, + SVL_DLLPRIVATE void Impl_BuildFormatStringNumChars( String&, const LocaleDataWrapper&, USHORT nDecimalFormat ) const; //#endif // __PRIVATE @@ -328,12 +328,12 @@ public: typedef NfCurrencyEntry* NfCurrencyEntryPtr; SV_DECL_PTRARR_DEL( NfCurrencyTable, NfCurrencyEntryPtr, 128, 1 ) typedef String* WSStringPtr; -SV_DECL_PTRARR_DEL_VISIBILITY( NfWSStringsDtor, WSStringPtr, 8, 1, SVT_DLLPUBLIC ) +SV_DECL_PTRARR_DEL_VISIBILITY( NfWSStringsDtor, WSStringPtr, 8, 1, SVL_DLLPUBLIC ) class SvNumberFormatterRegistry_Impl; -class SVT_DLLPUBLIC SvNumberFormatter +class SVL_DLLPUBLIC SvNumberFormatter { public: @@ -813,37 +813,37 @@ private: #ifdef _ZFORLIST_CXX // ----- private Methoden ----- - SVT_DLLPRIVATE static BOOL bCurrencyTableInitialized; - SVT_DLLPRIVATE static USHORT nSystemCurrencyPosition; - SVT_DLLPRIVATE static SvNumberFormatterRegistry_Impl* pFormatterRegistry; + SVL_DLLPRIVATE static BOOL bCurrencyTableInitialized; + SVL_DLLPRIVATE static USHORT nSystemCurrencyPosition; + SVL_DLLPRIVATE static SvNumberFormatterRegistry_Impl* pFormatterRegistry; // get the registry, create one if none exists - SVT_DLLPRIVATE static SvNumberFormatterRegistry_Impl& GetFormatterRegistry(); + SVL_DLLPRIVATE static SvNumberFormatterRegistry_Impl& GetFormatterRegistry(); // called by ctors - SVT_DLLPRIVATE void ImpConstruct( LanguageType eLang ); + SVL_DLLPRIVATE void ImpConstruct( LanguageType eLang ); // Changes initialized language/country, clears the entries and generates // new ones, may ONLY be called by the binary file format load - SVT_DLLPRIVATE void ImpChangeSysCL( LanguageType eLnge, BOOL bLoadingSO5 ); + SVL_DLLPRIVATE void ImpChangeSysCL( LanguageType eLnge, BOOL bLoadingSO5 ); // Generate builtin formats provided by i18n behind CLOffset, // if bLoadingSO5==FALSE also generate additional i18n formats. - SVT_DLLPRIVATE void ImpGenerateFormats( sal_uInt32 CLOffset, BOOL bLoadingSO5 ); + SVL_DLLPRIVATE void ImpGenerateFormats( sal_uInt32 CLOffset, BOOL bLoadingSO5 ); // Generate additional formats provided by i18n - SVT_DLLPRIVATE void ImpGenerateAdditionalFormats( + SVL_DLLPRIVATE void ImpGenerateAdditionalFormats( sal_uInt32 CLOffset, NumberFormatCodeWrapper& rNumberFormatCode, BOOL bAfterLoadingSO5 ); - SVT_DLLPRIVATE SvNumberformat* ImpInsertFormat( + SVL_DLLPRIVATE SvNumberformat* ImpInsertFormat( const ::com::sun::star::i18n::NumberFormatCode& rCode, sal_uInt32 nPos, BOOL bAfterLoadingSO5 = FALSE, sal_Int16 nOrgIndex = 0 ); // ImpInsertNewStandardFormat for new (since version ...) builtin formats - SVT_DLLPRIVATE SvNumberformat* ImpInsertNewStandardFormat( + SVL_DLLPRIVATE SvNumberformat* ImpInsertNewStandardFormat( const ::com::sun::star::i18n::NumberFormatCode& rCode, sal_uInt32 nPos, USHORT nVersion, @@ -851,41 +851,41 @@ private: sal_Int16 nOrgIndex = 0 ); // Return CLOffset or (MaxCLOffset + SV_COUNTRY_LANGUAGE_OFFSET) if new language/country - SVT_DLLPRIVATE sal_uInt32 ImpGetCLOffset(LanguageType eLnge) const; + SVL_DLLPRIVATE sal_uInt32 ImpGetCLOffset(LanguageType eLnge) const; // Test whether format code already exists, then return index key, // otherwise NUMBERFORMAT_ENTRY_NOT_FOUND - SVT_DLLPRIVATE sal_uInt32 ImpIsEntry( const String& rString, + SVL_DLLPRIVATE sal_uInt32 ImpIsEntry( const String& rString, sal_uInt32 CLOffset, LanguageType eLnge ); // Create builtin formats for language/country if necessary, return CLOffset - SVT_DLLPRIVATE sal_uInt32 ImpGenerateCL( LanguageType eLnge, BOOL bLoadingSO5 = FALSE ); + SVL_DLLPRIVATE sal_uInt32 ImpGenerateCL( LanguageType eLnge, BOOL bLoadingSO5 = FALSE ); // Build negative currency format, old compatibility style - SVT_DLLPRIVATE void ImpGetNegCurrFormat( String& sNegStr, const String& rCurrSymbol ); + SVL_DLLPRIVATE void ImpGetNegCurrFormat( String& sNegStr, const String& rCurrSymbol ); // Build positive currency format, old compatibility style - SVT_DLLPRIVATE void ImpGetPosCurrFormat( String& sPosStr, const String& rCurrSymbol ); + SVL_DLLPRIVATE void ImpGetPosCurrFormat( String& sPosStr, const String& rCurrSymbol ); // Create <type>theCurrencyTable</type> with all <type>NfCurrencyEntry</type> - SVT_DLLPRIVATE static void ImpInitCurrencyTable(); + SVL_DLLPRIVATE static void ImpInitCurrencyTable(); // Return the format index of the currency format of the system locale. // Format is created if not already present. - SVT_DLLPRIVATE sal_uInt32 ImpGetDefaultSystemCurrencyFormat(); + SVL_DLLPRIVATE sal_uInt32 ImpGetDefaultSystemCurrencyFormat(); // Return the format index of the currency format of the current locale. // Format is created if not already present. - SVT_DLLPRIVATE sal_uInt32 ImpGetDefaultCurrencyFormat(); + SVL_DLLPRIVATE sal_uInt32 ImpGetDefaultCurrencyFormat(); // Return the default format for a given type and current locale. // May ONLY be called from within GetStandardFormat(). - SVT_DLLPRIVATE sal_uInt32 ImpGetDefaultFormat( short nType ); + SVL_DLLPRIVATE sal_uInt32 ImpGetDefaultFormat( short nType ); // Return the index in a sequence of format codes matching an enum of // NfIndexTableOffset. If not found 0 is returned. If the sequence doesn't // contain any format code elements a default element is created and inserted. - SVT_DLLPRIVATE sal_Int32 ImpGetFormatCodeIndex( + SVL_DLLPRIVATE sal_Int32 ImpGetFormatCodeIndex( ::com::sun::star::uno::Sequence< ::com::sun::star::i18n::NumberFormatCode >& rSeq, const NfIndexTableOffset nTabOff ); @@ -895,7 +895,7 @@ private: // Return the default index in the sequence. // Non-PRODUCT version may check locale data for matching defaults in one // FormatElement group. - SVT_DLLPRIVATE sal_Int32 ImpAdjustFormatCodeDefault( + SVL_DLLPRIVATE sal_Int32 ImpAdjustFormatCodeDefault( ::com::sun::star::i18n::NumberFormatCode * pFormatArr, sal_Int32 nCount, BOOL bCheckCorrectness = TRUE ); diff --git a/svl/inc/svl/zformat.hxx b/svl/inc/svl/zformat.hxx index ae7d961c0bc6..208c876bfbfc 100644 --- a/svl/inc/svl/zformat.hxx +++ b/svl/inc/svl/zformat.hxx @@ -30,7 +30,7 @@ #ifndef _ZFORMAT_HXX #define _ZFORMAT_HXX -#include "svtools/svtdllapi.h" +#include "svtools/svldllapi.h" #include <tools/string.hxx> #include <i18npool/mslangid.hxx> #include <svtools/zforlist.hxx> @@ -175,7 +175,7 @@ private: }; -class SVT_DLLPUBLIC SvNumberformat +class SVL_DLLPUBLIC SvNumberformat { public: // Ctor for Load @@ -461,11 +461,11 @@ private: BOOL bStandard; // If this is a default standard format BOOL bIsUsed; // Flag as used for storing - SVT_DLLPRIVATE USHORT ImpGetNumForStringElementCount( USHORT nNumFor ) const; + SVL_DLLPRIVATE USHORT ImpGetNumForStringElementCount( USHORT nNumFor ) const; - SVT_DLLPRIVATE BOOL ImpIsOtherCalendar( const ImpSvNumFor& rNumFor ) const; + SVL_DLLPRIVATE BOOL ImpIsOtherCalendar( const ImpSvNumFor& rNumFor ) const; - SVT_DLLPRIVATE BOOL ImpSwitchToSpecifiedCalendar( String& rOrgCalendar, + SVL_DLLPRIVATE BOOL ImpSwitchToSpecifiedCalendar( String& rOrgCalendar, double& fOrgDateTime, const ImpSvNumFor& rNumFor ) const; #ifdef _ZFORMAT_CXX // ----- private implementation methods ----- @@ -476,36 +476,36 @@ private: const SvNumberFormatter& GetFormatter() const { return *rScan.GetNumberformatter(); } // divide in substrings and color conditions - SVT_DLLPRIVATE short ImpNextSymbol( String& rString, + SVL_DLLPRIVATE short ImpNextSymbol( String& rString, xub_StrLen& nPos, String& sSymbol ); // read string until ']' and strip blanks (after condition) - SVT_DLLPRIVATE static xub_StrLen ImpGetNumber( String& rString, + SVL_DLLPRIVATE static xub_StrLen ImpGetNumber( String& rString, xub_StrLen& nPos, String& sSymbol ); // get xxx of "[$-xxx]" as LanguageType, starting at and advancing position nPos - SVT_DLLPRIVATE static LanguageType ImpGetLanguageType( const String& rString, xub_StrLen& nPos ); + SVL_DLLPRIVATE static LanguageType ImpGetLanguageType( const String& rString, xub_StrLen& nPos ); // standard number output - SVT_DLLPRIVATE void ImpGetOutputStandard( double& fNumber, String& OutString ); + SVL_DLLPRIVATE void ImpGetOutputStandard( double& fNumber, String& OutString ); // numbers in input line - SVT_DLLPRIVATE void ImpGetOutputInputLine( double fNumber, String& OutString ); + SVL_DLLPRIVATE void ImpGetOutputInputLine( double fNumber, String& OutString ); // check subcondition // OP undefined => -1 // else 0 or 1 - SVT_DLLPRIVATE short ImpCheckCondition(double& fNumber, + SVL_DLLPRIVATE short ImpCheckCondition(double& fNumber, double& fLimit, SvNumberformatLimitOps eOp); - SVT_DLLPRIVATE ULONG ImpGGT(ULONG x, ULONG y); - SVT_DLLPRIVATE ULONG ImpGGTRound(ULONG x, ULONG y); + SVL_DLLPRIVATE ULONG ImpGGT(ULONG x, ULONG y); + SVL_DLLPRIVATE ULONG ImpGGTRound(ULONG x, ULONG y); // Helper function for number strings // append string symbols, insert leading 0 or ' ', or ... - SVT_DLLPRIVATE BOOL ImpNumberFill( String& sStr, + SVL_DLLPRIVATE BOOL ImpNumberFill( String& sStr, double& rNumber, xub_StrLen& k, USHORT& j, @@ -513,7 +513,7 @@ private: short eSymbolType ); // Helper function to fill in the integer part and the group (AKA thousand) separators - SVT_DLLPRIVATE BOOL ImpNumberFillWithThousands( String& sStr, + SVL_DLLPRIVATE BOOL ImpNumberFillWithThousands( String& sStr, double& rNumber, xub_StrLen k, USHORT j, @@ -524,20 +524,20 @@ private: // Helper function to fill in the group (AKA thousand) separators // or to skip additional digits - SVT_DLLPRIVATE void ImpDigitFill( String& sStr, + SVL_DLLPRIVATE void ImpDigitFill( String& sStr, xub_StrLen nStart, xub_StrLen& k, USHORT nIx, xub_StrLen & nDigitCount, utl::DigitGroupingIterator & ); - SVT_DLLPRIVATE BOOL ImpGetDateOutput( double fNumber, + SVL_DLLPRIVATE BOOL ImpGetDateOutput( double fNumber, USHORT nIx, String& OutString ); - SVT_DLLPRIVATE BOOL ImpGetTimeOutput( double fNumber, + SVL_DLLPRIVATE BOOL ImpGetTimeOutput( double fNumber, USHORT nIx, String& OutString ); - SVT_DLLPRIVATE BOOL ImpGetDateTimeOutput( double fNumber, + SVL_DLLPRIVATE BOOL ImpGetDateTimeOutput( double fNumber, USHORT nIx, String& OutString ); @@ -546,23 +546,23 @@ private: // know a "before" era (like zh_TW ROC or ja_JP Gengou). If switched and // rOrgCalendar was "gregorian" the string is emptied. If rOrgCalendar was // empty the previous calendar name and date/time are returned. - SVT_DLLPRIVATE BOOL ImpFallBackToGregorianCalendar( String& rOrgCalendar, double& fOrgDateTime ); + SVL_DLLPRIVATE BOOL ImpFallBackToGregorianCalendar( String& rOrgCalendar, double& fOrgDateTime ); // Append a "G" short era string of the given calendar. In the case of a // Gengou calendar this is a one character abbreviation, for other // calendars the XExtendedCalendar::getDisplayString() method is called. - SVT_DLLPRIVATE static void ImpAppendEraG( String& OutString, const CalendarWrapper& rCal, + SVL_DLLPRIVATE static void ImpAppendEraG( String& OutString, const CalendarWrapper& rCal, sal_Int16 nNatNum ); - SVT_DLLPRIVATE BOOL ImpGetNumberOutput( double fNumber, + SVL_DLLPRIVATE BOOL ImpGetNumberOutput( double fNumber, USHORT nIx, String& OutString ); - SVT_DLLPRIVATE void ImpCopyNumberformat( const SvNumberformat& rFormat ); + SVL_DLLPRIVATE void ImpCopyNumberformat( const SvNumberformat& rFormat ); // normal digits or other digits, depending on ImpSvNumFor.aNatNum, // [NatNum1], [NatNum2], ... - SVT_DLLPRIVATE String ImpGetNatNumString( const SvNumberNatNum& rNum, sal_Int32 nVal, + SVL_DLLPRIVATE String ImpGetNatNumString( const SvNumberNatNum& rNum, sal_Int32 nVal, USHORT nMinDigits = 0 ) const; String ImpIntToString( USHORT nIx, sal_Int32 nVal, USHORT nMinDigits = 0 ) const @@ -574,7 +574,7 @@ private: } // transliterate according to NativeNumber - SVT_DLLPRIVATE void ImpTransliterateImpl( String& rStr, const SvNumberNatNum& rNum ) const; + SVL_DLLPRIVATE void ImpTransliterateImpl( String& rStr, const SvNumberNatNum& rNum ) const; void ImpTransliterate( String& rStr, const SvNumberNatNum& rNum ) const { diff --git a/svl/inc/urihelper.hxx b/svl/inc/urihelper.hxx index 209f3f04e28a..e68e8f0ee54f 100644 --- a/svl/inc/urihelper.hxx +++ b/svl/inc/urihelper.hxx @@ -31,7 +31,7 @@ #ifndef SVTOOLS_URIHELPER_HXX #define SVTOOLS_URIHELPER_HXX -#include "svtools/svtdllapi.h" +#include "svtools/svldllapi.h" #include "com/sun/star/uno/Reference.hxx" #include <com/sun/star/uno/RuntimeException.hpp> #include <rtl/textenc.h> @@ -64,7 +64,7 @@ namespace URIHelper { existence (see URIHelper::GetMaybeFileHdl), or use bCheckFileExists = false if you want to generate file URLs without checking for their existence. */ -SVT_DLLPUBLIC UniString +SVL_DLLPUBLIC UniString SmartRel2Abs(INetURLObject const & rTheBaseURIRef, ByteString const & rTheRelURIRef, Link const & rMaybeFileHdl = Link(), @@ -91,7 +91,7 @@ SmartRel2Abs(INetURLObject const & rTheBaseURIRef, existence (see URIHelper::GetMaybeFileHdl), or use bCheckFileExists = false if you want to generate file URLs without checking for their existence. */ -SVT_DLLPUBLIC UniString +SVL_DLLPUBLIC UniString SmartRel2Abs(INetURLObject const & rTheBaseURIRef, UniString const & rTheRelURIRef, Link const & rMaybeFileHdl = Link(), @@ -106,10 +106,10 @@ SmartRel2Abs(INetURLObject const & rTheBaseURIRef, INetURLObject::FSysStyle eStyle = INetURLObject::FSYS_DETECT); //============================================================================ -SVT_DLLPUBLIC void SetMaybeFileHdl(Link const & rTheMaybeFileHdl); +SVL_DLLPUBLIC void SetMaybeFileHdl(Link const & rTheMaybeFileHdl); //============================================================================ -SVT_DLLPUBLIC Link GetMaybeFileHdl(); +SVL_DLLPUBLIC Link GetMaybeFileHdl(); /** Converts a URI reference to a relative one, ignoring certain differences (for @@ -131,7 +131,7 @@ SVT_DLLPUBLIC Link GetMaybeFileHdl(); @exception com::sun::star::uno::RuntimeException if any error occurs */ -SVT_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uri::XUriReference > +SVL_DLLPUBLIC com::sun::star::uno::Reference< com::sun::star::uri::XUriReference > normalizedMakeRelative( com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > const & context, @@ -159,11 +159,11 @@ normalizedMakeRelative( @deprecated No code should rely on the default component context. */ -SVT_DLLPUBLIC rtl::OUString simpleNormalizedMakeRelative( +SVL_DLLPUBLIC rtl::OUString simpleNormalizedMakeRelative( rtl::OUString const & baseUriReference, rtl::OUString const & uriReference); //============================================================================ -SVT_DLLPUBLIC UniString +SVL_DLLPUBLIC UniString FindFirstURLInText(UniString const & rText, xub_StrLen & rBegin, xub_StrLen & rEnd, @@ -200,7 +200,7 @@ FindFirstURLInText(UniString const & rText, @return The input URI with any password component removed. */ -SVT_DLLPUBLIC UniString +SVL_DLLPUBLIC UniString removePassword(UniString const & rURI, INetURLObject::EncodeMechanism eEncodeMechanism = INetURLObject::WAS_ENCODED, @@ -229,7 +229,7 @@ removePassword(UniString const & rURI, @return The style bit corresponding to the queried content provider's conventions, or FSysStyle(0) if these cannot be determined. */ -SVT_DLLPUBLIC INetURLObject::FSysStyle queryFSysStyle(UniString const & rFileUrl, +SVL_DLLPUBLIC INetURLObject::FSysStyle queryFSysStyle(UniString const & rFileUrl, bool bAddConvenienceStyles = true) throw (com::sun::star::uno::RuntimeException); diff --git a/svl/prj/build.lst b/svl/prj/build.lst index a60199740561..52bc7f82b3cd 100644 --- a/svl/prj/build.lst +++ b/svl/prj/build.lst @@ -1,55 +1,23 @@ -st svtools : l10n offuh toolkit ucbhelper unotools JPEG:jpeg cppu cppuhelper comphelper sal sot jvmfwk NULL -st svtools usr1 - all st_mkout NULL -st svtools\inc nmake - all st_inc NULL -st svtools\inc\sane get - all st_incsa NULL -st svtools\prj get - all st_prj NULL -st svtools\res get - all st_res NULL -st svtools\win\inc get - all st_winc NULL -st svtools\win\res get - all st_wres NULL -st svtools\os2\inc get - all st_oinc NULL -st svtools\mac\inc get - all st_minc NULL -st svtools\unx\inc get - all st_uinc NULL -st svtools\bmpmaker nmake - all st_bmp st_inc NULL -st svtools\source\memtools nmake - all st_mem st_inc NULL -st svtools\source\numbers nmake - all st_num st_inc NULL -st svtools\source\notify nmake - all st_not st_inc NULL -st svtools\source\config nmake - all st_conf st_inc NULL -st svtools\unx\source\svdde nmake - u st_usdde st_inc NULL -st svtools\unx\source\svdde nmake - p st_psdde st_inc NULL -st svtools\mac\source\svdde nmake - m st_msdde st_inc NULL -st svtools\mac\source\misc nmake - m st_msc st_inc NULL -st svtools\source\control nmake - all st_ctl st_inc NULL -st svtools\source\filerec nmake - all st_file st_inc NULL -st svtools\source\filter.vcl\filter nmake - all st_vfilt st_inc NULL -st svtools\source\filter.vcl\wmf nmake - all st_vwmf st_inc NULL -st svtools\source\filter.vcl\igif nmake - all st_vigif st_inc NULL -st svtools\source\filter.vcl\jpeg nmake - all st_vjpeg st_inc NULL -st svtools\source\filter.vcl\ixbm nmake - all st_vixbm st_inc NULL -st svtools\source\filter.vcl\ixpm nmake - all st_vixpm st_inc NULL -st svtools\source\brwbox nmake - all st__brw st_bmp st_inc NULL -st svtools\source\urlobj nmake - all st__url st_inc NULL -st svtools\source\misc nmake - all st__misc st_bmp st_inc NULL -st svtools\source\misc1 nmake - all st__misc1 st_inc NULL -st svtools\source\contnr nmake - all st__ctr st_inc NULL -st svtools\source\svdde nmake - all st__dde st_inc NULL -st svtools\source\items nmake - all st__item st_inc NULL -st svtools\source\items1 nmake - all st__item1 st_inc NULL -st svtools\source\undo nmake - all st_undo st_inc NULL -st svtools\source\plugapp nmake - all st_papp st_inc NULL -st svtools\source\dialogs nmake - all st_dial st_inc NULL -st svtools\source\edit nmake - all st_edit st_inc NULL -st svtools\source\table nmake - all st_table st_inc NULL -st svtools\source\uno nmake - all st_uno st_inc NULL -st svtools\source\svrtf nmake - all st_rtf st_inc NULL -st svtools\source\svsql nmake - all st_sql st_inc NULL -st svtools\source\svhtml nmake - all st_html st_inc NULL -st svtools\source\syslocale nmake - all st_sysloc st_inc NULL -st svtools\source\filepicker nmake - all st_filepick st_inc NULL -st svtools\util nmake - all st_util st__brw st__ctr st__dde st__item st__item1 st__misc st__misc1 st__url st_ctl st_dial st_edit st_file st_html st_papp st_rtf st_sql st_usdde.u st_psdde.p st_msdde.m st_msc.m st_undo st_table st_uno st_vfilt st_vigif st_vixbm st_vixpm st_vjpeg st_vwmf st_sysloc st_filepick st_not st_conf st_mem st_num st_svtjava NULL -st svtools\source\fsstor nmake - all st_fsstor st_inc NULL -st svtools\source\hatchwindow nmake - all st_hatchwin st_inc NULL -st svtools\source\passwordcontainer nmake - all st_passcont st_inc NULL -st svtools\source\productregistration nmake - all st_prodreg st_util st_inc NULL -st svtools\uno nmake - all st_svtuno st_util st_inc NULL -st svtools\source\java nmake - all st_svtjava st_inc NULL -st svtools\workben\unodialog nmake - all st_workben_udlg st_util NULL +sl svl : l10n offuh ucbhelper unotools cppu cppuhelper comphelper sal sot NULL +sl svl usr1 - all sl_mkout NULL +sl svl\inc nmake - all sl_inc NULL +sl svl\unx\source\svdde nmake - u sl_usdde sl_inc NULL +sl svl\unx\source\svdde nmake - p sl_psdde sl_inc NULL +sl svl\source\config nmake - all sl_conf sl_inc NULL +sl svl\source\filepicker nmake - all sl_filepick sl_inc NULL +sl svl\source\filerec nmake - all sl_file sl_inc NULL +sl svl\source\items nmake - all sl__item sl_inc NULL +sl svl\source\memtools nmake - all sl_mem sl_inc NULL +sl svl\source\misc nmake - all sl__misc sl_inc NULL +sl svl\source\notify nmake - all sl_not sl_inc NULL +sl svl\source\numbers nmake - all sl_num sl_inc NULL +sl svl\source\svdde nmake - all sl__dde sl_inc NULL +sl svl\source\svsql nmake - all sl_sql sl_inc NULL +sl svl\source\syslocale nmake - all sl_sysloc sl_inc NULL +sl svl\source\undo nmake - all sl_undo sl_inc NULL +sl svl\source\uno nmake - all sl_uno sl_inc NULL +sl svl\util nmake - all sl_util sl_usdde.u sl_psdde.p sl_conf sl_filepick sl_file sl__item sl_mem sl__misc sl_not sl_num sl__dde sl_sql sl_sysloc sl_undo sl_uno NULL +sl svl\source\fsstor nmake - all sl_fsstor sl_inc NULL +sl svl\source\passwordcontainer nmake - all sl_passcont sl_inc NULL + + diff --git a/svl/prj/d.lst b/svl/prj/d.lst index a3a7679f8aea..e32ffa624397 100644 --- a/svl/prj/d.lst +++ b/svl/prj/d.lst @@ -3,129 +3,18 @@ mkdir: %COMMON_DEST%\res%_EXT% mkdir: %_DEST%\inc%_EXT%\svtools ..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid -..\%__SRC%\srs\ehdl.srs %_DEST%\res%_EXT%\svtools.srs -..\%COMMON_OUTDIR%\srs\ehdl_srs.hid %COMMON_DEST%\res%_EXT%\svtools_srs.hid ..\%__SRC%\lib\isvl.lib %_DEST%\lib%_EXT%\isvl.lib -..\%__SRC%\lib\svtool.lib %_DEST%\lib%_EXT%\svtool.lib -..\%__SRC%\slb\svt.lib %_DEST%\lib%_EXT%\xsvtool.lib -..\%__SRC%\bin\dllver.exe %_DEST%\bin%_EXT%\dllver.exe -..\%__SRC%\bin\dllver %_DEST%\bin%_EXT%\dllver ..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\* ..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\* -..\%__SRC%\bin\bmp.* %_DEST%\bin%_EXT%\bmp.* -..\%__SRC%\bin\bmpsum.* %_DEST%\bin%_EXT%\bmpsum.* -..\%__SRC%\bin\bmpgui.* %_DEST%\bin%_EXT%\bmpgui.* -..\%__SRC%\bin\g2g.* %_DEST%\bin%_EXT%\g2g.* -..\%__SRC%\bin\bmp %_DEST%\bin%_EXT%\bmp -..\%__SRC%\bin\bmpsum %_DEST%\bin%_EXT%\bmpsum -..\%__SRC%\bin\bmpgui %_DEST%\bin%_EXT%\bmpgui -..\%__SRC%\bin\g2g %_DEST%\bin%_EXT%\g2g -..\%__SRC%\res\bmp.* %_DEST%\bin%_EXT%\bmp.* -..\%__SRC%\res\bmpgui.* %_DEST%\bin%_EXT%\bmpgui.* ..\%__SRC%\lib\*.so %_DEST%\lib%_EXT%\* ..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\* -..\inc\svtools\*.hxx %_DEST%\inc%_EXT%\svtools\*.hxx -..\inc\svtools\*.h %_DEST%\inc%_EXT%\svtools\*.h -..\inc\svtools\*.hrc %_DEST%\inc%_EXT%\svtools\*.hrc - -..\inc\imagemgr.hxx %_DEST%\inc%_EXT%\svtools\imagemgr.hxx -..\inc\imagemgr.hrc %_DEST%\inc%_EXT%\svtools\imagemgr.hrc -..\inc\testtool.hxx %_DEST%\inc%_EXT%\svtools\testtool.hxx -..\inc\flbytes.hxx %_DEST%\inc%_EXT%\svtools\flbytes.hxx -..\inc\adrparse.hxx %_DEST%\inc%_EXT%\svtools\adrparse.hxx -..\inc\broadcast.hxx %_DEST%\inc%_EXT%\svtools\broadcast.hxx -..\inc\calendar.hxx %_DEST%\inc%_EXT%\svtools\calendar.hxx -..\inc\cntnrsrt.hxx %_DEST%\inc%_EXT%\svtools\cntnrsrt.hxx -..\inc\ctrlbox.hxx %_DEST%\inc%_EXT%\svtools\ctrlbox.hxx -..\inc\ctrltool.hxx %_DEST%\inc%_EXT%\svtools\ctrltool.hxx -..\inc\collatorres.hxx %_DEST%\inc%_EXT%\svtools\collatorres.hxx -..\inc\indexentryres.hxx %_DEST%\inc%_EXT%\svtools\indexentryres.hxx -..\inc\cntwids.hrc %_DEST%\inc%_EXT%\svtools\cntwids.hrc -..\inc\itemdel.hxx %_DEST%\inc%_EXT%\svtools\itemdel.hxx -..\inc\wallitem.hxx %_DEST%\inc%_EXT%\svtools\wallitem.hxx -..\inc\stylepool.hxx %_DEST%\inc%_EXT%\svtools\stylepool.hxx -..\inc\dialogcontrolling.hxx %_DEST%\inc%_EXT%\svtools\dialogcontrolling.hxx -..\inc\filedlg.hxx %_DEST%\inc%_EXT%\svtools\filedlg.hxx -..\inc\fltdefs.hxx %_DEST%\inc%_EXT%\svtools\fltdefs.hxx -..\inc\imgdef.hxx %_DEST%\inc%_EXT%\svtools\imgdef.hxx -..\inc\inetdef.hxx %_DEST%\inc%_EXT%\svtools\inetdef.hxx -..\inc\inetmsg.hxx %_DEST%\inc%_EXT%\svtools\inetmsg.hxx -..\inc\inetstrm.hxx %_DEST%\inc%_EXT%\svtools\inetstrm.hxx -..\inc\listener.hxx %_DEST%\inc%_EXT%\svtools\listener.hxx -..\inc\listeneriter.hxx %_DEST%\inc%_EXT%\svtools\listeneriter.hxx -..\inc\memberid.hrc %_DEST%\inc%_EXT%\svtools\memberid.hrc -..\inc\prgsbar.hxx %_DEST%\inc%_EXT%\svtools\prgsbar.hxx -..\inc\poolcach.hxx %_DEST%\inc%_EXT%\svtools\poolcach.hxx -..\inc\ruler.hxx %_DEST%\inc%_EXT%\svtools\ruler.hxx -..\inc\scrwin.hxx %_DEST%\inc%_EXT%\svtools\scrwin.hxx -..\inc\scriptedtext.hxx %_DEST%\inc%_EXT%\svtools\scriptedtext.hxx -..\inc\tabbar.hxx %_DEST%\inc%_EXT%\svtools\tabbar.hxx -..\inc\taskbar.hxx %_DEST%\inc%_EXT%\svtools\taskbar.hxx -..\inc\whiter.hxx %_DEST%\inc%_EXT%\svtools\whiter.hxx -..\inc\stdmenu.hxx %_DEST%\inc%_EXT%\svtools\stdmenu.hxx -..\inc\tooltiplbox.hxx %_DEST%\inc%_EXT%\svtools\tooltiplbox.hxx -..\inc\txtattr.hxx %_DEST%\inc%_EXT%\svtools\txtattr.hxx -..\inc\sychconv.hxx %_DEST%\inc%_EXT%\svtools\sychconv.hxx -..\inc\cliplistener.hxx %_DEST%\inc%_EXT%\svtools\cliplistener.hxx -..\inc\txtcmp.hxx %_DEST%\inc%_EXT%\svtools\txtcmp.hxx -..\inc\urlbmk.hxx %_DEST%\inc%_EXT%\svtools\urlbmk.hxx -..\inc\inetimg.hxx %_DEST%\inc%_EXT%\svtools\inetimg.hxx -..\inc\nfsymbol.hxx %_DEST%\inc%_EXT%\svtools\nfsymbol.hxx -..\inc\numuno.hxx %_DEST%\inc%_EXT%\svtools\numuno.hxx -..\inc\imageresourceaccess.hxx %_DEST%\inc%_EXT%\svtools\imageresourceaccess.hxx -..\inc\addresstemplate.hxx %_DEST%\inc%_EXT%\svtools\addresstemplate.hxx -..\inc\templatefoldercache.hxx %_DEST%\inc%_EXT%\svtools\templatefoldercache.hxx -..\inc\folderrestriction.hxx %_DEST%\inc%_EXT%\svtools\folderrestriction.hxx -..\inc\filenotation.hxx %_DEST%\inc%_EXT%\svtools\filenotation.hxx -..\inc\framestatuslistener.hxx %_DEST%\inc%_EXT%\svtools\framestatuslistener.hxx -..\inc\statusbarcontroller.hxx %_DEST%\inc%_EXT%\svtools\statusbarcontroller.hxx -..\inc\htmltokn.h %_DEST%\inc%_EXT%\svtools\htmltokn.h -..\inc\htmlkywd.hxx %_DEST%\inc%_EXT%\svtools\htmlkywd.hxx -..\source\svrtf\rtfout.hxx %_DEST%\inc%_EXT%\svtools\rtfout.hxx -..\source\svrtf\rtftoken.h %_DEST%\inc%_EXT%\svtools\rtftoken.h -..\source\svrtf\rtfkeywd.hxx %_DEST%\inc%_EXT%\svtools\rtfkeywd.hxx -..\inc\strmadpt.hxx %_DEST%\inc%_EXT%\svtools\strmadpt.hxx -..\inc\instrm.hxx %_DEST%\inc%_EXT%\svtools\instrm.hxx -..\inc\outstrm.hxx %_DEST%\inc%_EXT%\svtools\outstrm.hxx -..\inc\sectctr.hxx %_DEST%\inc%_EXT%\svtools\sectctr.hxx -..\inc\privsplt.hxx %_DEST%\inc%_EXT%\svtools\privsplt.hxx -..\inc\expander.hxx %_DEST%\inc%_EXT%\svtools\expander.hxx -..\source\svsql\converter.hxx %_DEST%\inc%_EXT%\svtools\converter.hxx -..\inc\filectrl.hxx %_DEST%\inc%_EXT%\svtools\filectrl.hxx -..\inc\sfxecode.hxx %_DEST%\inc%_EXT%\svtools\sfxecode.hxx -..\source\dialogs\filedlg2.hrc %_DEST%\inc%_EXT%\svtools\filedlg2.hrc -..\inc\xmlement.hxx %_DEST%\inc%_EXT%\svtools\xmlement.hxx -..\inc\urihelper.hxx %_DEST%\inc%_EXT%\svtools\urihelper.hxx -..\inc\reginfo.hxx %_DEST%\inc%_EXT%\svtools\reginfo.hxx -..\inc\fstathelper.hxx %_DEST%\inc%_EXT%\svtools\fstathelper.hxx -..\inc\localresaccess.hxx %_DEST%\inc%_EXT%\svtools\localresaccess.hxx -..\inc\roadmap.hxx %_DEST%\inc%_EXT%\svtools\roadmap.hxx -..\inc\helpagentwindow.hxx %_DEST%\inc%_EXT%\svtools\helpagentwindow.hxx -..\inc\pickerhistory.hxx %_DEST%\inc%_EXT%\svtools\pickerhistory.hxx -..\inc\pickerhistoryaccess.hxx %_DEST%\inc%_EXT%\svtools\pickerhistoryaccess.hxx -..\inc\pickerhelper.hxx %_DEST%\inc%_EXT%\svtools\pickerhelper.hxx -..\inc\lngmisc.hxx %_DEST%\inc%_EXT%\svtools\lngmisc.hxx -..\inc\PasswordHelper.hxx %_DEST%\inc%_EXT%\svtools\PasswordHelper.hxx -..\inc\unoimap.hxx %_DEST%\inc%_EXT%\svtools\unoimap.hxx -..\inc\unoevent.hxx %_DEST%\inc%_EXT%\svtools\unoevent.hxx -..\inc\ivctrl.hxx %_DEST%\inc%_EXT%\svtools\ivctrl.hxx -..\inc\fileview.hxx %_DEST%\inc%_EXT%\svtools\fileview.hxx -..\inc\templdlg.hxx %_DEST%\inc%_EXT%\svtools\templdlg.hxx -..\inc\asynclink.hxx %_DEST%\inc%_EXT%\svtools\asynclink.hxx -..\inc\controldims.hrc %_DEST%\inc%_EXT%\svtools\controldims.hrc -..\inc\soerr.hxx %_DEST%\inc%_EXT%\svtools\soerr.hxx -..\inc\sores.hxx %_DEST%\inc%_EXT%\svtools\sores.hxx -..\inc\textwindowaccessibility.hxx %_DEST%\inc%_EXT%\svtools\textwindowaccessibility.hxx -..\inc\fontsubstconfig.hxx %_DEST%\inc%_EXT%\svtools\fontsubstconfig.hxx -..\inc\apearcfg.hxx %_DEST%\inc%_EXT%\svtools\apearcfg.hxx -..\inc\misccfg.hxx %_DEST%\inc%_EXT%\svtools\misccfg.hxx -..\inc\acceleratorexecute.hxx %_DEST%\inc%_EXT%\svtools\acceleratorexecute.hxx -..\inc\QueryFolderName.hxx %_DEST%\inc%_EXT%\svtools\QueryFolderName.hxx -..\inc\DocumentInfoPreview.hxx %_DEST%\inc%_EXT%\svtools\DocumentInfoPreview.hxx -..\inc\dialogclosedlistener.hxx %_DEST%\inc%_EXT%\svtools\dialogclosedlistener.hxx -..\inc\contextmenuhelper.hxx %_DEST%\inc%_EXT%\svtools\contextmenuhelper.hxx -..\inc\extcolorcfg.hxx %_DEST%\inc%_EXT%\svtools\extcolorcfg.hxx +..\inc\svl\*.hrc %_DEST%\inc%_EXT%\svtools\*.hrc +..\inc\svl\*.hxx %_DEST%\inc%_EXT%\svtools\*.hxx +..\inc\svl\*.h %_DEST%\inc%_EXT%\svtools\*.h +..\inc\*.hrc %_DEST%\inc%_EXT%\svtools\*.hrc +..\inc\*.hxx %_DEST%\inc%_EXT%\svtools\*.hxx +..\inc\*.h %_DEST%\inc%_EXT%\svtools\*.h dos: sh -c "if test %OS% = MACOSX; then macosx-create-bundle %_DEST%\bin%_EXT%\bmp=%__PRJROOT%\%__SRC%\bin%_EXT%; fi" diff --git a/svl/qa/complex/ConfigItems/helper/makefile.mk b/svl/qa/complex/ConfigItems/helper/makefile.mk index 6070d25b7bd4..d41fe6c129c6 100644 --- a/svl/qa/complex/ConfigItems/helper/makefile.mk +++ b/svl/qa/complex/ConfigItems/helper/makefile.mk @@ -34,7 +34,7 @@ #************************************************************************* PRJ=..$/..$/..$/.. -PRJNAME= svtools +PRJNAME= svl TARGET= ConfigItemTest USE_DEFFILE= TRUE ENABLE_EXCEPTIONS= TRUE @@ -60,7 +60,7 @@ SHL1OBJS= \ $(SLO)$/ConfigItemTest.obj SHL1STDLIBS= \ - $(SVTOOLLIB) \ + $(SVLIB) \ $(SVLLIB) \ $(UNOTOOLSLIB) \ $(COMPHELPERLIB) \ diff --git a/svl/qa/complex/ConfigItems/makefile.mk b/svl/qa/complex/ConfigItems/makefile.mk index f85c5b0a8e65..1291184346bc 100644 --- a/svl/qa/complex/ConfigItems/makefile.mk +++ b/svl/qa/complex/ConfigItems/makefile.mk @@ -34,7 +34,7 @@ #************************************************************************* PRJ = ..$/..$/.. TARGET = CheckConfigItems -PRJNAME = svtools +PRJNAME = svl PACKAGE = complex$/ConfigItems # --- Settings ----------------------------------------------------- diff --git a/svl/qa/complex/passwordcontainer/makefile.mk b/svl/qa/complex/passwordcontainer/makefile.mk index 4ce811bd3616..c3ff7538af0f 100644 --- a/svl/qa/complex/passwordcontainer/makefile.mk +++ b/svl/qa/complex/passwordcontainer/makefile.mk @@ -31,7 +31,7 @@ PRJ = ..$/..$/.. TARGET = PasswordContainerUnitTest -PRJNAME = svtools +PRJNAME=svl PACKAGE = complex$/passwordcontainer # --- Settings ----------------------------------------------------- diff --git a/svl/qa/makefile.mk b/svl/qa/makefile.mk index c56dc2804a64..439277ea62b0 100644 --- a/svl/qa/makefile.mk +++ b/svl/qa/makefile.mk @@ -30,7 +30,7 @@ #************************************************************************* PRJ = .. -PRJNAME = svtools +PRJNAME=svl TARGET = qa ENABLE_EXCEPTIONS = true @@ -49,7 +49,7 @@ SHL1STDLIBS=\ $(CPPULIB) \ $(CPPUHELPERLIB) \ $(SALLIB) \ - $(SVTOOLLIB) \ + $(SVLLIB) \ $(TOOLSLIB) \ $(UNOTOOLSLIB) \ $(TESTSHL2LIB) \ diff --git a/svl/qa/test_URIHelper.cxx b/svl/qa/test_URIHelper.cxx index a90fbe039b6d..3cf6d30d1813 100644 --- a/svl/qa/test_URIHelper.cxx +++ b/svl/qa/test_URIHelper.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include "sal/config.h" diff --git a/svl/source/config/cjkoptions.cxx b/svl/source/config/cjkoptions.cxx index 66d70cd1e2a3..8483614d63dd 100644 --- a/svl/source/config/cjkoptions.cxx +++ b/svl/source/config/cjkoptions.cxx @@ -29,12 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" - -#ifdef SVL_DLLIMPLEMENTATION -#undef SVL_DLLIMPLEMENTATION -#endif -#define SVT_DLLIMPLEMENTATION +#include "precompiled_svl.hxx" #include <svtools/cjkoptions.hxx> diff --git a/svl/source/config/ctloptions.cxx b/svl/source/config/ctloptions.cxx index 5d2bf131add1..3174577ea64f 100644 --- a/svl/source/config/ctloptions.cxx +++ b/svl/source/config/ctloptions.cxx @@ -29,12 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" - -#ifdef SVL_DLLIMPLEMENTATION -#undef SVL_DLLIMPLEMENTATION -#endif -#define SVT_DLLIMPLEMENTATION +#include "precompiled_svl.hxx" #include <svtools/ctloptions.hxx> diff --git a/svl/source/config/itemholder2.cxx b/svl/source/config/itemholder2.cxx index d0e5b30007f9..3796d9b45d75 100644 --- a/svl/source/config/itemholder2.cxx +++ b/svl/source/config/itemholder2.cxx @@ -29,12 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" - -#ifdef SVL_DLLIMPLEMENTATION -#undef SVL_DLLIMPLEMENTATION -#endif -#define SVT_DLLIMPLEMENTATION +#include "precompiled_svl.hxx" #include "itemholder2.hxx" @@ -43,21 +38,12 @@ #include <comphelper/processfactory.hxx> #include <com/sun/star/lang/XComponent.hpp> -#include <svtools/accessibilityoptions.hxx> -#include <apearcfg.hxx> #include <svtools/cjkoptions.hxx> -#include <svtools/menuoptions.hxx> -#include <svtools/colorcfg.hxx> #include <svtools/ctloptions.hxx> -#include <fontsubstconfig.hxx> -#include <svtools/helpopt.hxx> #include <svtools/languageoptions.hxx> -#include <misccfg.hxx> -#include <svtools/printoptions.hxx> +#include <svtools/misccfg.hxx> #include <svtools/syslocaleoptions.hxx> #include <unotools/options.hxx> -#include <svtools/miscopt.hxx> - #include <tools/debug.hxx> @@ -169,34 +155,14 @@ void ItemHolder2::impl_newItem(TItemInfo& rItem) { switch(rItem.eItem) { - case E_ACCESSIBILITYOPTIONS : - rItem.pItem = new SvtAccessibilityOptions(); - break; - - case E_APEARCFG : -// no ref count rItem.pItem = new SvtTabAppearanceCfg(); - break; - case E_CJKOPTIONS : rItem.pItem = new SvtCJKOptions(); break; - case E_COLORCFG : - rItem.pItem = new ::svtools::ColorConfig(); - break; - case E_CTLOPTIONS : rItem.pItem = new SvtCTLOptions(); break; - case E_FONTSUBSTCONFIG : -// no ref count rItem.pItem = new SvtFontSubstConfig(); - break; - - case E_HELPOPTIONS : - rItem.pItem = new SvtHelpOptions(); - break; - case E_LANGUAGEOPTIONS : // capsulate CTL and CJL options ! rItem.pItem = new SvtLanguageOptions(); break; @@ -205,26 +171,10 @@ void ItemHolder2::impl_newItem(TItemInfo& rItem) // no ref count rItem.pItem = new SfxMiscCfg(); break; - case E_MENUOPTIONS : - rItem.pItem = new SvtMenuOptions(); - break; - - case E_PRINTOPTIONS : - rItem.pItem = new SvtPrinterOptions(); - break; - - case E_PRINTFILEOPTIONS : - rItem.pItem = new SvtPrintFileOptions(); - break; - case E_SYSLOCALEOPTIONS : rItem.pItem = new SvtSysLocaleOptions(); break; - case E_MISCOPTIONS : - rItem.pItem = new SvtMiscOptions(); - break; - default: OSL_ASSERT(false); break; diff --git a/svl/source/config/languageoptions.cxx b/svl/source/config/languageoptions.cxx index 0dffafee86d2..57beb23053b2 100644 --- a/svl/source/config/languageoptions.cxx +++ b/svl/source/config/languageoptions.cxx @@ -29,12 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" - -#ifdef SVL_DLLIMPLEMENTATION -#undef SVL_DLLIMPLEMENTATION -#endif -#define SVT_DLLIMPLEMENTATION +#include "precompiled_svl.hxx" #include <svtools/languageoptions.hxx> #include <svtools/cjkoptions.hxx> diff --git a/svl/source/config/makefile.mk b/svl/source/config/makefile.mk index d3f2615776da..e9beacce6a8e 100644 --- a/svl/source/config/makefile.mk +++ b/svl/source/config/makefile.mk @@ -30,7 +30,7 @@ #************************************************************************* PRJ=..$/.. -PRJNAME=svtools +PRJNAME=svl TARGET=config ENABLE_EXCEPTIONS := TRUE @@ -43,21 +43,11 @@ ENABLE_EXCEPTIONS := TRUE # --- Files -------------------------------------------------------- SLOFILES= \ - $(SLO)$/accessibilityoptions.obj \ - $(SLO)$/apearcfg.obj \ $(SLO)$/cjkoptions.obj \ - $(SLO)$/colorcfg.obj \ $(SLO)$/ctloptions.obj \ - $(SLO)$/extcolorcfg.obj \ - $(SLO)$/fontsubstconfig.obj \ - $(SLO)$/helpopt.obj \ - $(SLO)$/itemholder2.obj \ + $(SLO)$/itemholder2.obj \ $(SLO)$/languageoptions.obj \ - $(SLO)$/menuoptions.obj \ - $(SLO)$/misccfg.obj \ - $(SLO)$/miscopt.obj \ - $(SLO)$/optionsdrawinglayer.obj \ - $(SLO)$/printoptions.obj \ + $(SLO)$/misccfg.obj \ $(SLO)$/syslocaleoptions.obj # --- Targets ------------------------------------------------------ diff --git a/svl/source/config/misccfg.cxx b/svl/source/config/misccfg.cxx index 06cc9b7446c0..fd531b16a4f5 100644 --- a/svl/source/config/misccfg.cxx +++ b/svl/source/config/misccfg.cxx @@ -29,12 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" - -#ifdef SVL_DLLIMPLEMENTATION -#undef SVL_DLLIMPLEMENTATION -#endif -#define SVT_DLLIMPLEMENTATION +#include "precompiled_svl.hxx" #include "misccfg.hxx" #include <svtools/zforlist.hxx> diff --git a/svl/source/config/syslocaleoptions.cxx b/svl/source/config/syslocaleoptions.cxx index a75c63e34af0..48b3981067df 100644 --- a/svl/source/config/syslocaleoptions.cxx +++ b/svl/source/config/syslocaleoptions.cxx @@ -29,12 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" - -#ifdef SVL_DLLIMPLEMENTATION -#undef SVL_DLLIMPLEMENTATION -#endif -#define SVT_DLLIMPLEMENTATION +#include "precompiled_svl.hxx" #include <svtools/syslocaleoptions.hxx> #include <broadcast.hxx> diff --git a/svl/source/filepicker/makefile.mk b/svl/source/filepicker/makefile.mk index d00ac5170e1a..644c70af0b1a 100644 --- a/svl/source/filepicker/makefile.mk +++ b/svl/source/filepicker/makefile.mk @@ -30,7 +30,7 @@ #************************************************************************* PRJ=..$/.. -PRJNAME=svtools +PRJNAME=svl TARGET=filepicker ENABLE_EXCEPTIONS=TRUE diff --git a/svl/source/filepicker/pickerhelper.cxx b/svl/source/filepicker/pickerhelper.cxx index 0d8b2db9d8a0..cda263338d5d 100644 --- a/svl/source/filepicker/pickerhelper.cxx +++ b/svl/source/filepicker/pickerhelper.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include "pickerhelper.hxx" #include "rtl/ustring.hxx" diff --git a/svl/source/filepicker/pickerhistory.cxx b/svl/source/filepicker/pickerhistory.cxx index 5bd584618f09..5cc12779f0b5 100644 --- a/svl/source/filepicker/pickerhistory.cxx +++ b/svl/source/filepicker/pickerhistory.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include "pickerhistory.hxx" #include "pickerhistoryaccess.hxx" #include <cppuhelper/weakref.hxx> diff --git a/svl/source/filerec/filerec.cxx b/svl/source/filerec/filerec.cxx index 262e5135572a..5bb1a95c9a02 100644 --- a/svl/source/filerec/filerec.cxx +++ b/svl/source/filerec/filerec.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include <svtools/filerec.hxx> #include <osl/endian.h> diff --git a/svl/source/filerec/makefile.mk b/svl/source/filerec/makefile.mk index 33e4b4923183..c590e38a7ea1 100644 --- a/svl/source/filerec/makefile.mk +++ b/svl/source/filerec/makefile.mk @@ -31,7 +31,7 @@ PRJ=..$/.. -PRJNAME=svtools +PRJNAME=svl TARGET=filerec # --- Settings ----------------------------------------------------- diff --git a/svl/source/fsstor/fsfactory.cxx b/svl/source/fsstor/fsfactory.cxx index 33df962be846..e47593ba8f8b 100644 --- a/svl/source/fsstor/fsfactory.cxx +++ b/svl/source/fsstor/fsfactory.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include "fsfactory.hxx" #include "cppuhelper/factory.hxx" diff --git a/svl/source/fsstor/fsstorage.cxx b/svl/source/fsstor/fsstorage.cxx index cec018533a9a..bae02feae1dd 100644 --- a/svl/source/fsstor/fsstorage.cxx +++ b/svl/source/fsstor/fsstorage.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/embed/ElementModes.hpp> #include <com/sun/star/embed/XTransactedObject.hpp> diff --git a/svl/source/fsstor/makefile.mk b/svl/source/fsstor/makefile.mk index f55f6747f9e1..7f46009750fd 100644 --- a/svl/source/fsstor/makefile.mk +++ b/svl/source/fsstor/makefile.mk @@ -30,7 +30,7 @@ #************************************************************************* PRJ=..$/.. -PRJNAME=svtools +PRJNAME=svl TARGET=fsstorage.uno LIBTARGET=NO ENABLE_EXCEPTIONS=TRUE diff --git a/svl/source/fsstor/oinputstreamcontainer.cxx b/svl/source/fsstor/oinputstreamcontainer.cxx index dc08a7a34602..53be03699ba0 100644 --- a/svl/source/fsstor/oinputstreamcontainer.cxx +++ b/svl/source/fsstor/oinputstreamcontainer.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include "oinputstreamcontainer.hxx" #include <cppuhelper/typeprovider.hxx> diff --git a/svl/source/fsstor/ostreamcontainer.cxx b/svl/source/fsstor/ostreamcontainer.cxx index d801f49532b2..dac7c9c31375 100644 --- a/svl/source/fsstor/ostreamcontainer.cxx +++ b/svl/source/fsstor/ostreamcontainer.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include "ostreamcontainer.hxx" diff --git a/svl/source/items/aeitem.cxx b/svl/source/items/aeitem.cxx index 63fbd1db6227..54ce914d09fe 100644 --- a/svl/source/items/aeitem.cxx +++ b/svl/source/items/aeitem.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #ifndef GCC #endif diff --git a/svl/source/items/bintitem.cxx b/svl/source/items/bintitem.cxx index a3b6c1c2b54d..1ee0ebe224e1 100644 --- a/svl/source/items/bintitem.cxx +++ b/svl/source/items/bintitem.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include <com/sun/star/uno/Any.hxx> #include <tools/stream.hxx> #include <tools/bigint.hxx> diff --git a/svl/source/items/cenumitm.cxx b/svl/source/items/cenumitm.cxx index 1906e62a8cf8..65cc4a78be54 100644 --- a/svl/source/items/cenumitm.cxx +++ b/svl/source/items/cenumitm.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include <com/sun/star/uno/Any.hxx> #include <tools/stream.hxx> #include <svtools/cenumitm.hxx> diff --git a/svl/source/items/cintitem.cxx b/svl/source/items/cintitem.cxx index 97cce9b75591..a20c947b56de 100644 --- a/svl/source/items/cintitem.cxx +++ b/svl/source/items/cintitem.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include <com/sun/star/uno/Any.hxx> #include <tools/stream.hxx> #include <svtools/cintitem.hxx> diff --git a/svl/source/items/cntwall.cxx b/svl/source/items/cntwall.cxx index 67e9387fbe26..5d4941981ec4 100644 --- a/svl/source/items/cntwall.cxx +++ b/svl/source/items/cntwall.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include <tools/debug.hxx> #include <tools/string.hxx> diff --git a/svl/source/items/cstitem.cxx b/svl/source/items/cstitem.cxx index 9755f4bb9944..eb9092828060 100644 --- a/svl/source/items/cstitem.cxx +++ b/svl/source/items/cstitem.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include <com/sun/star/uno/Any.hxx> #include <unotools/intlwrapper.hxx> @@ -38,7 +38,7 @@ #include <tools/debug.hxx> #include <tools/datetime.hxx> -#include <svtools/svtdata.hxx> +#include <svtools/svldata.hxx> #include <svtools/cstitem.hxx> #include <svtools/svtools.hrc> @@ -150,70 +150,70 @@ SfxItemPresentation SfxCrawlStatusItem::GetPresentation switch (eStatus) { case CSTAT_NEVER_UPD: - rText = String(SvtResId(STR_CSTAT_NEVER_UPD, + rText = String(SvtSimpleResId(STR_CSTAT_NEVER_UPD, pIntlWrapper ? pIntlWrapper->getLocale() : aLocale)); break; case CSTAT_IN_UPD: - rText = String(SvtResId(STR_CSTAT_IN_UPD, + rText = String(SvtSimpleResId(STR_CSTAT_IN_UPD, pIntlWrapper ? pIntlWrapper->getLocale() : aLocale)); break; case CSTAT_UPD_NEWER: - rText = String(SvtResId(STR_CSTAT_UPD_NEWER, + rText = String(SvtSimpleResId(STR_CSTAT_UPD_NEWER, pIntlWrapper ? pIntlWrapper->getLocale() : aLocale)); break; case CSTAT_UPD_NOT_NEWER: - rText = String(SvtResId(STR_CSTAT_UPD_NOT_NEWER, + rText = String(SvtSimpleResId(STR_CSTAT_UPD_NOT_NEWER, pIntlWrapper ? pIntlWrapper->getLocale() : aLocale)); break; case CSTAT_UPD_CANCEL: - rText = String(SvtResId(STR_CSTAT_UPD_CANCEL, + rText = String(SvtSimpleResId(STR_CSTAT_UPD_CANCEL, pIntlWrapper ? pIntlWrapper->getLocale() : aLocale)); break; case CSTAT_ERR_GENERAL: - rText = String(SvtResId(STR_CSTAT_ERR_GENERAL, + rText = String(SvtSimpleResId(STR_CSTAT_ERR_GENERAL, pIntlWrapper ? pIntlWrapper->getLocale() : aLocale)); break; case CSTAT_ERR_NOTEXISTS: - rText = String(SvtResId(STR_CSTAT_ERR_NOTEXISTS, + rText = String(SvtSimpleResId(STR_CSTAT_ERR_NOTEXISTS, pIntlWrapper ? pIntlWrapper->getLocale() : aLocale)); break; case CSTAT_ERR_NOTREACHED: - rText = String(SvtResId(STR_CSTAT_ERR_NOTREACHED, + rText = String(SvtSimpleResId(STR_CSTAT_ERR_NOTREACHED, pIntlWrapper ? pIntlWrapper->getLocale() : aLocale)); break; case CSTAT_UPD_IMMEDIATELY: - rText = String(SvtResId(STR_CSTAT_UPD_IMMEDIATELY, + rText = String(SvtSimpleResId(STR_CSTAT_UPD_IMMEDIATELY, pIntlWrapper ? pIntlWrapper->getLocale() : aLocale)); break; case CSTAT_ERR_OFFLINE: - rText = String(SvtResId(STR_CSTAT_ERR_OFFLINE, + rText = String(SvtSimpleResId(STR_CSTAT_ERR_OFFLINE, pIntlWrapper ? pIntlWrapper->getLocale() : aLocale)); diff --git a/svl/source/items/ctypeitm.cxx b/svl/source/items/ctypeitm.cxx index 552d4a6a9041..a5c12d49dda5 100644 --- a/svl/source/items/ctypeitm.cxx +++ b/svl/source/items/ctypeitm.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include <com/sun/star/uno/Any.hxx> #include <unotools/intlwrapper.hxx> diff --git a/svl/source/items/custritm.cxx b/svl/source/items/custritm.cxx index 9f573beb56fd..5e2be8469922 100644 --- a/svl/source/items/custritm.cxx +++ b/svl/source/items/custritm.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include <com/sun/star/uno/Any.hxx> #include <unotools/intlwrapper.hxx> diff --git a/svl/source/items/dateitem.cxx b/svl/source/items/dateitem.cxx index 4ba6e1d460f9..5ce66349c0a3 100644 --- a/svl/source/items/dateitem.cxx +++ b/svl/source/items/dateitem.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" // include --------------------------------------------------------------- @@ -50,7 +50,7 @@ #include <vcl/svapp.hxx> -#include <svtools/svtdata.hxx> +#include <svtools/svldata.hxx> #include <svtools/svtools.hrc> // STATIC DATA ----------------------------------------------------------- @@ -259,7 +259,7 @@ SfxItemPresentation SfxColumnDateTimeItem::GetPresentation ::com::sun::star::lang::Locale aLocale; if (GetDateTime() == DateTime(Date(1, 2, 3), Time(3, 2, 1))) - rText = String(SvtResId(STR_COLUM_DT_AUTO, + rText = String(SvtSimpleResId(STR_COLUM_DT_AUTO, pIntlWrapper ? pIntlWrapper->getLocale() : aLocale)); diff --git a/svl/source/items/dtritem.cxx b/svl/source/items/dtritem.cxx index fa3a36b762f5..5159631f713a 100644 --- a/svl/source/items/dtritem.cxx +++ b/svl/source/items/dtritem.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/util/DateTimeRange.hpp> diff --git a/svl/source/items/eitem.cxx b/svl/source/items/eitem.cxx index f7b95665391d..1dc137f32467 100644 --- a/svl/source/items/eitem.cxx +++ b/svl/source/items/eitem.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include <svtools/eitem.hxx> //============================================================================ // diff --git a/svl/source/items/flagitem.cxx b/svl/source/items/flagitem.cxx index e59f981c5afa..e2e0bd55f919 100644 --- a/svl/source/items/flagitem.cxx +++ b/svl/source/items/flagitem.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include <svtools/flagitem.hxx> #include <svtools/poolitem.hxx> diff --git a/svl/source/items/frqitem.cxx b/svl/source/items/frqitem.cxx index 4068ef8f97f1..b7d47e4e3ac9 100644 --- a/svl/source/items/frqitem.cxx +++ b/svl/source/items/frqitem.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #ifndef GCC #endif diff --git a/svl/source/items/globalnameitem.cxx b/svl/source/items/globalnameitem.cxx index 6a8359fb39b8..e8beb9a62b9e 100644 --- a/svl/source/items/globalnameitem.cxx +++ b/svl/source/items/globalnameitem.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/script/XTypeConverter.hpp> diff --git a/svl/source/items/ilstitem.cxx b/svl/source/items/ilstitem.cxx index a26c054eeadb..3d600632118f 100644 --- a/svl/source/items/ilstitem.cxx +++ b/svl/source/items/ilstitem.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include <com/sun/star/script/XTypeConverter.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/svl/source/items/imageitm.cxx b/svl/source/items/imageitm.cxx index cc4a2ebd4f3b..276e7445ae3f 100644 --- a/svl/source/items/imageitm.cxx +++ b/svl/source/items/imageitm.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include <svtools/imageitm.hxx> #include <com/sun/star/uno/Sequence.hxx> diff --git a/svl/source/items/intitem.cxx b/svl/source/items/intitem.cxx index b20f245f964b..245e9734aa89 100644 --- a/svl/source/items/intitem.cxx +++ b/svl/source/items/intitem.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include <svtools/intitem.hxx> #include <com/sun/star/uno/Any.hxx> diff --git a/svl/source/items/itemiter.cxx b/svl/source/items/itemiter.cxx index 9a7fa4d72c88..3bd616054149 100644 --- a/svl/source/items/itemiter.cxx +++ b/svl/source/items/itemiter.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #ifndef GCC #endif diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx index 823658132fe0..50f5c1fee817 100644 --- a/svl/source/items/itempool.cxx +++ b/svl/source/items/itempool.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include <string.h> #include <stdio.h> diff --git a/svl/source/items/itemprop.cxx b/svl/source/items/itemprop.cxx index 354e0a1441ba..cf2677dd988c 100644 --- a/svl/source/items/itemprop.cxx +++ b/svl/source/items/itemprop.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include <svtools/itemprop.hxx> #include <svtools/itempool.hxx> diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx index fee00dca854a..05873c0d5b41 100644 --- a/svl/source/items/itemset.cxx +++ b/svl/source/items/itemset.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include <string.h> diff --git a/svl/source/items/lckbitem.cxx b/svl/source/items/lckbitem.cxx index c848e377b257..695a80ecf0a4 100644 --- a/svl/source/items/lckbitem.cxx +++ b/svl/source/items/lckbitem.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #define _LCKBITEM_CXX #include <svtools/lckbitem.hxx> diff --git a/svl/source/items/macitem.cxx b/svl/source/items/macitem.cxx index 480fb844ccc7..4837f9cb88e0 100644 --- a/svl/source/items/macitem.cxx +++ b/svl/source/items/macitem.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include <tools/stream.hxx> #ifndef GCC diff --git a/svl/source/items/makefile.mk b/svl/source/items/makefile.mk index 651e54bb7e23..ea376eeb08ee 100644 --- a/svl/source/items/makefile.mk +++ b/svl/source/items/makefile.mk @@ -30,14 +30,14 @@ #************************************************************************* PRJ=..$/.. -PRJNAME=svtools +PRJNAME=svl TARGET=items ENABLE_EXCEPTIONS=TRUE # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/svt.pmk +.INCLUDE : $(PRJ)$/util$/svl.pmk # --- Files -------------------------------------------------------- @@ -48,7 +48,6 @@ SLOFILES=\ $(SLO)$/globalnameitem.obj \ $(SLO)$/imageitm.obj \ $(SLO)$/intitem.obj \ - $(SLO)$/itemdel.obj \ $(SLO)$/macitem.obj \ $(SLO)$/poolcach.obj \ $(SLO)$/ptitem.obj \ @@ -56,8 +55,37 @@ SLOFILES=\ $(SLO)$/rngitem.obj \ $(SLO)$/stritem.obj \ $(SLO)$/style.obj \ - $(SLO)$/szitem.obj \ - $(SLO)$/wallitem.obj + $(SLO)$/szitem.obj \ + $(SLO)$/bintitem.obj \ + $(SLO)$/cenumitm.obj \ + $(SLO)$/cintitem.obj \ + $(SLO)$/cntwall.obj \ + $(SLO)$/cstitem.obj \ + $(SLO)$/ctypeitm.obj \ + $(SLO)$/custritm.obj \ + $(SLO)$/dateitem.obj \ + $(SLO)$/dtritem.obj \ + $(SLO)$/frqitem.obj \ + $(SLO)$/ilstitem.obj \ + $(SLO)$/itemiter.obj \ + $(SLO)$/itempool.obj \ + $(SLO)$/itemprop.obj \ + $(SLO)$/itemset.obj \ + $(SLO)$/lckbitem.obj \ + $(SLO)$/poolio.obj \ + $(SLO)$/stylepool.obj \ + $(SLO)$/poolitem.obj \ + $(SLO)$/sfontitm.obj \ + $(SLO)$/sitem.obj \ + $(SLO)$/slstitm.obj \ + $(SLO)$/tfrmitem.obj \ + $(SLO)$/tresitem.obj \ + $(SLO)$/whiter.obj \ + $(SLO)$/visitem.obj + +SRS1NAME=$(TARGET) +SRC1FILES=\ + cstitem.src # --- Targets ------------------------------------------------------- diff --git a/svl/source/items/nranges.cxx b/svl/source/items/nranges.cxx index e12c7428d513..789da8dc5ff9 100644 --- a/svl/source/items/nranges.cxx +++ b/svl/source/items/nranges.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" // compiled via include from itemset.cxx only! diff --git a/svl/source/items/poolcach.cxx b/svl/source/items/poolcach.cxx index 2c758a7e25fa..634b1cae1c14 100644 --- a/svl/source/items/poolcach.cxx +++ b/svl/source/items/poolcach.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include <limits.h> diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx index f2eb94ef7f67..bee7bc04ae23 100644 --- a/svl/source/items/poolio.cxx +++ b/svl/source/items/poolio.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include <string.h> #include <stdio.h> @@ -42,7 +42,7 @@ #include "whassert.hxx" #include <svtools/brdcst.hxx> #include <svtools/filerec.hxx> -#include <svtools/svtdata.hxx> +#include <svtools/svldata.hxx> #include "poolio.hxx" // STATIC DATA ----------------------------------------------------------- @@ -67,7 +67,7 @@ void SfxItemPool::SetStoringPool( const SfxItemPool *pStoringPool ) */ { - ImpSvtData::GetSvtData().pStoringPool = pStoringPool; + ImpSvlData::GetSvlData().pStoringPool = pStoringPool; } //------------------------------------------------------------------------- @@ -84,7 +84,7 @@ const SfxItemPool* SfxItemPool::GetStoringPool() */ { - return ImpSvtData::GetSvtData().pStoringPool; + return ImpSvlData::GetSvlData().pStoringPool; } //------------------------------------------------------------------------- @@ -169,7 +169,7 @@ SvStream &SfxItemPool::Store(SvStream &rStream) const // jeder Pool ist als ganzes ein Record SfxMiniRecordWriter aPoolRec( &rStream, SFX_ITEMPOOL_REC ); - ImpSvtData::GetSvtData().pStoringPool = this; + ImpSvlData::GetSvlData().pStoringPool = this; // Einzel-Header (Version des Inhalts und Name) { @@ -309,7 +309,7 @@ SvStream &SfxItemPool::Store(SvStream &rStream) const } // weitere Pools rausschreiben - ImpSvtData::GetSvtData().pStoringPool = 0; + ImpSvlData::GetSvlData().pStoringPool = 0; aPoolRec.Close(); if ( !rStream.GetError() && pSecondary ) pSecondary->Store( rStream ); diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx index ef160b4a8b4c..8946175a0dd2 100644 --- a/svl/source/items/poolitem.cxx +++ b/svl/source/items/poolitem.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include <svtools/poolitem.hxx> #include <tools/stream.hxx> diff --git a/svl/source/items/ptitem.cxx b/svl/source/items/ptitem.cxx index ac1e94fd1727..5d8497dd0ada 100644 --- a/svl/source/items/ptitem.cxx +++ b/svl/source/items/ptitem.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include <svtools/ptitem.hxx> #include <com/sun/star/uno/Any.hxx> diff --git a/svl/source/items/rectitem.cxx b/svl/source/items/rectitem.cxx index f9faeeeaa824..e88d2886b7c0 100644 --- a/svl/source/items/rectitem.cxx +++ b/svl/source/items/rectitem.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include <svtools/rectitem.hxx> #include <com/sun/star/uno/Any.hxx> diff --git a/svl/source/items/rngitem.cxx b/svl/source/items/rngitem.cxx index 0c62de7229f4..17ff38a01382 100644 --- a/svl/source/items/rngitem.cxx +++ b/svl/source/items/rngitem.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include <tools/stream.hxx> #ifndef NUMTYPE diff --git a/svl/source/items/sfontitm.cxx b/svl/source/items/sfontitm.cxx index ee7119c95e1c..6413cbc8d1cc 100644 --- a/svl/source/items/sfontitm.cxx +++ b/svl/source/items/sfontitm.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include <tools/stream.hxx> #include <tools/vcompat.hxx> #include <svtools/sfontitm.hxx> diff --git a/svl/source/items/sitem.cxx b/svl/source/items/sitem.cxx index 2a917e93bb79..04ae8becfde0 100644 --- a/svl/source/items/sitem.cxx +++ b/svl/source/items/sitem.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" // INCLUDE --------------------------------------------------------------- #ifndef GCC diff --git a/svl/source/items/slstitm.cxx b/svl/source/items/slstitm.cxx index 87163d41e033..12b2aa2dbd4b 100644 --- a/svl/source/items/slstitm.cxx +++ b/svl/source/items/slstitm.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include <svtools/slstitm.hxx> #include <svtools/poolitem.hxx> diff --git a/svl/source/items/stritem.cxx b/svl/source/items/stritem.cxx index 37968dc3ee1d..4b24b5712fe1 100644 --- a/svl/source/items/stritem.cxx +++ b/svl/source/items/stritem.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include <svtools/stritem.hxx> //============================================================================ diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx index ad11f1527ce7..68bae3f8142e 100644 --- a/svl/source/items/style.cxx +++ b/svl/source/items/style.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #ifndef GCC #endif diff --git a/svl/source/items/szitem.cxx b/svl/source/items/szitem.cxx index ec3ff83dd2ec..de18e13b04d7 100644 --- a/svl/source/items/szitem.cxx +++ b/svl/source/items/szitem.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include <svtools/szitem.hxx> #include <com/sun/star/uno/Any.hxx> diff --git a/svl/source/items/tfrmitem.cxx b/svl/source/items/tfrmitem.cxx index a7019ff69947..d4909aca049c 100644 --- a/svl/source/items/tfrmitem.cxx +++ b/svl/source/items/tfrmitem.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include <com/sun/star/uno/Any.hxx> #include <tools/stream.hxx> diff --git a/svl/source/items/tresitem.cxx b/svl/source/items/tresitem.cxx index 6e70c82a4d03..4ad6fa3c1b77 100644 --- a/svl/source/items/tresitem.cxx +++ b/svl/source/items/tresitem.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include <svtools/tresitem.hxx> using namespace com::sun::star; diff --git a/svl/source/items/visitem.cxx b/svl/source/items/visitem.cxx index 112b223a8be0..a4f10b98303c 100644 --- a/svl/source/items/visitem.cxx +++ b/svl/source/items/visitem.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include <svtools/visitem.hxx> #include <com/sun/star/uno/Any.hxx> #include <tools/stream.hxx> diff --git a/svl/source/items/whiter.cxx b/svl/source/items/whiter.cxx index 461daf7ac012..4b582900d152 100644 --- a/svl/source/items/whiter.cxx +++ b/svl/source/items/whiter.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" // INCLUDE --------------------------------------------------------------- #ifndef GCC #endif diff --git a/svl/source/memtools/makefile.mk b/svl/source/memtools/makefile.mk index 4592bceff8cc..8f59391a25ee 100644 --- a/svl/source/memtools/makefile.mk +++ b/svl/source/memtools/makefile.mk @@ -31,7 +31,7 @@ PRJ=..$/.. -PRJNAME=svtools +PRJNAME=svl TARGET=svarray # --- Settings ----------------------------------------------------- diff --git a/svl/source/memtools/svarray.cxx b/svl/source/memtools/svarray.cxx index fe682e5f535d..40a77aefd711 100644 --- a/svl/source/memtools/svarray.cxx +++ b/svl/source/memtools/svarray.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #define _SVARRAY_CXX diff --git a/svl/source/misc/PasswordHelper.cxx b/svl/source/misc/PasswordHelper.cxx index 53c447bde830..a1125306eb7b 100644 --- a/svl/source/misc/PasswordHelper.cxx +++ b/svl/source/misc/PasswordHelper.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #ifndef GCC diff --git a/svl/source/misc/adrparse.cxx b/svl/source/misc/adrparse.cxx index 37c25d6c669f..2dcece9e2671 100644 --- a/svl/source/misc/adrparse.cxx +++ b/svl/source/misc/adrparse.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include <tools/inetmime.hxx> #include <adrparse.hxx> diff --git a/svl/source/misc/documentlockfile.cxx b/svl/source/misc/documentlockfile.cxx index 1f54a6771f95..3de51f2fc8c6 100644 --- a/svl/source/misc/documentlockfile.cxx +++ b/svl/source/misc/documentlockfile.cxx @@ -30,7 +30,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include <stdio.h> diff --git a/svl/source/misc/filenotation.cxx b/svl/source/misc/filenotation.cxx index f5e5ae934e3d..d50645c97439 100644 --- a/svl/source/misc/filenotation.cxx +++ b/svl/source/misc/filenotation.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include "filenotation.hxx" #include <osl/file.h> #include <osl/diagnose.h> diff --git a/svl/source/misc/flbytes.cxx b/svl/source/misc/flbytes.cxx index acf53d9b3e94..ce414be8e838 100644 --- a/svl/source/misc/flbytes.cxx +++ b/svl/source/misc/flbytes.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include <vcl/svapp.hxx> #include <flbytes.hxx> diff --git a/svl/source/misc/folderrestriction.cxx b/svl/source/misc/folderrestriction.cxx index 7f95bdaaa0bc..9ec7ead0a4be 100644 --- a/svl/source/misc/folderrestriction.cxx +++ b/svl/source/misc/folderrestriction.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include "folderrestriction.hxx" #include "osl/process.h" diff --git a/svl/source/misc/fstathelper.cxx b/svl/source/misc/fstathelper.cxx index 82480fc83473..43619e879a91 100644 --- a/svl/source/misc/fstathelper.cxx +++ b/svl/source/misc/fstathelper.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include <tools/date.hxx> #include <tools/time.hxx> #include <tools/string.hxx> diff --git a/svl/source/misc/inethist.cxx b/svl/source/misc/inethist.cxx index 5a1a3719d7ca..5dfc2744f67a 100644 --- a/svl/source/misc/inethist.cxx +++ b/svl/source/misc/inethist.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include <svtools/inethist.hxx> #ifndef INCLUDED_ALGORITHM diff --git a/svl/source/misc/inettype.cxx b/svl/source/misc/inettype.cxx index ce62d7f3b2fc..f0e62b798cff 100644 --- a/svl/source/misc/inettype.cxx +++ b/svl/source/misc/inettype.cxx @@ -29,11 +29,11 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include <tools/table.hxx> #include <tools/wldcrd.hxx> #include <svtools/inettype.hxx> -#include <svtools/svtdata.hxx> +#include <svtools/svldata.hxx> #ifndef _SVTOOLS_HRC #include <svtools/svtools.hrc> #endif diff --git a/svl/source/misc/lngmisc.cxx b/svl/source/misc/lngmisc.cxx index e00540af1ab1..df7c28d22b1d 100644 --- a/svl/source/misc/lngmisc.cxx +++ b/svl/source/misc/lngmisc.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include <lngmisc.hxx> #include <tools/solar.h> #include <tools/string.hxx> diff --git a/svl/source/misc/lockfilecommon.cxx b/svl/source/misc/lockfilecommon.cxx index ba4440c462a8..8d0bc0f26415 100644 --- a/svl/source/misc/lockfilecommon.cxx +++ b/svl/source/misc/lockfilecommon.cxx @@ -30,7 +30,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include <stdio.h> diff --git a/svl/uno/makefile.mk b/svl/source/misc/makefile.mk index 8f61c7100508..93ebc7f9470c 100644 --- a/svl/uno/makefile.mk +++ b/svl/source/misc/makefile.mk @@ -1,14 +1,14 @@ #************************************************************************* # # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# +# # Copyright 2008 by Sun Microsystems, Inc. # # OpenOffice.org - a multi-platform office productivity suite # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.4 $ +# $Revision: 1.6 $ # # This file is part of OpenOffice.org. # @@ -29,53 +29,47 @@ # #************************************************************************* -PRJ=.. -PRJNAME=svtools -TARGET=svtmisc.uno -LIBTARGET=NO -ENABLE_EXCEPTIONS=TRUE -VISIBILITY_HIDDEN=TRUE +PRJ=..$/.. +PRJNAME=svl +TARGET=misc -# --- Settings ---------------------------------- +# --- Settings ----------------------------------------------------- -.INCLUDE : settings.mk -DLLPRE= +.INCLUDE : settings.mk +.INCLUDE : $(PRJ)$/util$/svl.pmk -# --- Files ------------------------------------- +# --- Files -------------------------------------------------------- -SLOFILES= \ - $(SLO)$/addrtempuno.obj \ - $(SLO)$/miscservices.obj \ - $(SLO)$/pathservice.obj +EXCEPTIONSFILES=\ + $(SLO)$/documentlockfile.obj \ + $(SLO)$/flbytes.obj \ + $(SLO)$/folderrestriction.obj \ + $(SLO)$/fstathelper.obj \ + $(SLO)$/lockfilecommon.obj \ + $(SLO)$/ownlist.obj \ + $(SLO)$/restrictedpaths.obj \ + $(SLO)$/sharecontrolfile.obj \ + $(SLO)$/strmadpt.obj \ + $(SLO)$/svldata.obj \ + $(SLO)$/urihelper.obj -SHL1TARGET= $(TARGET) -SHL1IMPLIB= i$(TARGET) +SLOFILES=\ + $(EXCEPTIONSFILES) \ + $(SLO)$/adrparse.obj \ + $(SLO)$/filenotation.obj \ + $(SLO)$/inethist.obj \ + $(SLO)$/inettype.obj \ + $(SLO)$/lngmisc.obj \ + $(SLO)$/PasswordHelper.obj -SHL1OBJS= \ - $(SLO)$/svtdata.obj \ - $(SLOFILES) +SRS1NAME=$(TARGET) +SRC1FILES=\ + mediatyp.src -SHL1LIBS= \ - $(SLB)$/filter.uno.lib +# --- Targets ------------------------------------------------------- -SHL1STDLIBS=\ - $(SVTOOLLIB) \ - $(TKLIB) \ - $(VCLLIB) \ - $(SVLLIB) \ - $(UNOTOOLSLIB) \ - $(TOOLSLIB) \ - $(COMPHELPERLIB) \ - $(VOSLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SALLIB) +.INCLUDE : target.mk -SHL1VERSIONMAP=exports.map -SHL1DEF= $(MISC)$/$(SHL1TARGET).def -DEF1NAME= $(SHL1TARGET) -# --- Targets ---------------------------------- -.INCLUDE : target.mk diff --git a/svl/source/misc/ownlist.cxx b/svl/source/misc/ownlist.cxx index 346b4ff7251e..e642f00ba826 100644 --- a/svl/source/misc/ownlist.cxx +++ b/svl/source/misc/ownlist.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include <ctype.h> #include <stdio.h> #include <com/sun/star/beans/PropertyValues.hpp> diff --git a/svl/source/misc/restrictedpaths.cxx b/svl/source/misc/restrictedpaths.cxx index 354e32126680..286b046a5067 100644 --- a/svl/source/misc/restrictedpaths.cxx +++ b/svl/source/misc/restrictedpaths.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include <svtools/restrictedpaths.hxx> #include <algorithm> diff --git a/svl/source/misc/sharecontrolfile.cxx b/svl/source/misc/sharecontrolfile.cxx index 32d7b1873f68..2a151b24fd26 100644 --- a/svl/source/misc/sharecontrolfile.cxx +++ b/svl/source/misc/sharecontrolfile.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include <stdio.h> diff --git a/svl/source/misc/strmadpt.cxx b/svl/source/misc/strmadpt.cxx index 4c4835609b7b..9803f2bcc32f 100644 --- a/svl/source/misc/strmadpt.cxx +++ b/svl/source/misc/strmadpt.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include <functional> // needed under Solaris when including <algorithm>... diff --git a/svl/source/misc/svldata.cxx b/svl/source/misc/svldata.cxx index 51247a628c0e..d791e9d9a560 100644 --- a/svl/source/misc/svldata.cxx +++ b/svl/source/misc/svldata.cxx @@ -6,7 +6,7 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: svtdata.cxx,v $ + * $RCSfile: svldata.cxx,v $ * $Revision: 1.7 $ * * This file is part of OpenOffice.org. @@ -29,20 +29,20 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include <map> #include <tools/resmgr.hxx> #include <tools/shl.hxx> #include <vos/process.hxx> -#include <svtools/svtdata.hxx> +#include <svtools/svldata.hxx> -namespace unnamed_svtools_svtdata {} -using namespace unnamed_svtools_svtdata; +namespace unnamed_svl_svldata {} +using namespace unnamed_svl_svldata; // unnamed namespaces don't work well yet //============================================================================ -namespace unnamed_svtools_svtdata { +namespace unnamed_svl_svldata { typedef std::map< rtl::OUString, SimpleResMgr * > SimpleResMgrMap; @@ -50,13 +50,14 @@ typedef std::map< rtl::OUString, SimpleResMgr * > SimpleResMgrMap; //============================================================================ // -// ImpSvtData +// ImpSvlData // //============================================================================ -ImpSvtData::~ImpSvtData() +static ImpSvlData* pSvlData = 0; + +ImpSvlData::~ImpSvlData() { - delete pResMgr; for (SimpleResMgrMap::iterator t = static_cast< SimpleResMgrMap * >(m_pThreadsafeRMs)->begin(); t != static_cast< SimpleResMgrMap * >(m_pThreadsafeRMs)->end(); ++t) @@ -65,17 +66,7 @@ ImpSvtData::~ImpSvtData() } //============================================================================ -ResMgr * ImpSvtData::GetResMgr(const ::com::sun::star::lang::Locale aLocale) -{ - if (!pResMgr) - { - pResMgr = ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(svt), aLocale ); - } - return pResMgr; -} - -//============================================================================ -SimpleResMgr* ImpSvtData::GetSimpleRM(const ::com::sun::star::lang::Locale& rLocale) +SimpleResMgr* ImpSvlData::GetSimpleRM(const ::com::sun::star::lang::Locale& rLocale) { if (!m_pThreadsafeRMs) m_pThreadsafeRMs = new SimpleResMgrMap; @@ -92,22 +83,12 @@ SimpleResMgr* ImpSvtData::GetSimpleRM(const ::com::sun::star::lang::Locale& rLoc return rResMgr; } -ResMgr * ImpSvtData::GetPatchResMgr(const ::com::sun::star::lang::Locale& aLocale) -{ - if (!pPatchResMgr) - { - pPatchResMgr = ResMgr::CreateResMgr(CREATEVERSIONRESMGR_NAME(svp), aLocale); - } - return pPatchResMgr; -} - //============================================================================ // static -ImpSvtData & ImpSvtData::GetSvtData() +ImpSvlData & ImpSvlData::GetSvlData() { - void ** pAppData = GetAppData(SHL_SVT); - if (!*pAppData) - *pAppData= new ImpSvtData; - return *static_cast<ImpSvtData *>(*pAppData); + if (!pSvlData) + pSvlData= new ImpSvlData; + return *pSvlData; } diff --git a/svl/source/misc/urihelper.cxx b/svl/source/misc/urihelper.cxx index 1ddb4c6dd6f9..58e21f425bf6 100644 --- a/svl/source/misc/urihelper.cxx +++ b/svl/source/misc/urihelper.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include <urihelper.hxx> #include <com/sun/star/beans/XPropertySet.hpp> #include "com/sun/star/lang/WrappedTargetRuntimeException.hpp" diff --git a/svl/source/notify/brdcst.cxx b/svl/source/notify/brdcst.cxx index 3a698c725c5c..928ec79fe328 100644 --- a/svl/source/notify/brdcst.cxx +++ b/svl/source/notify/brdcst.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #ifndef GCC #endif diff --git a/svl/source/notify/broadcast.cxx b/svl/source/notify/broadcast.cxx index e363f545c719..62c00ff8c414 100644 --- a/svl/source/notify/broadcast.cxx +++ b/svl/source/notify/broadcast.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #ifndef GCC #endif diff --git a/svl/source/notify/cancel.cxx b/svl/source/notify/cancel.cxx index 32a76a7df9c1..12969a4f8e6a 100644 --- a/svl/source/notify/cancel.cxx +++ b/svl/source/notify/cancel.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #define _SFX_CANCEL_CXX #include <svtools/cancel.hxx> diff --git a/svl/source/notify/hint.cxx b/svl/source/notify/hint.cxx index 9ae3bf8f8b21..8f48ba28f895 100644 --- a/svl/source/notify/hint.cxx +++ b/svl/source/notify/hint.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #ifndef GCC #endif diff --git a/svl/source/notify/isethint.cxx b/svl/source/notify/isethint.cxx index 67d484219ac6..77c630cd2148 100644 --- a/svl/source/notify/isethint.cxx +++ b/svl/source/notify/isethint.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #ifndef GCC #endif diff --git a/svl/source/notify/listener.cxx b/svl/source/notify/listener.cxx index 0ce072b44dfb..7d9a223e1a73 100644 --- a/svl/source/notify/listener.cxx +++ b/svl/source/notify/listener.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #ifndef GCC #endif diff --git a/svl/source/notify/listenerbase.cxx b/svl/source/notify/listenerbase.cxx index 25f1f1da1901..bb1569c128c5 100644 --- a/svl/source/notify/listenerbase.cxx +++ b/svl/source/notify/listenerbase.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #ifndef GCC #endif diff --git a/svl/source/notify/listeneriter.cxx b/svl/source/notify/listeneriter.cxx index 08fcb5b7e9ac..1f92eadfedbc 100644 --- a/svl/source/notify/listeneriter.cxx +++ b/svl/source/notify/listeneriter.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #ifndef GCC #endif #include <tools/debug.hxx> diff --git a/svl/source/notify/lstner.cxx b/svl/source/notify/lstner.cxx index d7345d7ed3db..87afd96365cc 100644 --- a/svl/source/notify/lstner.cxx +++ b/svl/source/notify/lstner.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #ifndef GCC #endif diff --git a/svl/source/notify/makefile.mk b/svl/source/notify/makefile.mk index 8e4c4b211258..0d26860d02b5 100644 --- a/svl/source/notify/makefile.mk +++ b/svl/source/notify/makefile.mk @@ -31,7 +31,7 @@ PRJ=..$/.. -PRJNAME=svtools +PRJNAME=svl TARGET=notify # --- Settings ----------------------------------------------------- diff --git a/svl/source/notify/smplhint.cxx b/svl/source/notify/smplhint.cxx index 6fddffc23e56..bd9933d2dece 100644 --- a/svl/source/notify/smplhint.cxx +++ b/svl/source/notify/smplhint.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #ifndef GCC #endif diff --git a/svl/source/numbers/makefile.mk b/svl/source/numbers/makefile.mk index 46cd3985df1a..db4b30070ce8 100644 --- a/svl/source/numbers/makefile.mk +++ b/svl/source/numbers/makefile.mk @@ -31,7 +31,7 @@ PRJ=..$/.. -PRJNAME=svtools +PRJNAME=svl TARGET=numbers LIBTARGET=NO @@ -41,7 +41,7 @@ PROJECTPCHSOURCE= # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/svt.pmk +.INCLUDE : $(PRJ)$/util$/svl.pmk # --- Files -------------------------------------------------------- diff --git a/svl/source/numbers/nbdll.cxx b/svl/source/numbers/nbdll.cxx index d7cf20f6059f..2bc5121e18fd 100644 --- a/svl/source/numbers/nbdll.cxx +++ b/svl/source/numbers/nbdll.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #ifdef WIN #include <svwin.h> diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx index d65a2fd696ce..598680c4da75 100644 --- a/svl/source/numbers/numfmuno.cxx +++ b/svl/source/numbers/numfmuno.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #ifndef GCC #endif diff --git a/svl/source/numbers/numhead.cxx b/svl/source/numbers/numhead.cxx index 7e79aad624f3..99ff33433de3 100644 --- a/svl/source/numbers/numhead.cxx +++ b/svl/source/numbers/numhead.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #ifndef GCC #endif #include <tools/debug.hxx> diff --git a/svl/source/numbers/numuno.cxx b/svl/source/numbers/numuno.cxx index f91bf82b4e60..a66a48f0a3f5 100644 --- a/svl/source/numbers/numuno.cxx +++ b/svl/source/numbers/numuno.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #ifndef GCC #endif diff --git a/svl/source/numbers/supservs.cxx b/svl/source/numbers/supservs.cxx index 1035cd056406..67b9170d59fc 100644 --- a/svl/source/numbers/supservs.cxx +++ b/svl/source/numbers/supservs.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include "supservs.hxx" #include <com/sun/star/lang/Locale.hpp> #include <comphelper/sharedmutex.hxx> diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx index aa7d75a098b7..b5719f7ac868 100644 --- a/svl/source/numbers/zforfind.cxx +++ b/svl/source/numbers/zforfind.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include <ctype.h> #include <stdlib.h> diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index fcae93964e72..885a6df53533 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #ifndef GCC #endif diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index 0afbf3b4a3f5..7c7cf6bcc524 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include <stdio.h> #include <ctype.h> #include <float.h> diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx index 77b33226559c..9eb939403afd 100644 --- a/svl/source/numbers/zforscan.cxx +++ b/svl/source/numbers/zforscan.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #ifndef GCC #endif diff --git a/svl/source/passwordcontainer/makefile.mk b/svl/source/passwordcontainer/makefile.mk index 31e1336ad966..3c74246ee3ed 100644 --- a/svl/source/passwordcontainer/makefile.mk +++ b/svl/source/passwordcontainer/makefile.mk @@ -30,7 +30,7 @@ #************************************************************************* PRJ=..$/.. -PRJNAME=svtools +PRJNAME=svl TARGET=passwordcontainer.uno LIBTARGET=NO ENABLE_EXCEPTIONS=TRUE diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx index 5f9ce207ff6b..d5f3c62173e4 100644 --- a/svl/source/passwordcontainer/passwordcontainer.cxx +++ b/svl/source/passwordcontainer/passwordcontainer.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include "passwordcontainer.hxx" diff --git a/svl/source/svdde/ddecli.cxx b/svl/source/svdde/ddecli.cxx index e31e53d07522..8f6f72c655df 100644 --- a/svl/source/svdde/ddecli.cxx +++ b/svl/source/svdde/ddecli.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #define UNICODE #include <string.h> // memset diff --git a/svl/source/svdde/ddedata.cxx b/svl/source/svdde/ddedata.cxx index 9167c8585b08..765c5feff0ba 100644 --- a/svl/source/svdde/ddedata.cxx +++ b/svl/source/svdde/ddedata.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" // ACHTUNG: es wird angenommen, dass StarView-Clipboard-Foamatnummern // und Windows-Formatnummern identisch sind! Ist dies einmal nicht der diff --git a/svl/source/svdde/ddedll.cxx b/svl/source/svdde/ddedll.cxx index 696d7b2851d2..b27272a2a910 100644 --- a/svl/source/svdde/ddedll.cxx +++ b/svl/source/svdde/ddedll.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #ifdef WIN diff --git a/svl/source/svdde/ddeinf.cxx b/svl/source/svdde/ddeinf.cxx index 7c2fb82789e6..923f1a725046 100644 --- a/svl/source/svdde/ddeinf.cxx +++ b/svl/source/svdde/ddeinf.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #define UNICODE diff --git a/svl/source/svdde/ddeml1.cxx b/svl/source/svdde/ddeml1.cxx index 6cc09b612ecf..bb9c428178b2 100644 --- a/svl/source/svdde/ddeml1.cxx +++ b/svl/source/svdde/ddeml1.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" /* ToDo / Bugs: diff --git a/svl/source/svdde/ddeml2.cxx b/svl/source/svdde/ddeml2.cxx index 979897136a46..e0cdee2d52d1 100644 --- a/svl/source/svdde/ddeml2.cxx +++ b/svl/source/svdde/ddeml2.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #define INCL_DOS #include <stdlib.h> diff --git a/svl/source/svdde/ddemldeb.cxx b/svl/source/svdde/ddemldeb.cxx index bb53743a2915..18da7c07fd3c 100644 --- a/svl/source/svdde/ddemldeb.cxx +++ b/svl/source/svdde/ddemldeb.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include "ddemlimp.hxx" diff --git a/svl/source/svdde/ddestrg.cxx b/svl/source/svdde/ddestrg.cxx index 40af3b1cbc27..27e36162a187 100644 --- a/svl/source/svdde/ddestrg.cxx +++ b/svl/source/svdde/ddestrg.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #define UNICODE diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx index a2124548b4c8..45461cf0006c 100644 --- a/svl/source/svdde/ddesvr.cxx +++ b/svl/source/svdde/ddesvr.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #define UNICODE #include "ddeimp.hxx" diff --git a/svl/source/svdde/ddewrap.cxx b/svl/source/svdde/ddewrap.cxx index b0b023ad3a75..650ec5b1b31f 100644 --- a/svl/source/svdde/ddewrap.cxx +++ b/svl/source/svdde/ddewrap.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #define _SVTOOLS_SVDDE_DDEWRAP_CXX_ #if defined _MSC_VER diff --git a/svl/source/svdde/makefile.mk b/svl/source/svdde/makefile.mk index f4c72aff2094..321a4b5ced03 100644 --- a/svl/source/svdde/makefile.mk +++ b/svl/source/svdde/makefile.mk @@ -34,13 +34,13 @@ PRJ=..$/.. -PRJNAME=svtools +PRJNAME=svl TARGET=svdde # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/svt.pmk +.INCLUDE : $(PRJ)$/util$/svl.pmk # --- Files -------------------------------------------------------- diff --git a/svl/source/svsql/converter.cxx b/svl/source/svsql/converter.cxx index c87290265e90..826b64adc48d 100644 --- a/svl/source/svsql/converter.cxx +++ b/svl/source/svsql/converter.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include "converter.hxx" INT32 SvDbaseConverter::ConvertPrecisionToDbase(INT32 _nLen, INT32 _nScale) diff --git a/svl/source/svsql/makefile.mk b/svl/source/svsql/makefile.mk index 55c400b83ef3..ae3abf24db24 100644 --- a/svl/source/svsql/makefile.mk +++ b/svl/source/svsql/makefile.mk @@ -31,7 +31,7 @@ PRJ=..$/.. -PRJNAME=svtools +PRJNAME=svl TARGET=svsql # --- Settings ----------------------------------------------------- diff --git a/svl/source/syslocale/makefile.mk b/svl/source/syslocale/makefile.mk index a393c174856f..1bb619a69ec3 100644 --- a/svl/source/syslocale/makefile.mk +++ b/svl/source/syslocale/makefile.mk @@ -30,13 +30,13 @@ #************************************************************************* PRJ=..$/.. -PRJNAME=svtools +PRJNAME=svl TARGET=syslocale # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/svt.pmk +.INCLUDE : $(PRJ)$/util$/svl.pmk # --- Files -------------------------------------------------------- diff --git a/svl/source/syslocale/syslocale.cxx b/svl/source/syslocale/syslocale.cxx index 9811d97fd964..97db482f4409 100644 --- a/svl/source/syslocale/syslocale.cxx +++ b/svl/source/syslocale/syslocale.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #ifndef GCC #endif diff --git a/svl/source/undo/makefile.mk b/svl/source/undo/makefile.mk index b277fa3c906f..7c51df3f17fc 100644 --- a/svl/source/undo/makefile.mk +++ b/svl/source/undo/makefile.mk @@ -31,14 +31,14 @@ PRJ=..$/.. -PRJNAME=svtools +PRJNAME=svl TARGET=undo ENABLE_EXCEPTIONS=TRUE # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/svt.pmk +.INCLUDE : $(PRJ)$/util$/svl.pmk # --- Files -------------------------------------------------------- diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx index 2f733d4f03b3..49999834a8ff 100644 --- a/svl/source/undo/undo.cxx +++ b/svl/source/undo/undo.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include <com/sun/star/uno/Exception.hpp> diff --git a/svl/source/uno/makefile.mk b/svl/source/uno/makefile.mk index 51e55a1f9123..af26b20cd8df 100644 --- a/svl/source/uno/makefile.mk +++ b/svl/source/uno/makefile.mk @@ -31,33 +31,20 @@ PRJ=..$/.. -PRJNAME=svtools +PRJNAME=svl TARGET=unoiface ENABLE_EXCEPTIONS=TRUE # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/svt.pmk +.INCLUDE : $(PRJ)$/util$/svl.pmk # --- Files -------------------------------------------------------- -SRS1NAME= uno -SRC1FILES= unoifac2.src - SLOFILES= \ - $(SLO)$/unoiface.obj \ - $(SLO)$/unoevent.obj \ - $(SLO)$/unoimap.obj \ - $(SLO)$/toolboxcontroller.obj \ - $(SLO)$/framestatuslistener.obj \ - $(SLO)$/statusbarcontroller.obj \ - $(SLO)$/genericunodialog.obj \ - $(SLO)$/generictoolboxcontroller.obj \ - $(SLO)$/treecontrolpeer.obj \ - $(SLO)$/unocontroltablemodel.obj \ $(SLO)$/registerservices.obj\ - $(SLO)$/contextmenuhelper.obj + $(SLO)$/pathservice.obj # --- Targets ------------------------------------------------------ diff --git a/svl/uno/pathservice.cxx b/svl/source/uno/pathservice.cxx index 152ff5f316ab..e54a96bf30ce 100644 --- a/svl/uno/pathservice.cxx +++ b/svl/source/uno/pathservice.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include <unotools/pathoptions.hxx> #include "sal/types.h" diff --git a/svl/source/uno/registerservices.cxx b/svl/source/uno/registerservices.cxx index a3e9f39c2dba..1f761123ae56 100644 --- a/svl/source/uno/registerservices.cxx +++ b/svl/source/uno/registerservices.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include "sal/types.h" #include "rtl/ustring.hxx" #include <cppuhelper/factory.hxx> @@ -49,6 +49,7 @@ using rtl::OUString; DECLARE_CREATEINSTANCE( SvNumberFormatterServiceObj ) DECLARE_CREATEINSTANCE( SvNumberFormatsSupplierServiceObject ) +DECLARE_CREATEINSTANCE( PathService ) // ------------------------------------------------------------------------------------- @@ -82,6 +83,11 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo ( xNewKey->createKey ( OUString::createFromAscii( "com.sun.star.util.NumberFormatter" ) ); + xNewKey = xRegistryKey->createKey( + OUString::createFromAscii( "/com.sun.star.comp.svtools.PathService/UNO/SERVICES" ) ); + xNewKey->createKey ( + OUString::createFromAscii( "com.sun.star.config.SpecialConfigManager" ) ); + return sal_True; } return sal_False; @@ -122,6 +128,18 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory ( SvNumberFormatterServiceObj_CreateInstance, aServiceNames); } + else if (rtl_str_compare ( + pImplementationName, "com.sun.star.comp.svtools.PathService") == 0) + { + Sequence< OUString > aServiceNames(1); + aServiceNames.getArray()[0] = + OUString::createFromAscii( "com.sun.star.config.SpecialConfigManager" ); + xFactory = ::cppu::createSingleFactory ( + reinterpret_cast< css::lang::XMultiServiceFactory* >( _pServiceManager ), + OUString::createFromAscii( pImplementationName ), + PathService_CreateInstance, + aServiceNames); + } if ( xFactory.is() ) { xFactory->acquire(); diff --git a/svl/uno/addrtempuno.cxx b/svl/uno/addrtempuno.cxx deleted file mode 100644 index b2aff7ae711d..000000000000 --- a/svl/uno/addrtempuno.cxx +++ /dev/null @@ -1,248 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: addrtempuno.cxx,v $ - * $Revision: 1.8 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" -#include "svtools/genericunodialog.hxx" -#ifndef _SVT_DOC_ADDRESSTEMPLATE_HXX_ -#include "addresstemplate.hxx" -#endif -#ifndef _CPPUHELPER_EXTRACT_HXX_ -#include <cppuhelper/extract.hxx> -#endif -#include <cppuhelper/typeprovider.hxx> -#include <comphelper/property.hxx> -#include <com/sun/star/sdbc/XDataSource.hpp> - -class SfxItemSet; -class SfxItemPool; -class SfxPoolItem; - -// ....................................................................... -namespace svt -{ -// ....................................................................... - -#define UNODIALOG_PROPERTY_ID_ALIASES 100 -#define UNODIALOG_PROPERTY_ALIASES "FieldMapping" - - using namespace com::sun::star::uno; - using namespace com::sun::star::lang; - using namespace com::sun::star::util; - using namespace com::sun::star::beans; - using namespace com::sun::star::sdbc; - - //========================================================================= - //= OAddressBookSourceDialogUno - //========================================================================= - typedef OGenericUnoDialog OAddressBookSourceDialogUnoBase; - class OAddressBookSourceDialogUno - :public OAddressBookSourceDialogUnoBase - ,public ::comphelper::OPropertyArrayUsageHelper< OAddressBookSourceDialogUno > - { - protected: - Sequence< AliasProgrammaticPair > m_aAliases; - Reference< XDataSource > m_xDataSource; - ::rtl::OUString m_sDataSourceName; - ::rtl::OUString m_sTable; - - protected: - OAddressBookSourceDialogUno(const Reference< XMultiServiceFactory >& _rxORB); - - public: - // XTypeProvider - virtual Sequence<sal_Int8> SAL_CALL getImplementationId( ) throw(RuntimeException); - - // XServiceInfo - virtual ::rtl::OUString SAL_CALL getImplementationName() throw(RuntimeException); - virtual ::comphelper::StringSequence SAL_CALL getSupportedServiceNames() throw(RuntimeException); - - // XServiceInfo - static methods - static Sequence< ::rtl::OUString > getSupportedServiceNames_Static(void) throw( RuntimeException ); - static ::rtl::OUString getImplementationName_Static(void) throw( RuntimeException ); - static Reference< XInterface > - SAL_CALL Create(const Reference< com::sun::star::lang::XMultiServiceFactory >&); - - // XPropertySet - virtual Reference< XPropertySetInfo> SAL_CALL getPropertySetInfo() throw(RuntimeException); - virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); - - // OPropertyArrayUsageHelper - virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; - - protected: - // OGenericUnoDialog overridables - virtual Dialog* createDialog(Window* _pParent); - - virtual void implInitialize(const com::sun::star::uno::Any& _rValue); - - virtual void executedDialog(sal_Int16 _nExecutionResult); - }; - - - //========================================================================= - //= OAddressBookSourceDialogUno - //========================================================================= - Reference< XInterface > SAL_CALL OAddressBookSourceDialogUno_CreateInstance( const Reference< XMultiServiceFactory >& _rxFactory) - { - return OAddressBookSourceDialogUno::Create(_rxFactory); - } - - //------------------------------------------------------------------------- - OAddressBookSourceDialogUno::OAddressBookSourceDialogUno(const Reference< XMultiServiceFactory >& _rxORB) - :OGenericUnoDialog(_rxORB) - { - registerProperty(::rtl::OUString::createFromAscii(UNODIALOG_PROPERTY_ALIASES), UNODIALOG_PROPERTY_ID_ALIASES, PropertyAttribute::READONLY, - &m_aAliases, getCppuType(&m_aAliases)); - } - - //------------------------------------------------------------------------- - Sequence<sal_Int8> SAL_CALL OAddressBookSourceDialogUno::getImplementationId( ) throw(RuntimeException) - { - static ::cppu::OImplementationId aId; - return aId.getImplementationId(); - } - - //------------------------------------------------------------------------- - Reference< XInterface > SAL_CALL OAddressBookSourceDialogUno::Create(const Reference< XMultiServiceFactory >& _rxFactory) - { - return *(new OAddressBookSourceDialogUno(_rxFactory)); - } - - //------------------------------------------------------------------------- - ::rtl::OUString SAL_CALL OAddressBookSourceDialogUno::getImplementationName() throw(RuntimeException) - { - return getImplementationName_Static(); - } - - //------------------------------------------------------------------------- - ::rtl::OUString OAddressBookSourceDialogUno::getImplementationName_Static() throw(RuntimeException) - { - return ::rtl::OUString::createFromAscii("com.sun.star.comp.svtools.OAddressBookSourceDialogUno"); - } - - //------------------------------------------------------------------------- - ::comphelper::StringSequence SAL_CALL OAddressBookSourceDialogUno::getSupportedServiceNames() throw(RuntimeException) - { - return getSupportedServiceNames_Static(); - } - - //------------------------------------------------------------------------- - ::comphelper::StringSequence OAddressBookSourceDialogUno::getSupportedServiceNames_Static() throw(RuntimeException) - { - ::comphelper::StringSequence aSupported(1); - aSupported.getArray()[0] = ::rtl::OUString::createFromAscii("com.sun.star.ui.AddressBookSourceDialog"); - return aSupported; - } - - //------------------------------------------------------------------------- - Reference<XPropertySetInfo> SAL_CALL OAddressBookSourceDialogUno::getPropertySetInfo() throw(RuntimeException) - { - Reference<XPropertySetInfo> xInfo( createPropertySetInfo( getInfoHelper() ) ); - return xInfo; - } - - //------------------------------------------------------------------------- - ::cppu::IPropertyArrayHelper& OAddressBookSourceDialogUno::getInfoHelper() - { - return *const_cast<OAddressBookSourceDialogUno*>(this)->getArrayHelper(); - } - - //------------------------------------------------------------------------------ - ::cppu::IPropertyArrayHelper* OAddressBookSourceDialogUno::createArrayHelper( ) const - { - Sequence< Property > aProps; - describeProperties(aProps); - return new ::cppu::OPropertyArrayHelper(aProps); - } - - //------------------------------------------------------------------------------ - void OAddressBookSourceDialogUno::executedDialog(sal_Int16 _nExecutionResult) - { - OAddressBookSourceDialogUnoBase::executedDialog(_nExecutionResult); - - if ( _nExecutionResult ) - if ( m_pDialog ) - static_cast< AddressBookSourceDialog* >( m_pDialog )->getFieldMapping( m_aAliases ); - } - - //------------------------------------------------------------------------------ - void OAddressBookSourceDialogUno::implInitialize(const com::sun::star::uno::Any& _rValue) - { - PropertyValue aVal; - if (_rValue >>= aVal) - { - if (0 == aVal.Name.compareToAscii("DataSource")) - { -#if OSL_DEBUG_LEVEL > 0 - sal_Bool bSuccess = -#endif - aVal.Value >>= m_xDataSource; - OSL_ENSURE( bSuccess, "OAddressBookSourceDialogUno::implInitialize: invalid type for DataSource!" ); - return; - } - - if (0 == aVal.Name.compareToAscii("DataSourceName")) - { -#if OSL_DEBUG_LEVEL > 0 - sal_Bool bSuccess = -#endif - aVal.Value >>= m_sDataSourceName; - OSL_ENSURE( bSuccess, "OAddressBookSourceDialogUno::implInitialize: invalid type for DataSourceName!" ); - return; - } - - if (0 == aVal.Name.compareToAscii("Command")) - { -#if OSL_DEBUG_LEVEL > 0 - sal_Bool bSuccess = -#endif - aVal.Value >>= m_sTable; - OSL_ENSURE( bSuccess, "OAddressBookSourceDialogUno::implInitialize: invalid type for Command!" ); - return; - } - } - - OAddressBookSourceDialogUnoBase::implInitialize( _rValue ); - } - - //------------------------------------------------------------------------------ - Dialog* OAddressBookSourceDialogUno::createDialog(Window* _pParent) - { - if ( m_xDataSource.is() && m_sTable.getLength() ) - return new AddressBookSourceDialog(_pParent, m_aContext.getLegacyServiceFactory(), m_xDataSource, m_sDataSourceName, m_sTable, m_aAliases ); - else - return new AddressBookSourceDialog( _pParent, m_aContext.getLegacyServiceFactory() ); - } - -// ....................................................................... -} // namespace svt -// ....................................................................... - diff --git a/svl/uno/exports.map b/svl/uno/exports.map deleted file mode 100644 index f4ed78b9e970..000000000000 --- a/svl/uno/exports.map +++ /dev/null @@ -1,8 +0,0 @@ -UDK_3_0_0 { - global: - component_getImplementationEnvironment; - component_writeInfo; - component_getFactory; - local: - *; -}; diff --git a/svl/uno/miscservices.cxx b/svl/uno/miscservices.cxx deleted file mode 100644 index e5c5aac3c35d..000000000000 --- a/svl/uno/miscservices.cxx +++ /dev/null @@ -1,160 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2008 by Sun Microsystems, Inc. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * $RCSfile: miscservices.cxx,v $ - * $Revision: 1.6 $ - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -// MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" -#include "sal/types.h" -#include "rtl/ustring.hxx" -#include <cppuhelper/factory.hxx> -#include <cppuhelper/weak.hxx> -#include <com/sun/star/lang/XSingleServiceFactory.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/registry/XRegistryKey.hpp> - -using namespace ::com::sun::star::uno; -using namespace ::com::sun::star::registry; -using namespace ::com::sun::star::lang; - -using rtl::OUString; - -// ------------------------------------------------------------------------------------- - -// for CreateInstance functions implemented elsewhere -#define DECLARE_CREATEINSTANCE( ImplName ) \ - Reference< XInterface > SAL_CALL ImplName##_CreateInstance( const Reference< XMultiServiceFactory >& ); - -// for CreateInstance functions implemented elsewhere, while the function is within a namespace -#define DECLARE_CREATEINSTANCE_NAMESPACE( nmspe, ImplName ) \ - namespace nmspe { \ - Reference< XInterface > SAL_CALL ImplName##_CreateInstance( const Reference< XMultiServiceFactory >& ); \ - } - -// ------------------------------------------------------------------------------------- - -DECLARE_CREATEINSTANCE_NAMESPACE( svt, OAddressBookSourceDialogUno ) -DECLARE_CREATEINSTANCE( SvFilterOptionsDialog ) -DECLARE_CREATEINSTANCE( PathService ) - -// ------------------------------------------------------------------------------------- - -extern "C" -{ - -SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment ( - const sal_Char ** ppEnvTypeName, uno_Environment ** /* ppEnv */) -{ - *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; -} - -SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo ( - void * /* _pServiceManager */, void * _pRegistryKey ) -{ - if (_pRegistryKey) - { - Reference< XRegistryKey > xRegistryKey ( - reinterpret_cast< XRegistryKey* >( _pRegistryKey )); - Reference< XRegistryKey > xNewKey; - - xNewKey = xRegistryKey->createKey ( - OUString::createFromAscii( "/com.sun.star.comp.svtools.OAddressBookSourceDialogUno/UNO/SERVICES" ) ); - xNewKey->createKey( - OUString::createFromAscii( "com.sun.star.ui.AddressBookSourceDialog" ) ); - - xNewKey = xRegistryKey->createKey ( - OUString::createFromAscii( "/com.sun.star.svtools.SvFilterOptionsDialog/UNO/SERVICES" ) ); - xNewKey->createKey ( - OUString::createFromAscii( "com.sun.star.ui.dialogs.FilterOptionsDialog" ) ); - - xNewKey = xRegistryKey->createKey( - OUString::createFromAscii( "/com.sun.star.comp.svtools.PathService/UNO/SERVICES" ) ); - xNewKey->createKey ( - OUString::createFromAscii( "com.sun.star.config.SpecialConfigManager" ) ); - - return sal_True; - } - return sal_False; -} - -SAL_DLLPUBLIC_EXPORT void * SAL_CALL component_getFactory ( - const sal_Char * pImplementationName, void * _pServiceManager, void * /* _pRegistryKey */) -{ - void * pResult = 0; - if ( _pServiceManager ) - { - Reference< XSingleServiceFactory > xFactory; - if (rtl_str_compare ( - pImplementationName, "com.sun.star.comp.svtools.OAddressBookSourceDialogUno") == 0) - { - Sequence< OUString > aServiceNames(1); - aServiceNames.getArray()[0] = - OUString::createFromAscii( "com.sun.star.ui.AddressBookSourceDialog" ); - - xFactory = ::cppu::createSingleFactory ( - reinterpret_cast< XMultiServiceFactory* >( _pServiceManager ), - OUString::createFromAscii( pImplementationName ), - svt::OAddressBookSourceDialogUno_CreateInstance, - aServiceNames); - } - else if (rtl_str_compare ( - pImplementationName, "com.sun.star.svtools.SvFilterOptionsDialog") == 0) - { - Sequence< OUString > aServiceNames(1); - aServiceNames.getArray()[0] = - OUString::createFromAscii( "com.sun.star.ui.dialogs.FilterOptionsDialog" ); - - xFactory = ::cppu::createSingleFactory ( - reinterpret_cast< XMultiServiceFactory* >( _pServiceManager ), - OUString::createFromAscii( pImplementationName ), - SvFilterOptionsDialog_CreateInstance, - aServiceNames); - } - else if (rtl_str_compare ( - pImplementationName, "com.sun.star.comp.svtools.PathService") == 0) - { - Sequence< OUString > aServiceNames(1); - aServiceNames.getArray()[0] = - OUString::createFromAscii( "com.sun.star.config.SpecialConfigManager" ); - xFactory = ::cppu::createSingleFactory ( - reinterpret_cast< XMultiServiceFactory* >( _pServiceManager ), - OUString::createFromAscii( pImplementationName ), - PathService_CreateInstance, - aServiceNames); - } - if ( xFactory.is() ) - { - xFactory->acquire(); - pResult = xFactory.get(); - } - } - return pResult; -} - -} // "C" - diff --git a/svl/unx/source/svdde/ddedummy.cxx b/svl/unx/source/svdde/ddedummy.cxx index 6f627807bfd3..aa1ccad80630 100644 --- a/svl/unx/source/svdde/ddedummy.cxx +++ b/svl/unx/source/svdde/ddedummy.cxx @@ -29,7 +29,7 @@ ************************************************************************/ // MARKER(update_precomp.py): autogen include statement, do not remove -#include "precompiled_svtools.hxx" +#include "precompiled_svl.hxx" #include <svtools/svdde.hxx> #include <rtl/instance.hxx> diff --git a/svl/unx/source/svdde/makefile.mk b/svl/unx/source/svdde/makefile.mk index d0203fd6378b..c6e89eaf2630 100644 --- a/svl/unx/source/svdde/makefile.mk +++ b/svl/unx/source/svdde/makefile.mk @@ -31,13 +31,13 @@ PRJ=..$/..$/.. -PRJNAME=svtools +PRJNAME=svl TARGET=svdde # --- Settings ----------------------------------------------------- .INCLUDE : settings.mk -.INCLUDE : $(PRJ)$/util$/svt.pmk +.INCLUDE : $(PRJ)$/util$/svl.pmk # --- Files -------------------------------------------------------- diff --git a/svl/util/makefile.mk b/svl/util/makefile.mk index fac8f654bfbe..56f3d0bfed15 100644 --- a/svl/util/makefile.mk +++ b/svl/util/makefile.mk @@ -31,10 +31,8 @@ PRJ=.. -PRJNAME=svtools -TARGET=svtool -RESTARGET=svt -RESTARGETPATCH=svp +PRJNAME=svl +TARGET=svl RESTARGETSIMPLE=svs GEN_HID=TRUE GEN_HID_OTHER=TRUE @@ -44,152 +42,43 @@ ENABLE_EXCEPTIONS=TRUE .INCLUDE : settings.mk -USE_LDUMP2=TRUE - # --- general section ---------------------------------------------------- .IF "$(GUI)"!="UNX" -LIB3TARGET= $(LB)$/svtool.lib -LIB3FILES= $(LB)$/_svt.lib -.ENDIF - -.IF "$(GUI)"!="UNX" -LIB4TARGET= $(LB)$/isvl.lib -LIB4FILES= $(LB)$/_isvl.lib +LIB1TARGET= $(LB)$/isvl.lib +LIB1FILES= $(LB)$/_isvl.lib .ENDIF -LIB7TARGET= $(SLB)$/svt.lib -LIB7FILES= \ - $(SLB)$/misc.lib \ - $(SLB)$/items.lib \ - $(SLB)$/browse.lib \ - $(SLB)$/ctrl.lib \ - $(SLB)$/dialogs.lib \ - $(SLB)$/edit.lib \ - $(SLB)$/unoiface.lib \ - $(SLB)$/filter.lib \ - $(SLB)$/igif.lib \ - $(SLB)$/jpeg.lib \ - $(SLB)$/ixpm.lib \ - $(SLB)$/ixbm.lib \ - $(SLB)$/numbers.lib \ - $(SLB)$/numbers.uno.lib \ - $(SLB)$/wmf.lib \ - $(SLB)$/undo.lib \ - $(SLB)$/urlobj.lib \ - $(SLB)$/plugapp.lib \ - $(SLB)$/svcontnr.lib \ +LIB1TARGET= $(SLB)$/svl.lib +LIB1FILES= \ + $(SLB)$/config.lib \ $(SLB)$/syslocale.lib \ $(SLB)$/svdde.lib \ - $(SLB)$/svhtml.lib \ - $(SLB)$/svrtf.lib \ - $(SLB)$/config.lib \ - $(SLB)$/table.lib \ - $(SLB)$/java.lib - -LIB8TARGET= $(SLB)$/svl.lib -LIB8FILES= \ + $(SLB)$/undo.lib \ + $(SLB)$/numbers.lib \ + $(SLB)$/numbers.uno.lib \ $(SLB)$/filerec.lib \ $(SLB)$/filepicker.lib \ - $(SLB)$/items1.lib \ - $(SLB)$/misc1.lib \ + $(SLB)$/items.lib \ + $(SLB)$/misc.lib \ $(SLB)$/notify.lib \ $(SLB)$/svarray.lib \ $(SLB)$/svsql.lib # generation of resourcen-lib ---------------------------------------- -RESLIB1NAME= $(RESTARGET) -RESLIB1IMAGES=$(PRJ)$/res -RESLIB1SRSFILES= \ - $(SRS)$/filter.srs \ - $(SRS)$/misc.srs \ - $(SRS)$/ctrl.srs \ - $(SRS)$/dialogs.srs \ - $(SRS)$/plugapp.srs \ - $(SRS)$/svcontnr.srs \ - $(SRS)$/uno.srs \ - $(SRS)$/browse.srs \ - $(SRS)$/javaerror.srs - -RESLIB2NAME= $(RESTARGETSIMPLE) -RESLIB2SRSFILES=\ - $(SRS)$/items1.srs \ - $(SRS)$/misc1.srs - - -RESLIB3NAME= $(RESTARGETPATCH) -RESLIB3SRSFILES= \ - $(SRS)$/patchjavaerror.srs +RESLIB1NAME= $(RESTARGETSIMPLE) +RESLIB1SRSFILES=\ + $(SRS)$/items.srs \ + $(SRS)$/misc.srs # build the shared library -------------------------------------------------- -SHL1TARGET= svt$(DLLPOSTFIX) -SHL1IMPLIB= _svt +SHL1TARGET= svl$(DLLPOSTFIX) +SHL1IMPLIB= _isvl SHL1USE_EXPORTS=name - -.IF "$(OS)"!="MACOSX" -# static libraries -SHL1STDLIBS+= $(JPEG3RDLIB) -.ENDIF - -# dynamic libraries -SHL1STDLIBS+= \ - $(TKLIB) \ - $(VCLLIB) \ - $(SVLLIB) \ - $(SOTLIB) \ - $(UNOTOOLSLIB) \ - $(TOOLSLIB) \ - $(I18NISOLANGLIB) \ - $(I18NUTILLIB) \ - $(UCBHELPERLIB) \ - $(COMPHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(VOSLIB) \ - $(SALLIB) \ - $(ICUUCLIB) \ - $(JVMFWKLIB) - -.IF "$(OS)"=="MACOSX" -# static libraries go at end -SHL1STDLIBS+= $(JPEG3RDLIB) -.ENDIF - -.IF "$(GUI)"=="WNT" -SHL1STDLIBS+= \ - $(UWINAPILIB) \ - $(ADVAPI32LIB) \ - $(GDI32LIB) \ - $(OLE32LIB) \ - $(UUIDLIB) \ - $(ADVAPI32LIB) \ - $(OLEAUT32LIB) -.ENDIF # WNT - -SHL1OBJS= \ - $(SLO)$/svtdata.obj - -SHL1LIBS= \ - $(SLB)$/svt.lib - -SHL1DEF= $(MISC)$/$(SHL1TARGET).def -SHL1DEPN=$(SHL2TARGETN) - -DEF1NAME= $(SHL1TARGET) -DEF1DEPN= $(MISC)$/$(SHL1TARGET).flt -DEFLIB1NAME =svt -DEF1DES =SvTools - - -# --- svtools lite -------------------------------------------------- - -SHL2TARGET= svl$(DLLPOSTFIX) -SHL2IMPLIB= _isvl -SHL2USE_EXPORTS=name #Do not link with VCL or any other library that links with VCL -SHL2STDLIBS= \ +SHL1STDLIBS= \ $(UNOTOOLSLIB) \ $(TOOLSLIB) \ $(I18NISOLANGLIB) \ @@ -202,57 +91,32 @@ SHL2STDLIBS= \ $(SALLIB) .IF "$(GUI)"=="WNT" -SHL2STDLIBS+= \ +SHL1STDLIBS+= \ $(UWINAPILIB) \ $(ADVAPI32LIB) \ $(GDI32LIB) .ENDIF # WNT -SHL2LIBS= $(SLB)$/svl.lib - -SHL2DEF= $(MISC)$/$(SHL2TARGET).def - -DEF2NAME= $(SHL2TARGET) -DEF2DEPN= $(MISC)$/$(SHL2TARGET).flt $(SLB)$/svl.lib -DEFLIB2NAME=svl -DEF2DES =SvTools lite +SHL1LIBS= $(SLB)$/svl.lib -# --- g2g application -------------------------------------------------- - -APP2TARGET = g2g -APP2BASE = 0x10000000 -APP2DEPN = $(SHL1TARGETN) $(SHL2TARGETN) - -APP2OBJS = $(OBJ)$/g2g.obj - -.IF "$(GUI)"!="UNX" -APP2STDLIBS+= $(SVTOOLLIB) -.ELSE -APP2STDLIBS+= -lsvt$(DLLPOSTFIX) -APP2STDLIBS+= -lsvl$(DLLPOSTFIX) -.ENDIF +SHL1DEF= $(MISC)$/$(SHL1TARGET).def -APP2STDLIBS+= $(VCLLIB) \ - $(TOOLSLIB) \ - $(VOSLIB) \ - $(SALLIB) +DEF1NAME= $(SHL1TARGET) +DEF1DEPN= $(SLB)$/svl.lib +DEFLIB1NAME=svl +DEF1DES =SvTools lite # --- Targets ------------------------------------------------------ .IF "$(GUI)"=="UNX" -SVTTARGETS= $(LB)$/lib$(SHL2TARGET)$(DLLPOST) $(LB)$/lib$(SHL1TARGET)$(DLLPOST) +SVTTARGETS= $(LB)$/lib$(SHL1TARGET)$(DLLPOST) .ELSE -SVTTARGETS= $(LB)$/isvl.lib \ - $(BIN)$/$(SHL2TARGET)$(DLLPOST) $(BIN)$/$(SHL1TARGET)$(DLLPOST) +SVTTARGETS= $(LB)$/isvl.lib .ENDIF # just a quick fix - has to be cleaned up some day... .IF "$(L10N-framework)"=="" ALL: $(SLB)$/svl.lib \ - $(SLB)$/svt.lib \ - $(MISC)$/$(SHL2TARGET).flt \ - $(MISC)$/$(SHL1TARGET).flt \ - $(MISC)$/$(SHL2TARGET).def \ $(MISC)$/$(SHL1TARGET).def \ $(SVTTARGETS) \ ALLTAR @@ -260,15 +124,3 @@ ALL: $(SLB)$/svl.lib \ .INCLUDE : target.mk -# --- Svtools-Control-Filter-Datei --- - -$(MISC)$/$(SHL1TARGET).flt: svt.flt - @echo ------------------------------ - @echo Making: $@ - $(TYPE) svt.flt >$@ - -$(MISC)$/$(SHL2TARGET).flt: svl.flt - @echo ------------------------------ - @echo Making: $@ - $(TYPE) svl.flt >$@ - |