diff options
43 files changed, 63 insertions, 100 deletions
diff --git a/chart2/source/controller/main/UndoCommandDispatch.cxx b/chart2/source/controller/main/UndoCommandDispatch.cxx index 5b9299df9b65..e4aafa779e14 100644 --- a/chart2/source/controller/main/UndoCommandDispatch.cxx +++ b/chart2/source/controller/main/UndoCommandDispatch.cxx @@ -40,7 +40,7 @@ // for ressource strings STR_UNDO and STR_REDO #include <svtools/svtools.hrc> -#include <svtools/svtdata.hxx> +#include <svtools/svtresid.hxx> using namespace ::com::sun::star; diff --git a/fpicker/source/office/PlacesListBox.cxx b/fpicker/source/office/PlacesListBox.cxx index 3c1587982e7e..5338cb7e3551 100644 --- a/fpicker/source/office/PlacesListBox.cxx +++ b/fpicker/source/office/PlacesListBox.cxx @@ -32,7 +32,7 @@ #include <vcl/msgbox.hxx> #include <svtools/headbar.hxx> -#include <svtools/svtdata.hxx> +#include <svtools/svtresid.hxx> #define COLUMN_NAME 1 diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx index 87b88cf73070..a99fe6321b1b 100644 --- a/sd/source/ui/view/viewshe3.cxx +++ b/sd/source/ui/view/viewshe3.cxx @@ -35,7 +35,7 @@ #include <sfx2/viewfrm.hxx> #include <svtools/svtools.hrc> #include <com/sun/star/lang/Locale.hpp> -#include <svtools/svtdata.hxx> +#include <svtools/svtresid.hxx> #include <utility> #include <vector> diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx index b78b30e6e0ac..a4edf3af18b3 100644 --- a/sfx2/source/appl/appquit.cxx +++ b/sfx2/source/appl/appquit.cxx @@ -62,6 +62,7 @@ #include <sfx2/docfac.hxx> #include "appbaslib.hxx" #include <basic/basicmanagerrepository.hxx> +#include <svtools/svtresid.hxx> using ::basic::BasicManagerRepository; @@ -138,6 +139,7 @@ void SfxApplication::Deinitialize() // free administration managers DELETEZ(pAppData_Impl->pAppDispat); SfxResId::DeleteResMgr(); + SvtResId::DeleteResMgr(); DELETEZ(pAppData_Impl->pOfaResMgr); // from here no SvObjects have to exists diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index fc9bf30fb193..d1f066ef0995 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -93,7 +93,7 @@ #include <svtools/menuoptions.hxx> #include <unotools/pathoptions.hxx> #include <unotools/viewoptions.hxx> -#include <svtools/svtdata.hxx> +#include <svtools/svtresid.hxx> #include <tools/urlobj.hxx> #include <unotools/streamhelper.hxx> #include <svtools/imagemgr.hxx> diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index 531f7d128c15..278f6f9b29cf 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -91,7 +91,7 @@ #include <svtools/asynclink.hxx> #include <svl/sharecontrolfile.hxx> #include <svtools/svtools.hrc> -#include <svtools/svtdata.hxx> +#include <svtools/svtresid.hxx> #include <framework/framelistanalyzer.hxx> #include <boost/optional.hpp> diff --git a/svtools/Library_svt.mk b/svtools/Library_svt.mk index 7186bbad4e65..139e632cbf07 100644 --- a/svtools/Library_svt.mk +++ b/svtools/Library_svt.mk @@ -209,7 +209,7 @@ $(eval $(call gb_Library_add_exception_objects,svt,\ svtools/source/misc/sampletext \ svtools/source/misc/stringtransfer \ svtools/source/misc/svtaccessiblefactory \ - svtools/source/misc/svtdata \ + svtools/source/misc/svtresid \ svtools/source/misc/templatefoldercache \ svtools/source/misc/transfer \ svtools/source/misc/transfer2 \ diff --git a/svtools/Package_inc.mk b/svtools/Package_inc.mk index f11202166a69..0dfc219c581a 100644 --- a/svtools/Package_inc.mk +++ b/svtools/Package_inc.mk @@ -139,7 +139,7 @@ $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svmedit.hxx,svtools/sv $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svmedit2.hxx,svtools/svmedit2.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svparser.hxx,svtools/svparser.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtabbx.hxx,svtools/svtabbx.hxx)) -$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtdata.hxx,svtools/svtdata.hxx)) +$(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtresid.hxx,svtools/svtresid.hxx)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtdllapi.h,svtools/svtdllapi.h)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtools.hrc,svtools/svtools.hrc)) $(eval $(call gb_Package_add_file,svtools_inc,inc/svtools/svtreebx.hxx,svtools/svtreebx.hxx)) diff --git a/svtools/inc/svtools/svtdata.hxx b/svtools/inc/svtools/svtresid.hxx index 8689915ca514..f30ed5605e98 100644 --- a/svtools/inc/svtools/svtdata.hxx +++ b/svtools/inc/svtools/svtresid.hxx @@ -26,45 +26,20 @@ * ************************************************************************/ -#ifndef _SVTOOLS_SVTDATA_HXX -#define _SVTOOLS_SVTDATA_HXX +#ifndef _SVTOOLS_SVTRESID_HXX +#define _SVTOOLS_SVTRESID_HXX #include "svtools/svtdllapi.h" #include <tools/resid.hxx> #include <com/sun/star/lang/Locale.hpp> -class ResMgr; -class SfxItemDesruptorList_Impl; - -//============================================================================ -class ImpSvtData -{ -public: - SfxItemDesruptorList_Impl * pItemDesruptList; - ResMgr * pResMgr; - -private: - ImpSvtData(): - pItemDesruptList(0), pResMgr(0) - {} - - ~ImpSvtData(); - -public: - ResMgr * GetResMgr(const ::com::sun::star::lang::Locale aLocale); - ResMgr * GetResMgr(); // VCL dependant, only available in SVT, not in SVL! - - static ImpSvtData & GetSvtData(); -}; - -//============================================================================ class SVT_DLLPUBLIC SvtResId: public ResId { public: SvtResId(sal_uInt16 nId); - // VCL dependant, only available in SVT, not in SVL! + static void DeleteResMgr(); }; -#endif // _SVTOOLS_SVTDATA_HXX +#endif // _SVTOOLS_SVTRESID_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/inc/svtools/ttprops.hxx b/svtools/inc/svtools/ttprops.hxx index dc43c54c252d..e44b7f381267 100644 --- a/svtools/inc/svtools/ttprops.hxx +++ b/svtools/inc/svtools/ttprops.hxx @@ -32,7 +32,7 @@ #include "svtools/svtdllapi.h" #include <tools/rtti.hxx> #include <vcl/apptypes.hxx> -#include <svtools/svtdata.hxx> +#include <svtools/svtresid.hxx> class SfxPoolItem; class Bitmap; diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx index e3bf2f92095e..129b9f445d03 100644 --- a/svtools/source/brwbox/editbrowsebox.cxx +++ b/svtools/source/brwbox/editbrowsebox.cxx @@ -37,7 +37,7 @@ #include <vcl/edit.hxx> #include <tools/resid.hxx> #include <vcl/spinfld.hxx> -#include <svtools/svtdata.hxx> +#include <svtools/svtresid.hxx> #include <svtools/svtools.hrc> diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 16360fec7848..a78adb3ff4fa 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -29,7 +29,7 @@ #include "sal/config.h" #include <svtools/fileview.hxx> -#include <svtools/svtdata.hxx> +#include <svtools/svtresid.hxx> #include <svtools/imagemgr.hxx> #include <svtools/headbar.hxx> #include <svtools/svtabbx.hxx> diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx index ce2214daae12..574a8009ecab 100644 --- a/svtools/source/contnr/svimpbox.cxx +++ b/svtools/source/contnr/svimpbox.cxx @@ -38,7 +38,7 @@ #include <svtools/svlbox.hxx> #include <svimpbox.hxx> #include <rtl/instance.hxx> -#include <svtools/svtdata.hxx> +#include <svtools/svtresid.hxx> #include <tools/wintypes.hxx> #include <svtools/svtools.hrc> #include <comphelper/processfactory.hxx> diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx index 3f839bf8d644..02597f48cfa7 100644 --- a/svtools/source/contnr/svtabbx.cxx +++ b/svtools/source/contnr/svtabbx.cxx @@ -28,7 +28,7 @@ #include <svtools/svtabbx.hxx> #include <svtools/headbar.hxx> -#include <svtools/svtdata.hxx> +#include <svtools/svtresid.hxx> #include <svtools/svtools.hrc> #include <com/sun/star/accessibility/AccessibleStateType.hpp> #include <com/sun/star/accessibility/AccessibleEventId.hpp> diff --git a/svtools/source/contnr/templwin.cxx b/svtools/source/contnr/templwin.cxx index 3e7beba1bd2c..a49770e9f38a 100644 --- a/svtools/source/contnr/templwin.cxx +++ b/svtools/source/contnr/templwin.cxx @@ -28,7 +28,7 @@ #include "templwin.hxx" #include <svtools/templdlg.hxx> -#include <svtools/svtdata.hxx> +#include <svtools/svtresid.hxx> #include <svtools/langhelp.hxx> #include <unotools/pathoptions.hxx> #include <unotools/dynamicmenuoptions.hxx> diff --git a/svtools/source/control/calendar.cxx b/svtools/source/control/calendar.cxx index b1f92aa3e9bb..de24a6bf42fa 100644 --- a/svtools/source/control/calendar.cxx +++ b/svtools/source/control/calendar.cxx @@ -44,7 +44,7 @@ #define _SV_CALENDAR_CXX #include <svtools/svtools.hrc> -#include <svtools/svtdata.hxx> +#include <svtools/svtresid.hxx> #include <svtools/calendar.hxx> // ======================================================================= diff --git a/svtools/source/control/collatorres.cxx b/svtools/source/control/collatorres.cxx index 2dc30a5e9f85..79388a7b9c9c 100644 --- a/svtools/source/control/collatorres.cxx +++ b/svtools/source/control/collatorres.cxx @@ -27,7 +27,7 @@ ************************************************************************/ -#include <svtools/svtdata.hxx> +#include <svtools/svtresid.hxx> #include <svtools/svtools.hrc> #include <svtools/collatorres.hxx> diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index deb207b2b84e..d58c534c9ade 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -37,7 +37,7 @@ #include <unotools/charclass.hxx> #include <svtools/sampletext.hxx> -#include <svtools/svtdata.hxx> +#include <svtools/svtresid.hxx> #include <svtools/svtools.hrc> #include <svtools/ctrlbox.hxx> #include <svtools/ctrltool.hxx> diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx index 146f47e0440a..b43a8a7b7e70 100644 --- a/svtools/source/control/ctrltool.cxx +++ b/svtools/source/control/ctrltool.cxx @@ -39,7 +39,7 @@ #include <vcl/wrkwin.hxx> #include <sal/macros.h> #include <svtools/svtools.hrc> -#include <svtools/svtdata.hxx> +#include <svtools/svtresid.hxx> #include <svtools/ctrltool.hxx> // ======================================================================= diff --git a/svtools/source/control/filectrl.cxx b/svtools/source/control/filectrl.cxx index e5d6197731f9..235074441850 100644 --- a/svtools/source/control/filectrl.cxx +++ b/svtools/source/control/filectrl.cxx @@ -28,7 +28,7 @@ #define _SV_FIELCTRL_CXX -#include <svtools/svtdata.hxx> +#include <svtools/svtresid.hxx> #include <svtools/filectrl.hxx> #include <filectrl.hrc> diff --git a/svtools/source/control/indexentryres.cxx b/svtools/source/control/indexentryres.cxx index 3a85f039093f..5a741122a9cd 100644 --- a/svtools/source/control/indexentryres.cxx +++ b/svtools/source/control/indexentryres.cxx @@ -27,7 +27,7 @@ ************************************************************************/ -#include <svtools/svtdata.hxx> +#include <svtools/svtresid.hxx> #include <svtools/svtools.hrc> #include <svtools/indexentryres.hxx> diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index e05590ac9405..0881063e9c3f 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -39,7 +39,7 @@ #include <vcl/image.hxx> #include "svtaccessiblefactory.hxx" #include <filectrl.hrc> -#include <svtools/svtdata.hxx> +#include <svtools/svtresid.hxx> #include <svtools/svtools.hrc> #include <limits> diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index e138075a3344..09d43f90838f 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -32,7 +32,7 @@ #include "addresstemplate.hrc" #include <svtools/svtools.hrc> #include <svtools/helpid.hrc> -#include <svtools/svtdata.hxx> +#include <svtools/svtresid.hxx> #include <tools/debug.hxx> #include <comphelper/extract.hxx> #include <comphelper/interaction.hxx> diff --git a/svtools/source/dialogs/filedlg2.cxx b/svtools/source/dialogs/filedlg2.cxx index e4661e0b47ea..1d84fa441d6c 100644 --- a/svtools/source/dialogs/filedlg2.cxx +++ b/svtools/source/dialogs/filedlg2.cxx @@ -31,7 +31,7 @@ #include <vcl/fixed.hxx> #include <vcl/edit.hxx> #include <vcl/lstbox.hxx> -#include <svtools/svtdata.hxx> +#include <svtools/svtresid.hxx> #include <filedlg2.hxx> #include <svtools/filedlg.hxx> #include <svtools/filedlg2.hrc> diff --git a/svtools/source/dialogs/insdlg.cxx b/svtools/source/dialogs/insdlg.cxx index e59efb7aad96..a7de833ff9a6 100644 --- a/svtools/source/dialogs/insdlg.cxx +++ b/svtools/source/dialogs/insdlg.cxx @@ -33,7 +33,7 @@ #include <svtools/insdlg.hxx> #include <svtools/sores.hxx> -#include <svtools/svtdata.hxx> +#include <svtools/svtresid.hxx> #include <unotools/configmgr.hxx> #include <sot/clsids.hxx> diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx index a383af839c70..3eb70f1705f4 100644 --- a/svtools/source/dialogs/prnsetup.cxx +++ b/svtools/source/dialogs/prnsetup.cxx @@ -28,7 +28,7 @@ #include <vcl/print.hxx> -#include <svtools/svtdata.hxx> +#include <svtools/svtresid.hxx> #include "prnsetup.hrc" #include <svtools/prnsetup.hxx> diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx index 3771a0c92a88..a6d591941b7d 100644 --- a/svtools/source/dialogs/roadmapwizard.cxx +++ b/svtools/source/dialogs/roadmapwizard.cxx @@ -29,7 +29,7 @@ #include <svtools/roadmapwizard.hxx> #include <svtools/svtools.hrc> -#include <svtools/svtdata.hxx> +#include <svtools/svtresid.hxx> #include <svtools/roadmap.hxx> #include <tools/debug.hxx> diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx index bf7f67df4a8e..56d66a1c0fc5 100644 --- a/svtools/source/dialogs/wizardmachine.cxx +++ b/svtools/source/dialogs/wizardmachine.cxx @@ -31,7 +31,7 @@ #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <vcl/msgbox.hxx> -#include <svtools/svtdata.hxx> +#include <svtools/svtresid.hxx> #include <svtools/svtools.hrc> //......................................................................... diff --git a/svtools/source/java/javacontext.cxx b/svtools/source/java/javacontext.cxx index 4199c8371589..54ebcc2a4826 100644 --- a/svtools/source/java/javacontext.cxx +++ b/svtools/source/java/javacontext.cxx @@ -28,7 +28,7 @@ #include "com/sun/star/uno/Any.hxx" #include "com/sun/star/uno/Type.hxx" -#include <svtools/svtdata.hxx> +#include <svtools/svtresid.hxx> #include <svtools/javacontext.hxx> #include <svtools/javainteractionhandler.hxx> diff --git a/svtools/source/java/javainteractionhandler.cxx b/svtools/source/java/javainteractionhandler.cxx index 92308babf8a0..d4309c9feb1a 100644 --- a/svtools/source/java/javainteractionhandler.cxx +++ b/svtools/source/java/javainteractionhandler.cxx @@ -46,7 +46,7 @@ #include <tools/rcid.h> #include <jvmfwk/framework.h> -#include <svtools/svtdata.hxx> +#include <svtools/svtresid.hxx> #include <svtools/javainteractionhandler.hxx> #include <svtools/javacontext.hxx> diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx index 8272e0ddba5a..d78745c642a7 100644 --- a/svtools/source/misc/ehdl.cxx +++ b/svtools/source/misc/ehdl.cxx @@ -33,7 +33,7 @@ #include <vcl/svapp.hxx> #include <svtools/ehdl.hxx> -#include <svtools/svtdata.hxx> +#include <svtools/svtresid.hxx> #include <svtools/svtools.hrc> #include <svtools/sfxecode.hxx> diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx index 1a7a70186e98..6325a76c4ec3 100644 --- a/svtools/source/misc/embedhlp.cxx +++ b/svtools/source/misc/embedhlp.cxx @@ -30,7 +30,7 @@ #include <svtools/embedhlp.hxx> #include <svtools/filter.hxx> #include <svtools/svtools.hrc> -#include <svtools/svtdata.hxx> +#include <svtools/svtresid.hxx> #include <comphelper/embeddedobjectcontainer.hxx> #include <comphelper/seqstream.hxx> diff --git a/svtools/source/misc/imagemgr.cxx b/svtools/source/misc/imagemgr.cxx index d35fceed14e9..9aad969b4569 100644 --- a/svtools/source/misc/imagemgr.cxx +++ b/svtools/source/misc/imagemgr.cxx @@ -50,7 +50,7 @@ #include <unotools/configmgr.hxx> #include <svtools/svtools.hrc> #include <svtools/imagemgr.hrc> -#include <svtools/svtdata.hxx> +#include <svtools/svtresid.hxx> #include <osl/mutex.hxx> #include <vcl/lazydelete.hxx> diff --git a/svtools/source/misc/itemdel.cxx b/svtools/source/misc/itemdel.cxx index 8a583f73ba96..36b3f0669277 100644 --- a/svtools/source/misc/itemdel.cxx +++ b/svtools/source/misc/itemdel.cxx @@ -32,7 +32,6 @@ #include <tools/errcode.hxx> #include <limits.h> -#include <svtools/svtdata.hxx> #include <svl/svarray.hxx> #include <svl/itempool.hxx> @@ -58,6 +57,8 @@ public: SV_DECL_PTRARR( SfxItemDesruptorList_Impl, SfxItemDesruptor_Impl*, 4 ) +static SfxItemDesruptorList_Impl *pItemDesruptList = NULL; + // ------------------------------------------------------------------------ SfxItemDesruptor_Impl::SfxItemDesruptor_Impl( SfxPoolItem *pItemToDesrupt ): pItem(pItemToDesrupt), @@ -72,7 +73,7 @@ SfxItemDesruptor_Impl::SfxItemDesruptor_Impl( SfxPoolItem *pItemToDesrupt ): GetpApp()->InsertIdleHdl( aLink, 1 ); // und in Liste eintragen (damit geflusht werden kann) - SfxItemDesruptorList_Impl* &rpList = ImpSvtData::GetSvtData().pItemDesruptList; + SfxItemDesruptorList_Impl* &rpList = pItemDesruptList; if ( !rpList ) rpList = new SfxItemDesruptorList_Impl; const SfxItemDesruptor_Impl *pThis = this; @@ -88,7 +89,7 @@ SfxItemDesruptor_Impl::~SfxItemDesruptor_Impl() GetpApp()->RemoveIdleHdl( aLink ); // und aus Liste austragen - SfxItemDesruptorList_Impl* &rpList = ImpSvtData::GetSvtData().pItemDesruptList; + SfxItemDesruptorList_Impl* &rpList = pItemDesruptList; DBG_ASSERT( rpList, "no DesruptorList" ); const SfxItemDesruptor_Impl *pThis = this; if ( rpList ) HACK(warum?) diff --git a/svtools/source/misc/langtab.cxx b/svtools/source/misc/langtab.cxx index df6c0cbd26d6..64af70ef4730 100644 --- a/svtools/source/misc/langtab.cxx +++ b/svtools/source/misc/langtab.cxx @@ -35,7 +35,7 @@ #include <i18npool/mslangid.hxx> #include <svtools/svtools.hrc> -#include <svtools/svtdata.hxx> +#include <svtools/svtresid.hxx> #include <svtools/langtab.hxx> #include <unotools/syslocale.hxx> diff --git a/svtools/source/misc/svtdata.cxx b/svtools/source/misc/svtresid.cxx index 66489f1a7d02..06e7b9272d4f 100644 --- a/svtools/source/misc/svtdata.cxx +++ b/svtools/source/misc/svtresid.cxx @@ -26,49 +26,35 @@ * ************************************************************************/ - -#include <map> #include <tools/resmgr.hxx> -#include <tools/shl.hxx> -#include <svtools/svtdata.hxx> +#include <svtools/svtresid.hxx> #include <vcl/svapp.hxx> -//============================================================================ -// -// ImpSvtData -// -//============================================================================ +static ResMgr* pMgr=NULL; -ImpSvtData::~ImpSvtData() +namespace { - delete pResMgr; -} + ResMgr* getResMgr(const ::com::sun::star::lang::Locale aLocale) + { + if (!pMgr) + pMgr = ResMgr::CreateResMgr("svt", aLocale ); + return pMgr; + } -//============================================================================ -ResMgr * ImpSvtData::GetResMgr(const ::com::sun::star::lang::Locale aLocale) -{ - if (!pResMgr) + ResMgr* getResMgr() { - pResMgr = ResMgr::CreateResMgr("svt", aLocale ); + return getResMgr(Application::GetSettings().GetUILocale()); } - return pResMgr; } -ResMgr * ImpSvtData::GetResMgr() +SvtResId::SvtResId(sal_uInt16 nId) : + ResId(nId, *getResMgr()) { - return GetResMgr(Application::GetSettings().GetUILocale()); } -//============================================================================ -// static -ImpSvtData & ImpSvtData::GetSvtData() +void SvtResId::DeleteResMgr() { - void ** pAppData = GetAppData(SHL_SVT); - if (!*pAppData) - *pAppData= new ImpSvtData; - return *static_cast<ImpSvtData *>(*pAppData); + DELETEZ( pMgr ); } -SvtResId::SvtResId(sal_uInt16 nId): ResId(nId, *ImpSvtData::GetSvtData().GetResMgr()) {} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/toolpanel/paneltabbar.cxx b/svtools/source/toolpanel/paneltabbar.cxx index 71e0616916ce..3db96b0ed762 100644 --- a/svtools/source/toolpanel/paneltabbar.cxx +++ b/svtools/source/toolpanel/paneltabbar.cxx @@ -28,7 +28,7 @@ #include "svtools/toolpanel/paneltabbar.hxx" #include "svtools/toolpanel/toolpaneldeck.hxx" -#include "svtools/svtdata.hxx" +#include "svtools/svtresid.hxx" #include "svtools/svtools.hrc" #include "tabitemdescriptor.hxx" diff --git a/svtools/source/toolpanel/toolpaneldrawer.cxx b/svtools/source/toolpanel/toolpaneldrawer.cxx index 74c46a6bba6c..d6247aed62da 100644 --- a/svtools/source/toolpanel/toolpaneldrawer.cxx +++ b/svtools/source/toolpanel/toolpaneldrawer.cxx @@ -28,7 +28,7 @@ #include "toolpaneldrawer.hxx" #include "toolpaneldrawerpeer.hxx" -#include "svtools/svtdata.hxx" +#include "svtools/svtresid.hxx" #include "svtools/svtools.hrc" #include <com/sun/star/accessibility/AccessibleRole.hpp> diff --git a/sw/source/ui/docvw/HeaderFooterWin.cxx b/sw/source/ui/docvw/HeaderFooterWin.cxx index 5e21d8318b62..df9e8e0689f7 100644 --- a/sw/source/ui/docvw/HeaderFooterWin.cxx +++ b/sw/source/ui/docvw/HeaderFooterWin.cxx @@ -59,7 +59,7 @@ #include <drawinglayer/primitive2d/textlayoutdevice.hxx> #include <drawinglayer/primitive2d/textprimitive2d.hxx> #include <editeng/boxitem.hxx> -#include <svtools/svtdata.hxx> +#include <svtools/svtresid.hxx> #include <svx/hdft.hxx> #include <svx/sdr/contact/objectcontacttools.hxx> #include <vcl/decoview.hxx> diff --git a/sw/source/ui/uiview/srcview.cxx b/sw/source/ui/uiview/srcview.cxx index 96186f713884..ccb164ea22da 100644 --- a/sw/source/ui/uiview/srcview.cxx +++ b/sw/source/ui/uiview/srcview.cxx @@ -49,7 +49,7 @@ #include <unotools/saveopt.hxx> #include <svtools/transfer.hxx> #include <svtools/svtools.hrc> -#include <svtools/svtdata.hxx> +#include <svtools/svtresid.hxx> #include <svx/svxids.hrc> #include <svtools/htmlcfg.hxx> #include <sfx2/app.hxx> diff --git a/sw/source/ui/wrtsh/wrtundo.cxx b/sw/source/ui/wrtsh/wrtundo.cxx index 4cdabd1a1ba6..35c1d2779639 100644 --- a/sw/source/ui/wrtsh/wrtundo.cxx +++ b/sw/source/ui/wrtsh/wrtundo.cxx @@ -33,7 +33,7 @@ #include <swundo.hxx> // fuer Undo-Ids #include <IDocumentUndoRedo.hxx> #include <swdtflvr.hxx> -#include <svtools/svtdata.hxx> +#include <svtools/svtresid.hxx> #include <svtools/svtools.hrc> #include <wrtsh.hrc> #include <sfx2/sfx.hrc> diff --git a/tools/inc/tools/shl.hxx b/tools/inc/tools/shl.hxx index 9d24a159a728..9fa35591f983 100644 --- a/tools/inc/tools/shl.hxx +++ b/tools/inc/tools/shl.hxx @@ -44,7 +44,7 @@ // 5 (SHL_APP3) removed // 6 (SHL_TOOLS) removed // 7 (SHL_SV) removed -#define SHL_SVT 8 +// 8 (SHL_SVT) removed #define SHL_SVDDE 9 #define SHL_ERR 10 //11 (SHL_IPC) removed diff --git a/unusedcode.easy b/unusedcode.easy index dc99539b3369..fb7136148941 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -9,7 +9,6 @@ HTMLControls::Insert(HTMLControl const**, unsigned short) HTMLControls::Insert(HTMLControls const*, unsigned short, unsigned short) HTMLControls::Remove(HTMLControl const*&, unsigned short) HTMLControls::Remove(unsigned short, unsigned short) -ImpSvtData::~ImpSvtData() InsCapOptArr::Insert(InsCapOptArr const*, unsigned short, unsigned short) InsCapOptArr::Insert(InsCaptionOpt* const&, unsigned short&) InsCapOptArr::Insert(InsCaptionOpt* const*, unsigned short) |