chart2/source/controller/main/UndoCommandDispatch.cxx | 2 cui/source/dialogs/about.cxx | 9 +- cui/source/inc/about.hxx | 2 fpicker/source/office/PlacesListBox.cxx | 2 sd/source/ui/view/viewshe3.cxx | 2 sfx2/source/appl/appquit.cxx | 2 sfx2/source/appl/newhelp.cxx | 2 sfx2/source/view/viewfrm.cxx | 2 svtools/Library_svt.mk | 2 svtools/Package_inc.mk | 2 svtools/inc/svtools/itemdel.hxx | 2 svtools/inc/svtools/svtdata.hxx | 70 ----------------- svtools/inc/svtools/svtresid.hxx | 45 ++++++++++ svtools/inc/svtools/ttprops.hxx | 2 svtools/source/brwbox/editbrowsebox.cxx | 2 svtools/source/contnr/fileview.cxx | 2 svtools/source/contnr/svimpbox.cxx | 2 svtools/source/contnr/svtabbx.cxx | 2 svtools/source/contnr/templwin.cxx | 2 svtools/source/control/calendar.cxx | 2 svtools/source/control/collatorres.cxx | 2 svtools/source/control/ctrlbox.cxx | 2 svtools/source/control/ctrltool.cxx | 2 svtools/source/control/filectrl.cxx | 2 svtools/source/control/indexentryres.cxx | 2 svtools/source/control/tabbar.cxx | 2 svtools/source/dialogs/addresstemplate.cxx | 2 svtools/source/dialogs/filedlg2.cxx | 2 svtools/source/dialogs/insdlg.cxx | 2 svtools/source/dialogs/prnsetup.cxx | 2 svtools/source/dialogs/roadmapwizard.cxx | 2 svtools/source/dialogs/wizardmachine.cxx | 2 svtools/source/java/javacontext.cxx | 2 svtools/source/java/javainteractionhandler.cxx | 2 svtools/source/misc/ehdl.cxx | 2 svtools/source/misc/embedhlp.cxx | 2 svtools/source/misc/imagemgr.cxx | 2 svtools/source/misc/itemdel.cxx | 23 ----- svtools/source/misc/langtab.cxx | 2 svtools/source/misc/svtdata.cxx | 74 ------------------ svtools/source/misc/svtresid.cxx | 60 ++++++++++++++ svtools/source/toolpanel/paneltabbar.cxx | 2 svtools/source/toolpanel/toolpaneldrawer.cxx | 2 sw/source/ui/docvw/HeaderFooterWin.cxx | 2 sw/source/ui/uiview/srcview.cxx | 2 sw/source/ui/wrtsh/wrtundo.cxx | 2 tools/inc/tools/shl.hxx | 2 unusedcode.easy | 8 - 48 files changed, 157 insertions(+), 214 deletions(-)
New commits: commit fd257f9e1936b0bc9bc9116bd73eaa04a7dbd060 Author: Caolán McNamara <[email protected]> Date: Wed Apr 25 16:06:16 2012 +0100 Resolves: fdo#48659 force BUILDID placeholder in if missing from translation diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx index dd39869..21473b7 100644 --- a/cui/source/dialogs/about.cxx +++ b/cui/source/dialogs/about.cxx @@ -78,7 +78,7 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId) : aWebsiteButton ( this, ResId( ABOUT_BTN_WEBSITE, *rId.GetResMgr() ) ), aLicenseButton ( this, ResId( ABOUT_BTN_LICENSE, *rId.GetResMgr() ) ), aCancelButton ( this, ResId( ABOUT_BTN_CANCEL, *rId.GetResMgr() ) ), - aVersionTextStr(ResId(ABOUT_STR_VERSION, *rId.GetResMgr())), + aVersionTextStr(ResId::toString(ResId(ABOUT_STR_VERSION, *rId.GetResMgr())).trim()), m_aVendorTextStr(ResId(ABOUT_STR_VENDOR, *rId.GetResMgr())), m_aCopyrightTextStr(ResId(ABOUT_STR_COPYRIGHT, *rId.GetResMgr())), m_aBasedTextStr(ResId(ABOUT_STR_BASED, *rId.GetResMgr())), @@ -372,9 +372,14 @@ rtl::OUString AboutDialog::GetVersionString() rtl::OUString sBuildId = GetBuildId(); - if (!(sBuildId.trim()).isEmpty()) + if (!sBuildId.trim().isEmpty()) { sVersion += " "; + if (m_sBuildStr.indexOf("$BUILDID") == -1) + { + SAL_WARN( "cui.dialogs", "translated Build Id string in translations doesn't contain $BUILDID placeholder" ); + m_sBuildStr += " $BUILDID"; + } sVersion += m_sBuildStr.replaceAll("$BUILDID", sBuildId); } diff --git a/cui/source/inc/about.hxx b/cui/source/inc/about.hxx index a665215..a666c1a 100644 --- a/cui/source/inc/about.hxx +++ b/cui/source/inc/about.hxx @@ -57,7 +57,7 @@ private: CancelButton aCancelButton; String aVersionData; - String aVersionTextStr; + rtl::OUString aVersionTextStr; String m_aVendorTextStr; String m_aCopyrightTextStr; String m_aBasedTextStr; commit a4feeebd3780d59605ba6b4c266226c6841d043b Author: Caolán McNamara <[email protected]> Date: Wed Apr 25 15:33:16 2012 +0100 refactor ImpSvtData diff --git a/chart2/source/controller/main/UndoCommandDispatch.cxx b/chart2/source/controller/main/UndoCommandDispatch.cxx index 5b9299d..e4aafa7 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 3c15879..5338cb7 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 87b88cf..a99fe63 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 b78b30e..a4edf3a 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 fc9bf30..d1f066e 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 531f7d1..278f6f9 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 7186bba..139e632 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 f112021..0dfc219 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/svtdata.hxx deleted file mode 100644 index 8689915..0000000 --- a/svtools/inc/svtools/svtdata.hxx +++ /dev/null @@ -1,70 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * 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 _SVTOOLS_SVTDATA_HXX -#define _SVTOOLS_SVTDATA_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! -}; - -#endif // _SVTOOLS_SVTDATA_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/inc/svtools/svtresid.hxx b/svtools/inc/svtools/svtresid.hxx new file mode 100644 index 0000000..f30ed56 --- /dev/null +++ b/svtools/inc/svtools/svtresid.hxx @@ -0,0 +1,45 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * 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 _SVTOOLS_SVTRESID_HXX +#define _SVTOOLS_SVTRESID_HXX + +#include "svtools/svtdllapi.h" +#include <tools/resid.hxx> +#include <com/sun/star/lang/Locale.hpp> + +class SVT_DLLPUBLIC SvtResId: public ResId +{ +public: + SvtResId(sal_uInt16 nId); + static void DeleteResMgr(); +}; + +#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 dc43c54..e44b7f3 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 e3bf2f9..129b9f4 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 16360fe..a78adb3 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 ce2214d..574a800 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 3f839bf..02597f4 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 3e7beba..a49770e 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 b1f92aa..de24a6b 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 2dc30a5..79388a7 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 deb207b..d58c534 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 146f47e..b43a8a7 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 e5d6197..2350744 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 3a85f03..5a74112 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 e05590a..0881063 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 e138075..09d43f9 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 e4661e0..1d84fa4 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 e59efb7..a7de833 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 a383af8..3eb70f1 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 3771a0c..a6d5919 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 bf7f67d..56d66a1 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 4199c83..54ebcc2 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 92308ba..d4309c9 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 8272e0d..d78745c 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 1a7a701..6325a76 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 d35fcee..9aad969 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 8a583f7..36b3f06 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 df6c0cb..64af70e 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/svtdata.cxx deleted file mode 100644 index 66489f1..0000000 --- a/svtools/source/misc/svtdata.cxx +++ /dev/null @@ -1,74 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * 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. - * - ************************************************************************/ - - -#include <map> -#include <tools/resmgr.hxx> -#include <tools/shl.hxx> -#include <svtools/svtdata.hxx> -#include <vcl/svapp.hxx> - -//============================================================================ -// -// ImpSvtData -// -//============================================================================ - -ImpSvtData::~ImpSvtData() -{ - delete pResMgr; -} - -//============================================================================ -ResMgr * ImpSvtData::GetResMgr(const ::com::sun::star::lang::Locale aLocale) -{ - if (!pResMgr) - { - pResMgr = ResMgr::CreateResMgr("svt", aLocale ); - } - return pResMgr; -} - -ResMgr * ImpSvtData::GetResMgr() -{ - return GetResMgr(Application::GetSettings().GetUILocale()); -} - -//============================================================================ -// static -ImpSvtData & ImpSvtData::GetSvtData() -{ - void ** pAppData = GetAppData(SHL_SVT); - if (!*pAppData) - *pAppData= new ImpSvtData; - return *static_cast<ImpSvtData *>(*pAppData); -} - -SvtResId::SvtResId(sal_uInt16 nId): ResId(nId, *ImpSvtData::GetSvtData().GetResMgr()) {} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/misc/svtresid.cxx b/svtools/source/misc/svtresid.cxx new file mode 100644 index 0000000..06e7b92 --- /dev/null +++ b/svtools/source/misc/svtresid.cxx @@ -0,0 +1,60 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/************************************************************************* + * + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * Copyright 2000, 2010 Oracle and/or its affiliates. + * + * OpenOffice.org - a multi-platform office productivity suite + * + * 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. + * + ************************************************************************/ + +#include <tools/resmgr.hxx> +#include <svtools/svtresid.hxx> +#include <vcl/svapp.hxx> + +static ResMgr* pMgr=NULL; + +namespace +{ + ResMgr* getResMgr(const ::com::sun::star::lang::Locale aLocale) + { + if (!pMgr) + pMgr = ResMgr::CreateResMgr("svt", aLocale ); + return pMgr; + } + + ResMgr* getResMgr() + { + return getResMgr(Application::GetSettings().GetUILocale()); + } +} + +SvtResId::SvtResId(sal_uInt16 nId) : + ResId(nId, *getResMgr()) +{ +} + +void SvtResId::DeleteResMgr() +{ + DELETEZ( pMgr ); +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/toolpanel/paneltabbar.cxx b/svtools/source/toolpanel/paneltabbar.cxx index 71e0616..3db96b0 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 74c46a6..d6247ae 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 5e21d83..df9e8e0 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 96186f7..ccb164e 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 4cdabd1..35c1d27 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 9d24a15..9fa3559 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 dc99539..fb71361 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) commit c694be016923d6ed3763e001d509a6f720dc1ee9 Author: Caolán McNamara <[email protected]> Date: Wed Apr 25 14:42:55 2012 +0100 DeleteOnIdleItems isn't called anywhere diff --git a/svtools/inc/svtools/itemdel.hxx b/svtools/inc/svtools/itemdel.hxx index 2ceb73a..8a9db3d 100644 --- a/svtools/inc/svtools/itemdel.hxx +++ b/svtools/inc/svtools/itemdel.hxx @@ -34,8 +34,6 @@ class SfxPoolItem; SVT_DLLPUBLIC SfxPoolItem* DeleteItemOnIdle( SfxPoolItem* pItem ); -void DeleteOnIdleItems(); - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/misc/itemdel.cxx b/svtools/source/misc/itemdel.cxx index 243619d..8a583f7 100644 --- a/svtools/source/misc/itemdel.cxx +++ b/svtools/source/misc/itemdel.cxx @@ -116,20 +116,4 @@ SfxPoolItem* DeleteItemOnIdle( SfxPoolItem* pItem ) return pItem; } -// ------------------------------------------------------------------------ -void DeleteOnIdleItems() -{ - SfxItemDesruptorList_Impl* &rpList - = ImpSvtData::GetSvtData().pItemDesruptList; - if ( rpList ) - { - sal_uInt16 n; - while ( 0 != ( n = rpList->Count() ) ) - // Remove ist implizit im Dtor - delete rpList->GetObject( n-1 ); - DELETEZ(rpList); - } -} - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit 8c37bc0f43ecda80b5f476fdb0df9987550b0915 Author: Caolán McNamara <[email protected]> Date: Wed Apr 25 14:38:52 2012 +0100 callcatcher: update unused code list diff --git a/unusedcode.easy b/unusedcode.easy index f063fab..dc99539 100755 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -111,7 +111,6 @@ SrchAttrItemList::Replace(SearchAttrItem const*, unsigned short, unsigned short) SrchAttrItemList::_ForEach(unsigned short, unsigned short, unsigned char (*)(SearchAttrItem const&, void*), void*) StgCache::Pos2Page(int) SvLBoxButton::Check(SvLBox*, SvLBoxEntry*, unsigned char) -SvLBoxEntryArr::DeleteAndDestroy(unsigned short, unsigned short) SvPtrarr::Replace(void* const*, unsigned short, unsigned short) SvStringsISortDtor::Insert(String* const*, unsigned short) SvXMLAutoStylePoolNamesP_Impl::GetPos(rtl::OUString const*) const @@ -152,7 +151,6 @@ SwBlockNames::Insert(SwBlockName const**, unsigned short) SwBlockNames::Insert(SwBlockNames const*, unsigned short, unsigned short) SwBlockNames::Remove(SwBlockName const*&, unsigned short) SwBlockNames::Remove(unsigned short, unsigned short) -SwChartBoxes::DeleteAndDestroy(unsigned short, unsigned short) SwContentArr::Insert(SwContent* const&, unsigned short&) SwContentArr::Insert(SwContent* const*, unsigned short) SwContentArr::Insert(SwContentArr const*, unsigned short, unsigned short) @@ -712,11 +710,6 @@ nullcanvas::SpriteCanvasHelper::scrollUpdate(basegfx::B2DRange const&, basegfx:: oox::PropertyMap::dump(com::sun::star::uno::Reference<com::sun::star::beans::XPropertySet>) oox::xls::BiffGroupObject::BiffGroupObject(oox::xls::WorksheetHelper const&) oox::xls::CellBlock::CellBlock(oox::xls::WorksheetHelper const&, oox::ValueRange const&, int) -psp::PrinterGfx::DrawBitmap(Rectangle const&, Rectangle const&, psp::PrinterBmp const&, psp::PrinterBmp const&) -psp::PrinterGfx::DrawMask(Rectangle const&, Rectangle const&, psp::PrinterBmp const&, psp::PrinterColor&) -psp::PrinterGfx::GetGlyphBoundRect(unsigned short, Rectangle&) -psp::PrinterGfx::GetGlyphOutline(unsigned short, unsigned short**, Point**, unsigned char**) -psp::PrinterGfx::GetResolution(int&, int&) const sd::LeftDrawPaneShell::RegisterInterface(SfxModule*) sd::LeftImpressPaneShell::RegisterInterface(SfxModule*) sd::ToolPanelPaneShell::RegisterInterface(SfxModule*)
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
