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/source | |
| parent | e6b4345c7f4026cb9b3e8dee6ecc84b3531e1950 (diff) | |
#i103496#: make svl buildable
Diffstat (limited to 'svl/source')
122 files changed, 392 insertions, 328 deletions
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/source/misc/makefile.mk b/svl/source/misc/makefile.mk new file mode 100644 index 000000000000..93ebc7f9470c --- /dev/null +++ b/svl/source/misc/makefile.mk @@ -0,0 +1,75 @@ +#************************************************************************* +# +# 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.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. +# +#************************************************************************* + +PRJ=..$/.. +PRJNAME=svl +TARGET=misc + +# --- Settings ----------------------------------------------------- + +.INCLUDE : settings.mk +.INCLUDE : $(PRJ)$/util$/svl.pmk + +# --- Files -------------------------------------------------------- + +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 + +SLOFILES=\ + $(EXCEPTIONSFILES) \ + $(SLO)$/adrparse.obj \ + $(SLO)$/filenotation.obj \ + $(SLO)$/inethist.obj \ + $(SLO)$/inettype.obj \ + $(SLO)$/lngmisc.obj \ + $(SLO)$/PasswordHelper.obj + +SRS1NAME=$(TARGET) +SRC1FILES=\ + mediatyp.src + +# --- 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/converter.hxx b/svl/source/svsql/converter.hxx deleted file mode 100644 index f6a5d67ca966..000000000000 --- a/svl/source/svsql/converter.hxx +++ /dev/null @@ -1,46 +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: converter.hxx,v $ - * $Revision: 1.4 $ - * - * 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. - * - ************************************************************************/ -#ifndef _SV_CONVERTER_HXX_ -#define _SV_CONVERTER_HXX_ - -#include "svtools/svldllapi.h" -#include <tools/solar.h> - -class SvDbaseConverter -{ -public: - SVL_DLLPUBLIC static INT32 ConvertPrecisionToDbase(INT32 _nLen, INT32 _nScale); - SVL_DLLPUBLIC static INT32 ConvertPrecisionToOdbc(INT32 _nLen, INT32 _nScale); -}; - -#endif //_CONVERTER_HXX_ - - - 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/source/uno/pathservice.cxx b/svl/source/uno/pathservice.cxx new file mode 100644 index 000000000000..e54a96bf30ce --- /dev/null +++ b/svl/source/uno/pathservice.cxx @@ -0,0 +1,106 @@ +/************************************************************************* + * + * 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: pathservice.cxx,v $ + * $Revision: 1.7 $ + * + * 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_svl.hxx" + +#include <unotools/pathoptions.hxx> +#include "sal/types.h" +#include "rtl/ustring.hxx" +#include <cppuhelper/implbase2.hxx> +#include <com/sun/star/frame/XConfigManager.hpp> +#include <com/sun/star/lang/XServiceInfo.hpp> + +namespace css = com::sun::star; +using rtl::OUString; + +// ----------------------------------------------------------------------- + +class PathService : public ::cppu::WeakImplHelper2< css::frame::XConfigManager, css::lang::XServiceInfo > +{ + SvtPathOptions m_aOptions; + +public: + PathService() + {} + + virtual OUString SAL_CALL getImplementationName() + throw(css::uno::RuntimeException) + { + return OUString::createFromAscii("com.sun.star.comp.svtools.PathService"); + } + + virtual sal_Bool SAL_CALL supportsService ( + const OUString & rName) + throw(css::uno::RuntimeException) + { + return (rName.compareToAscii("com.sun.star.config.SpecialConfigManager") == 0); + } + + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() + throw(css::uno::RuntimeException) + { + css::uno::Sequence< OUString > aRet(1); + aRet.getArray()[0] = OUString::createFromAscii("com.sun.star.config.SpecialConfigManager"); + return aRet; + } + + virtual OUString SAL_CALL substituteVariables ( + const OUString& sText) + throw(css::uno::RuntimeException) + { + return m_aOptions.SubstituteVariable( sText ); + } + + virtual void SAL_CALL addPropertyChangeListener ( + const OUString &, const css::uno::Reference< css::beans::XPropertyChangeListener > &) + throw(css::uno::RuntimeException) + {} + + virtual void SAL_CALL removePropertyChangeListener ( + const OUString &, const css::uno::Reference< css::beans::XPropertyChangeListener > &) + throw(css::uno::RuntimeException) + {} + + virtual void SAL_CALL flush() + throw(css::uno::RuntimeException) + {} +}; + +// ----------------------------------------------------------------------- + +css::uno::Reference< css::uno::XInterface > PathService_CreateInstance ( + const css::uno::Reference< css::lang::XMultiServiceFactory > &) +{ + return css::uno::Reference< css::uno::XInterface >( + static_cast< cppu::OWeakObject* >(new PathService())); +} + +// ----------------------------------------------------------------------- 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(); |