diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-06-11 20:56:30 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-07-21 08:20:50 +0100 |
| commit | 00657aef09d854c74fb426a935a3e8b1fc390bb0 (patch) | |
| tree | fd1a9bb264fe15dcc129498e62060ecd256b1ee7 /desktop | |
| parent | fa987cbb813cfd729fe490f2f1258b7c8d7fb174 (diff) | |
migrate to boost::gettext
* all .ui files go from <interface> to <interface domain="MODULE"> e.g. vcl
* all .src files go away and the english source strings folded into the .hrc as NC_("context", "source string")
* ResMgr is dropped in favour of std::locale imbued by boost::locale::generator pointed at matching
MODULE .mo files
* UIConfig translations are folded into the module .mo, so e.g. UIConfig_cui
goes from l10n target to normal one, so the res/lang.zips of UI files go away
* translation via Translation::get(hrc-define-key, imbued-std::locale)
* python can now be translated with its inbuilt gettext support (we keep the name strings.hrc there
to keep finding the .hrc file uniform) so magic numbers can go away there
* java and starbasic components can be translated via the pre-existing css.resource.StringResourceWithLocation
mechanism
* en-US res files go away, their strings are now the .hrc keys in the source code
* remaining .res files are replaced by .mo files
* in .res/.ui-lang-zip files, the old scheme missing translations of strings
results in inserting the english original so something can be found, now the
standard fallback of using the english original from the source key is used, so
partial translations shrink dramatically in size
* extract .hrc strings with hrcex which backs onto
xgettext -C --add-comments --keyword=NC_:1c,2 --from-code=UTF-8 --no-wrap
* extract .ui strings with uiex which backs onto
xgettext --add-comments --no-wrap
* qtz for gettext translations is generated at runtime as ascii-ified crc32 of
content + "|" + msgid
* [API CHANGE] remove deprecated binary .res resouce loader related uno apis
com::sun::star::resource::OfficeResourceLoader
com::sun::star::resource::XResourceBundleLoader
com::sun::star::resource::XResourceBundle
when translating strings via uno apis
com.sun.star.resource.StringResourceWithLocation
can continue to be used
Change-Id: Ia2594a2672b7301d9c3421fdf31b6cfe7f3f8d0a
Diffstat (limited to 'desktop')
85 files changed, 512 insertions, 2037 deletions
diff --git a/desktop/AllLangMoTarget_dkt.mk b/desktop/AllLangMoTarget_dkt.mk new file mode 100644 index 000000000000..b951648dbd8c --- /dev/null +++ b/desktop/AllLangMoTarget_dkt.mk @@ -0,0 +1,13 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +$(eval $(call gb_AllLangMoTarget_AllLangMoTarget,dkt)) + +$(eval $(call gb_AllLangMoTarget_set_polocation,dkt,desktop)) + +# vim: set noet sw=4 ts=4: diff --git a/desktop/AllLangResTarget_deployment.mk b/desktop/AllLangResTarget_deployment.mk deleted file mode 100644 index 2b7832799177..000000000000 --- a/desktop/AllLangResTarget_deployment.mk +++ /dev/null @@ -1,40 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,deployment)) - -$(eval $(call gb_AllLangResTarget_set_reslocation,deployment,desktop)) - -$(eval $(call gb_AllLangResTarget_add_srs,deployment,\ - deployment/res \ -)) - -$(eval $(call gb_SrsTarget_SrsTarget,deployment/res)) - -$(eval $(call gb_SrsTarget_set_include,deployment/res,\ - $$(INCLUDE) \ - -I$(SRCDIR)/desktop/inc \ - -I$(SRCDIR)/desktop/source/deployment/registry/inc \ - -I$(SRCDIR)/desktop/source/inc \ -)) - -$(eval $(call gb_SrsTarget_add_files,deployment/res,\ - desktop/source/deployment/manager/dp_manager.src \ - desktop/source/deployment/misc/dp_misc.src \ - desktop/source/deployment/registry/component/dp_component.src \ - desktop/source/deployment/registry/configuration/dp_configuration.src \ - desktop/source/deployment/registry/dp_registry.src \ - desktop/source/deployment/registry/help/dp_help.src \ - desktop/source/deployment/registry/package/dp_package.src \ - desktop/source/deployment/registry/script/dp_script.src \ - desktop/source/deployment/registry/sfwk/dp_sfwk.src \ - desktop/source/deployment/unopkg/unopkg.src \ -)) - -# vim: set ts=4 sw=4 et: diff --git a/desktop/AllLangResTarget_deploymentgui.mk b/desktop/AllLangResTarget_deploymentgui.mk deleted file mode 100644 index d5296e845a60..000000000000 --- a/desktop/AllLangResTarget_deploymentgui.mk +++ /dev/null @@ -1,34 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,deploymentgui)) - -$(eval $(call gb_AllLangResTarget_set_reslocation,deploymentgui,desktop)) - -$(eval $(call gb_AllLangResTarget_add_srs,deploymentgui,\ - deploymentgui/res \ -)) - -$(eval $(call gb_SrsTarget_SrsTarget,deploymentgui/res)) - -$(eval $(call gb_SrsTarget_set_include,deploymentgui/res,\ - $$(INCLUDE) \ - -I$(SRCDIR)/desktop/inc \ - -I$(SRCDIR)/desktop/source/deployment/registry/inc \ - -I$(SRCDIR)/desktop/source/inc \ -)) - -$(eval $(call gb_SrsTarget_add_files,deploymentgui/res,\ - desktop/source/deployment/gui/dp_gui_dialog.src \ - desktop/source/deployment/gui/dp_gui_updatedialog.src \ - desktop/source/deployment/gui/dp_gui_updateinstalldialog.src \ - desktop/source/deployment/gui/dp_gui_versionboxes.src \ -)) - -# vim: set ts=4 sw=4 et: diff --git a/desktop/AllLangResTarget_dkt.mk b/desktop/AllLangResTarget_dkt.mk deleted file mode 100644 index f44a6e017b9d..000000000000 --- a/desktop/AllLangResTarget_dkt.mk +++ /dev/null @@ -1,24 +0,0 @@ -# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- -# -# This file is part of the LibreOffice project. -# -# This Source Code Form is subject to the terms of the Mozilla Public -# License, v. 2.0. If a copy of the MPL was not distributed with this -# file, You can obtain one at http://mozilla.org/MPL/2.0/. -# - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,dkt)) - -$(eval $(call gb_AllLangResTarget_set_reslocation,dkt,desktop)) - -$(eval $(call gb_AllLangResTarget_add_srs,dkt,\ - dkt/res \ -)) - -$(eval $(call gb_SrsTarget_SrsTarget,dkt/res)) - -$(eval $(call gb_SrsTarget_add_files,dkt/res,\ - desktop/source/app/desktop.src \ -)) - -# vim: set ts=4 sw=4 et: diff --git a/desktop/Library_deployment.mk b/desktop/Library_deployment.mk index dbc55a700e04..8095676d3d79 100644 --- a/desktop/Library_deployment.mk +++ b/desktop/Library_deployment.mk @@ -32,6 +32,7 @@ $(eval $(call gb_Library_use_libraries,deployment,\ tl \ ucbhelper \ utl \ + vcl \ xmlscript \ i18nlangtag \ )) diff --git a/desktop/Library_deploymentmisc.mk b/desktop/Library_deploymentmisc.mk index b3754912f54c..8624f47ac6e4 100644 --- a/desktop/Library_deploymentmisc.mk +++ b/desktop/Library_deploymentmisc.mk @@ -33,6 +33,7 @@ $(eval $(call gb_Library_use_libraries,deploymentmisc,\ tl \ ucbhelper \ utl \ + vcl \ xmlscript \ i18nlangtag \ )) diff --git a/desktop/Library_sofficeapp.mk b/desktop/Library_sofficeapp.mk index 7b76aedc4d33..1c88d4e1a421 100644 --- a/desktop/Library_sofficeapp.mk +++ b/desktop/Library_sofficeapp.mk @@ -105,7 +105,6 @@ $(eval $(call gb_Library_add_exception_objects,sofficeapp,\ desktop/source/app/cmdlineargs \ desktop/source/app/cmdlinehelp \ desktop/source/app/desktopcontext \ - desktop/source/app/desktopresid \ desktop/source/app/dispatchwatcher \ desktop/source/app/langselect \ desktop/source/app/lockfile2 \ diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk index a5a688394947..e18b23126dff 100644 --- a/desktop/Module_desktop.mk +++ b/desktop/Module_desktop.mk @@ -23,13 +23,11 @@ $(eval $(call gb_Module_add_targets,desktop,\ $(if $(ENABLE_HEADLESS),,Library_spl) \ Package_branding \ $(if $(CUSTOM_BRAND_DIR),Package_branding_custom) \ + UIConfig_deployment \ )) $(eval $(call gb_Module_add_l10n_targets,desktop,\ - AllLangResTarget_deployment \ - AllLangResTarget_deploymentgui \ - AllLangResTarget_dkt \ - UIConfig_deployment \ + AllLangMoTarget_dkt \ )) ifneq (,$(filter DESKTOP,$(BUILD_TYPE))) diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx index 974d0ef3fac0..f4af4bcecc9d 100644 --- a/desktop/inc/app.hxx +++ b/desktop/inc/app.hxx @@ -90,7 +90,6 @@ class Desktop : public Application DECL_STATIC_LINK( Desktop, EnableAcceptors_Impl, void*, void); static void HandleAppEvent( const ApplicationEvent& rAppEvent ); - static ResMgr* GetDesktopResManager(); static CommandLineArgs& GetCommandLineArgs(); static void HandleBootstrapErrors( @@ -176,8 +175,6 @@ class Desktop : public Application std::unique_ptr<Lockfile> m_xLockfile; Timer m_firstRunTimer; std::thread m_aUpdateThread; - - static ResMgr* pResMgr; }; OUString GetURL_Impl( diff --git a/desktop/inc/deployment.hrc b/desktop/inc/deployment.hrc deleted file mode 100644 index 42ca22890f16..000000000000 --- a/desktop/inc/deployment.hrc +++ /dev/null @@ -1,63 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_DEPLOYMENT_HRC -#define INCLUDED_DEPLOYMENT_HRC - -#define RID_DEPLOYMENT_START 2000 - -#define RID_DEPLOYMENT_GUI_START RID_DEPLOYMENT_START -// RID_DEPLOYMENT_MISC_START (RID_DEPLOYMENT_START+500) -#define RID_DEPLOYMENT_MANAGER_START (RID_DEPLOYMENT_START+1000) -#define RID_DEPLOYMENT_REGISTRY_START (RID_DEPLOYMENT_START+1500) - -#define RID_DEPLOYMENT_BUNDLE_START (RID_DEPLOYMENT_START+2000) - -#define RID_DEPLOYMENT_SCRIPT_START (RID_DEPLOYMENT_START+2500) - -#define RID_DEPLOYMENT_CONF_START (RID_DEPLOYMENT_START+3000) - -#define RID_DEPLOYMENT_COMPONENT_START (RID_DEPLOYMENT_START+3500) - -#define RID_DEPLOYMENT_UNOPKG_START (RID_DEPLOYMENT_START+4000) -#define RID_STR_UNOPKG_ACCEPT_LIC_1 (RID_DEPLOYMENT_UNOPKG_START+1) -#define RID_STR_UNOPKG_ACCEPT_LIC_2 (RID_DEPLOYMENT_UNOPKG_START+2) -#define RID_STR_UNOPKG_ACCEPT_LIC_3 (RID_DEPLOYMENT_UNOPKG_START+3) -#define RID_STR_UNOPKG_ACCEPT_LIC_4 (RID_DEPLOYMENT_UNOPKG_START+4) -#define RID_STR_UNOPKG_ACCEPT_LIC_YES (RID_DEPLOYMENT_UNOPKG_START+5) -#define RID_STR_UNOPKG_ACCEPT_LIC_Y (RID_DEPLOYMENT_UNOPKG_START+6) -#define RID_STR_UNOPKG_ACCEPT_LIC_NO (RID_DEPLOYMENT_UNOPKG_START+7) -#define RID_STR_UNOPKG_ACCEPT_LIC_N (RID_DEPLOYMENT_UNOPKG_START+8) -#define RID_STR_UNOPKG_ERROR (RID_DEPLOYMENT_UNOPKG_START+9) -#define RID_STR_CONCURRENTINSTANCE (RID_DEPLOYMENT_UNOPKG_START+10) - -#define RID_DEPLOYMENT_DEPENDENCIES_START (RID_DEPLOYMENT_START + 4400) -#define RID_DEPLOYMENT_DEPENDENCIES_UNKNOWN RID_DEPLOYMENT_DEPENDENCIES_START -#define RID_DEPLOYMENT_DEPENDENCIES_OOO_MIN \ - (RID_DEPLOYMENT_DEPENDENCIES_START+1) -#define RID_DEPLOYMENT_DEPENDENCIES_OOO_MAX \ - (RID_DEPLOYMENT_DEPENDENCIES_START+2) -#define RID_DEPLOYMENT_DEPENDENCIES_LO_MIN (RID_DEPLOYMENT_DEPENDENCIES_START+3) - -#define RID_DEPLOYMENT_LICENSE_START (RID_DEPLOYMENT_START+4500) - -#define RID_DEPLOYMENT_HELP_START (RID_DEPLOYMENT_START+5000) -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/inc/dp_gui.hrc b/desktop/inc/dp_gui.hrc deleted file mode 100644 index a22629cb1e7a..000000000000 --- a/desktop/inc/dp_gui.hrc +++ /dev/null @@ -1,90 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_DP_GUI_HRC -#define INCLUDED_DP_GUI_HRC - -#include "deployment.hrc" -#include "helpid.hrc" - -#define RID_STR_WARNING_VERSION_LESS (RID_DEPLOYMENT_GUI_START + 3) -#define RID_STR_WARNINGBOX_VERSION_LESS_DIFFERENT_NAMES (RID_DEPLOYMENT_GUI_START + 4) -#define RID_STR_WARNING_VERSION_EQUAL (RID_DEPLOYMENT_GUI_START + 5) -#define RID_STR_WARNINGBOX_VERSION_EQUAL_DIFFERENT_NAMES (RID_DEPLOYMENT_GUI_START + 6) -#define RID_STR_WARNING_VERSION_GREATER (RID_DEPLOYMENT_GUI_START + 7) -#define RID_STR_WARNINGBOX_VERSION_GREATER_DIFFERENT_NAMES (RID_DEPLOYMENT_GUI_START + 8) -#define RID_STR_WARNING_INSTALL_EXTENSION (RID_DEPLOYMENT_GUI_START + 9) -#define RID_STR_WARNING_INSTALL_EXTENSION_DISABLED (RID_DEPLOYMENT_GUI_START + 10) -#define RID_STR_WARNING_REMOVE_EXTENSION_DISABLED (RID_DEPLOYMENT_GUI_START + 11) - -#define RID_DLG_UPDATE_NONE (RID_DEPLOYMENT_GUI_START + 13) -#define RID_DLG_UPDATE_NOINSTALLABLE (RID_DEPLOYMENT_GUI_START + 14) -#define RID_DLG_UPDATE_FAILURE (RID_DEPLOYMENT_GUI_START + 15) -#define RID_DLG_UPDATE_UNKNOWNERROR (RID_DEPLOYMENT_GUI_START + 16) -#define RID_DLG_UPDATE_NODESCRIPTION (RID_DEPLOYMENT_GUI_START + 17) -#define RID_DLG_UPDATE_NOINSTALL (RID_DEPLOYMENT_GUI_START + 18) -#define RID_DLG_UPDATE_NODEPENDENCY (RID_DEPLOYMENT_GUI_START + 19) -#define RID_DLG_UPDATE_NODEPENDENCY_CUR_VER (RID_DEPLOYMENT_GUI_START + 20) -#define RID_DLG_UPDATE_BROWSERBASED (RID_DEPLOYMENT_GUI_START + 21) -#define RID_DLG_UPDATE_VERSION (RID_DEPLOYMENT_GUI_START + 22) -#define RID_DLG_UPDATE_IGNORE (RID_DEPLOYMENT_GUI_START + 23) -#define RID_DLG_UPDATE_ENABLE (RID_DEPLOYMENT_GUI_START + 24) -#define RID_DLG_UPDATE_IGNORE_ALL (RID_DEPLOYMENT_GUI_START + 25) -#define RID_DLG_UPDATE_IGNORED_UPDATE (RID_DEPLOYMENT_GUI_START + 36) - -#define RID_DLG_UPDATE_INSTALL_INSTALLING (RID_DEPLOYMENT_GUI_START + 37) -#define RID_DLG_UPDATE_INSTALL_FINISHED (RID_DEPLOYMENT_GUI_START + 38) -#define RID_DLG_UPDATE_INSTALL_NO_ERRORS (RID_DEPLOYMENT_GUI_START + 39) -#define RID_DLG_UPDATE_INSTALL_THIS_ERROR_OCCURRED (RID_DEPLOYMENT_GUI_START + 40) -#define RID_DLG_UPDATE_INSTALL_ERROR_DOWNLOAD (RID_DEPLOYMENT_GUI_START + 41) -#define RID_DLG_UPDATE_INSTALL_ERROR_INSTALLATION (RID_DEPLOYMENT_GUI_START + 42) -#define RID_DLG_UPDATE_INSTALL_ERROR_LIC_DECLINED (RID_DEPLOYMENT_GUI_START + 43) -#define RID_DLG_UPDATE_INSTALL_EXTENSION_NOINSTALL (RID_DEPLOYMENT_GUI_START + 44) - -#define RID_STR_ADD_PACKAGES (RID_DEPLOYMENT_GUI_START+70) - -#define RID_CTX_ITEM_REMOVE (RID_DEPLOYMENT_GUI_START+80) -#define RID_CTX_ITEM_ENABLE (RID_DEPLOYMENT_GUI_START+81) -#define RID_CTX_ITEM_DISABLE (RID_DEPLOYMENT_GUI_START+82) -#define RID_CTX_ITEM_CHECK_UPDATE (RID_DEPLOYMENT_GUI_START+83) -//There is a gap here - -#define RID_STR_ADDING_PACKAGES (RID_DEPLOYMENT_GUI_START+85) -#define RID_STR_REMOVING_PACKAGES (RID_DEPLOYMENT_GUI_START+86) -#define RID_STR_ENABLING_PACKAGES (RID_DEPLOYMENT_GUI_START+87) -#define RID_STR_DISABLING_PACKAGES (RID_DEPLOYMENT_GUI_START+88) -#define RID_STR_ACCEPT_LICENSE (RID_DEPLOYMENT_GUI_START+89) - -#define RID_STR_ERROR_UNKNOWN_STATUS (RID_DEPLOYMENT_GUI_START+92) -#define RID_STR_CLOSE_BTN (RID_DEPLOYMENT_GUI_START+93) -#define RID_STR_EXIT_BTN (RID_DEPLOYMENT_GUI_START+94) -#define RID_STR_NO_ADMIN_PRIVILEGE (RID_DEPLOYMENT_GUI_START+95) -#define RID_STR_ERROR_MISSING_DEPENDENCIES (RID_DEPLOYMENT_GUI_START+96) -#define RID_STR_ERROR_MISSING_LICENSE (RID_DEPLOYMENT_GUI_START+97) -#define RID_STR_SHOW_LICENSE_CMD (RID_DEPLOYMENT_GUI_START+98) - -#define RID_STR_UNSUPPORTED_PLATFORM (RID_DEPLOYMENT_GUI_START+101) -#define RID_STR_WARNING_REMOVE_EXTENSION (RID_DEPLOYMENT_GUI_START+103) -#define RID_STR_WARNING_REMOVE_SHARED_EXTENSION (RID_DEPLOYMENT_GUI_START+104) -#define RID_STR_WARNING_ENABLE_SHARED_EXTENSION (RID_DEPLOYMENT_GUI_START+105) -#define RID_STR_WARNING_DISABLE_SHARED_EXTENSION (RID_DEPLOYMENT_GUI_START+106) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/inc/dp_gui_shared.hxx b/desktop/inc/dp_shared.hxx index 63496c860867..425cda8ea906 100644 --- a/desktop/inc/dp_gui_shared.hxx +++ b/desktop/inc/dp_shared.hxx @@ -20,26 +20,28 @@ #ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_SHARED_HXX #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_GUI_DP_GUI_SHARED_HXX +#include <osl/diagnose.h> #include <rtl/instance.hxx> #include <tools/resmgr.hxx> +#include <vcl/settings.hxx> +#include <vcl/svapp.hxx> +namespace dp { -namespace dp_gui { - -struct DeploymentGuiResMgr : - public ::rtl::StaticWithInit< ResMgr *, DeploymentGuiResMgr > { - ResMgr * operator () () { - return ResMgr::CreateResMgr( "deploymentgui" ); +struct DeploymentLocale : + public ::rtl::StaticWithInit<std::locale, DeploymentLocale > { + std::locale operator () () { + return Translate::Create("dkt", Application::GetSettings().GetUILanguageTag()); } }; -inline OUString DpGuiResId(sal_uInt16 nId) +} // namespace dp + +inline OUString DpResId(const char* pId) { - return ResId(nId, *DeploymentGuiResMgr::get()); + return Translate::get(pId, dp::DeploymentLocale::get()); } -} // namespace dp_gui - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/inc/pch/precompiled_deploymentgui.hxx b/desktop/inc/pch/precompiled_deploymentgui.hxx index 9a18b5e1186b..0227276894c8 100644 --- a/desktop/inc/pch/precompiled_deploymentgui.hxx +++ b/desktop/inc/pch/precompiled_deploymentgui.hxx @@ -108,7 +108,6 @@ #include <tools/contnr.hxx> #include <tools/gen.hxx> #include <tools/link.hxx> -#include <tools/resid.hxx> #include <tools/solar.h> #include <tools/toolsdllapi.h> #include <typelib/typedescription.h> diff --git a/desktop/inc/pch/precompiled_sofficeapp.hxx b/desktop/inc/pch/precompiled_sofficeapp.hxx index f7b322eb66fb..95e6c6fa7892 100644 --- a/desktop/inc/pch/precompiled_sofficeapp.hxx +++ b/desktop/inc/pch/precompiled_sofficeapp.hxx @@ -229,7 +229,6 @@ #include <i18nlangtag/languagetag.hxx> #include <o3tl/cow_wrapper.hxx> #include <o3tl/typed_flags_set.hxx> -#include <rsc/rsc-vcl-shared-types.hxx> #include <sfx2/dllapi.h> #include <svl/hint.hxx> #include <svl/lstner.hxx> @@ -247,7 +246,6 @@ #include <tools/mapunit.hxx> #include <tools/poly.hxx> #include <tools/ref.hxx> -#include <tools/resid.hxx> #include <tools/resmgr.hxx> #include <tools/solar.h> #include <tools/stream.hxx> diff --git a/desktop/inc/strings.hrc b/desktop/inc/strings.hrc new file mode 100644 index 000000000000..40504ce36815 --- /dev/null +++ b/desktop/inc/strings.hrc @@ -0,0 +1,197 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#ifndef INCLUDED_VCL_INC_STRINGS_HRC +#define INCLUDED_VCL_INC_STRINGS_HRC + +#define NC_(Context, String) (Context "\004" u8##String) + +#define RID_STR_COPYING_PACKAGE NC_("RID_STR_COPYING_PACKAGE", "Copying: ") +#define RID_STR_ERROR_WHILE_ADDING NC_("RID_STR_ERROR_WHILE_ADDING", "Error while adding: ") +#define RID_STR_ERROR_WHILE_REMOVING NC_("RID_STR_ERROR_WHILE_REMOVING", "Error while removing: ") +#define RID_STR_PACKAGE_ALREADY_ADDED NC_("RID_STR_PACKAGE_ALREADY_ADDED", "Extension has already been added: ") +#define RID_STR_NO_SUCH_PACKAGE NC_("RID_STR_NO_SUCH_PACKAGE", "There is no such extension deployed: ") +#define RID_STR_SYNCHRONIZING_REPOSITORY NC_("RID_STR_SYNCHRONIZING_REPOSITORY", "Synchronizing repository for %NAME extensions") + +#define RID_STR_REGISTERING_PACKAGE NC_("RID_STR_REGISTERING_PACKAGE", "Enabling: ") +#define RID_STR_REVOKING_PACKAGE NC_("RID_STR_REVOKING_PACKAGE", "Disabling: ") +#define RID_STR_CANNOT_DETECT_MEDIA_TYPE NC_("RID_STR_CANNOT_DETECT_MEDIA_TYPE", "Cannot detect media-type: ") +#define RID_STR_UNSUPPORTED_MEDIA_TYPE NC_("RID_STR_UNSUPPORTED_MEDIA_TYPE", "This media-type is not supported: ") +#define RID_STR_ERROR_WHILE_REGISTERING NC_("RID_STR_ERROR_WHILE_REGISTERING", "An error occurred while enabling: ") +#define RID_STR_ERROR_WHILE_REVOKING NC_("RID_STR_ERROR_WHILE_REVOKING", "An error occurred while disabling: ") + +#define RID_STR_CONF_SCHEMA NC_("RID_STR_CONF_SCHEMA", "Configuration Schema") +#define RID_STR_CONF_DATA NC_("RID_STR_CONF_DATA", "Configuration Data") + +#define RID_STR_BASIC_LIB NC_("RID_STR_BASIC_LIB", "%PRODUCTNAME Basic Library") +#define RID_STR_DIALOG_LIB NC_("RID_STR_DIALOG_LIB", "Dialog Library") +#define RID_STR_CANNOT_DETERMINE_LIBNAME NC_("RID_STR_CANNOT_DETERMINE_LIBNAME", "The library name could not be determined.") + +#define RID_STR_PACKAGE_BUNDLE NC_("RID_STR_PACKAGE_BUNDLE", "Extension") + +#define RID_STR_DYN_COMPONENT NC_("RID_STR_DYN_COMPONENT", "UNO Dynamic Library Component") +#define RID_STR_JAVA_COMPONENT NC_("RID_STR_JAVA_COMPONENT", "UNO Java Component") +#define RID_STR_PYTHON_COMPONENT NC_("RID_STR_PYTHON_COMPONENT", "UNO Python Component") +#define RID_STR_COMPONENTS NC_("RID_STR_COMPONENTS", "UNO Components") +#define RID_STR_RDB_TYPELIB NC_("RID_STR_RDB_TYPELIB", "UNO RDB Type Library") +#define RID_STR_JAVA_TYPELIB NC_("RID_STR_JAVA_TYPELIB", "UNO Java Type Library") + +#define RID_STR_SFWK_LIB NC_("RID_STR_SFWK_LIB", "%MACROLANG Library") + +#define RID_STR_HELP NC_("RID_STR_HELP", "Help") +#define RID_STR_HELPPROCESSING_GENERAL_ERROR NC_("RID_STR_HELPPROCESSING_GENERAL_ERROR", "The extension cannot be installed because:\n") +#define RID_STR_HELPPROCESSING_XMLPARSING_ERROR NC_("RID_STR_HELPPROCESSING_XMLPARSING_ERROR", "The extension will not be installed because an error occurred in the Help files:\n") + +#define RID_STR_ADD_PACKAGES NC_("RID_STR_ADD_PACKAGES", "Add Extension(s)") +#define RID_CTX_ITEM_REMOVE NC_("RID_CTX_ITEM_REMOVE", "~Remove") +#define RID_CTX_ITEM_ENABLE NC_("RID_CTX_ITEM_ENABLE", "~Enable") +#define RID_CTX_ITEM_DISABLE NC_("RID_CTX_ITEM_DISABLE", "~Disable") +#define RID_CTX_ITEM_CHECK_UPDATE NC_("RID_CTX_ITEM_CHECK_UPDATE", "~Update...") +#define RID_STR_ADDING_PACKAGES NC_("RID_STR_ADDING_PACKAGES", "Adding %EXTENSION_NAME") +#define RID_STR_REMOVING_PACKAGES NC_("RID_STR_REMOVING_PACKAGES", "Removing %EXTENSION_NAME") +#define RID_STR_ENABLING_PACKAGES NC_("RID_STR_ENABLING_PACKAGES", "Enabling %EXTENSION_NAME") +#define RID_STR_DISABLING_PACKAGES NC_("RID_STR_DISABLING_PACKAGES", "Disabling %EXTENSION_NAME") +#define RID_STR_ACCEPT_LICENSE NC_("RID_STR_ACCEPT_LICENSE", "Accept license for %EXTENSION_NAME") +#define RID_STR_ERROR_UNKNOWN_STATUS NC_("RID_STR_ERROR_UNKNOWN_STATUS", "Error: The status of this extension is unknown") +#define RID_STR_CLOSE_BTN NC_("RID_STR_CLOSE_BTN", "Close") +#define RID_STR_EXIT_BTN NC_("RID_STR_EXIT_BTN", "Quit") +#define RID_STR_NO_ADMIN_PRIVILEGE NC_("RID_STR_NO_ADMIN_PRIVILEGE", "%PRODUCTNAME has been updated to a new version. " \ + "Some shared %PRODUCTNAME extensions are not compatible with this version and need to be updated before %PRODUCTNAME can be started.\n\n" \ + "Updating of shared extension requires administrator privileges. Contact your system administrator to update the following shared extensions:") +#define RID_STR_ERROR_MISSING_DEPENDENCIES NC_("RID_STR_ERROR_MISSING_DEPENDENCIES", "The extension cannot be enabled as the following system dependencies are not fulfilled:") +#define RID_STR_ERROR_MISSING_LICENSE NC_("RID_STR_ERROR_MISSING_LICENSE", "This extension is disabled because you haven't accepted the license yet.\n") +#define RID_STR_SHOW_LICENSE_CMD NC_("RID_STR_SHOW_LICENSE_CMD", "Show license") +#define RID_STR_WARNING_INSTALL_EXTENSION NC_("RID_STR_WARNING_INSTALL_EXTENSION", "You are about to install the extension '%NAME'.\n" \ + "Click 'OK' to proceed with the installation.\n" \ + "Click 'Cancel' to stop the installation.") +#define RID_STR_WARNING_INSTALL_EXTENSION_DISABLED NC_("RID_STR_WARNING_INSTALL_EXTENSION_DISABLED", "Extension installation is currently disabled. " \ + "Please consult your system administrator for more information.") +#define RID_STR_WARNING_REMOVE_EXTENSION_DISABLED NC_("RID_STR_WARNING_REMOVE_EXTENSION_DISABLED", "Extension removal is currently disabled. " \ + "Please consult your system administrator for more information.") +#define RID_STR_WARNING_REMOVE_EXTENSION NC_("RID_STR_WARNING_REMOVE_EXTENSION", "You are about to remove the extension '%NAME'.\n" \ + "Click 'OK' to remove the extension.\n" \ + "Click 'Cancel' to stop removing the extension.") +#define RID_STR_WARNING_REMOVE_SHARED_EXTENSION NC_("RID_STR_WARNING_REMOVE_SHARED_EXTENSION", "Make sure that no further users are working with the same " \ + "%PRODUCTNAME, when changing shared extensions in a multi user environment.\n" \ + "Click 'OK' to remove the extension.\n" \ + "Click 'Cancel' to stop removing the extension.") +#define RID_STR_WARNING_ENABLE_SHARED_EXTENSION NC_("RID_STR_WARNING_ENABLE_SHARED_EXTENSION", "Make sure that no further users are working with the same " \ + "%PRODUCTNAME, when changing shared extensions in a multi user environment.\n" \ + "Click 'OK' to enable the extension.\n" \ + "Click 'Cancel' to stop enabling the extension.") +#define RID_STR_WARNING_DISABLE_SHARED_EXTENSION NC_("RID_STR_WARNING_DISABLE_SHARED_EXTENSION", "Make sure that no further users are working with the same " \ + "%PRODUCTNAME, when changing shared extensions in a multi user environment.\n" \ + "Click 'OK' to disable the extension.\n" \ + "Click 'Cancel' to stop disabling the extension.") +#define RID_STR_UNSUPPORTED_PLATFORM NC_("RID_STR_UNSUPPORTED_PLATFORM", "The extension '%Name' does not work on this computer.") + +#define RID_DLG_UPDATE_INSTALL_INSTALLING NC_("RID_DLG_UPDATE_INSTALL_INSTALLING", "Installing extensions...") +#define RID_DLG_UPDATE_INSTALL_FINISHED NC_("RID_DLG_UPDATE_INSTALL_FINISHED", "Installation finished") +#define RID_DLG_UPDATE_INSTALL_NO_ERRORS NC_("RID_DLG_UPDATE_INSTALL_NO_ERRORS", "No errors.") +#define RID_DLG_UPDATE_INSTALL_ERROR_DOWNLOAD NC_("RID_DLG_UPDATE_INSTALL_ERROR_DOWNLOAD", "Error while downloading extension %NAME. ") +#define RID_DLG_UPDATE_INSTALL_THIS_ERROR_OCCURRED NC_("RID_DLG_UPDATE_INSTALL_THIS_ERROR_OCCURRED", "The error message is: ") +#define RID_DLG_UPDATE_INSTALL_ERROR_INSTALLATION NC_("RID_DLG_UPDATE_INSTALL_ERROR_INSTALLATION", "Error while installing extension %NAME. ") +#define RID_DLG_UPDATE_INSTALL_ERROR_LIC_DECLINED NC_("RID_DLG_UPDATE_INSTALL_ERROR_LIC_DECLINED", "The license agreement for extension %NAME was refused. ") +#define RID_DLG_UPDATE_INSTALL_EXTENSION_NOINSTALL NC_("RID_DLG_UPDATE_INSTALL_EXTENSION_NOINSTALL", "The extension will not be installed.") + +#define RID_DEPLOYMENT_DEPENDENCIES_UNKNOWN NC_("RID_DEPLOYMENT_DEPENDENCIES_UNKNOWN", "Unknown") +#define RID_DEPLOYMENT_DEPENDENCIES_OOO_MIN NC_("RID_DEPLOYMENT_DEPENDENCIES_OOO_MIN", "Extension requires at least OpenOffice.org reference version %VERSION") +#define RID_DEPLOYMENT_DEPENDENCIES_OOO_MAX NC_("RID_DEPLOYMENT_DEPENDENCIES_OOO_MAX", "Extension does not support OpenOffice.org reference versions greater than %VERSION") +#define RID_DEPLOYMENT_DEPENDENCIES_LO_MIN NC_("RID_DEPLOYMENT_DEPENDENCIES_LO_MIN", "Extension requires at least %PRODUCTNAME version %VERSION") + +#define RID_STR_WARNING_VERSION_LESS NC_("RID_STR_WARNING_VERSION_LESS", "You are about to install version $NEW of the extension '$NAME'.\n" \ + "The newer version $DEPLOYED is already installed.\n"\ + "Click 'OK' to replace the installed extension.\n"\ + "Click 'Cancel' to stop the installation.") +#define RID_STR_WARNINGBOX_VERSION_LESS_DIFFERENT_NAMES NC_("RID_STR_WARNINGBOX_VERSION_LESS_DIFFERENT_NAMES", "You are about to install version $NEW of the extension '$NAME'.\n" \ + "The newer version $DEPLOYED, named '$OLDNAME', is already installed.\n" \ + "Click 'OK' to replace the installed extension.\n" \ + "Click 'Cancel' to stop the installation.") +#define RID_STR_WARNING_VERSION_EQUAL NC_("RID_STR_WARNING_VERSION_EQUAL", "You are about to install version $NEW of the extension '$NAME'.\n" \ + "That version is already installed.\n" \ + "Click 'OK' to replace the installed extension.\n" \ + "Click 'Cancel' to stop the installation.") +#define RID_STR_WARNINGBOX_VERSION_EQUAL_DIFFERENT_NAMES NC_("RID_STR_WARNINGBOX_VERSION_EQUAL_DIFFERENT_NAMES", "You are about to install version $NEW of the extension '$NAME'.\n" \ + "That version, named '$OLDNAME', is already installed.\n" \ + "Click 'OK' to replace the installed extension.\n" \ + "Click 'Cancel' to stop the installation.") +#define RID_STR_WARNING_VERSION_GREATER NC_("RID_STR_WARNING_VERSION_GREATER", "You are about to install version $NEW of the extension '$NAME'.\n" \ + "The older version $DEPLOYED is already installed.\n" \ + "Click 'OK' to replace the installed extension.\n" \ + "Click 'Cancel' to stop the installation.") +#define RID_STR_WARNINGBOX_VERSION_GREATER_DIFFERENT_NAMES NC_("RID_STR_WARNINGBOX_VERSION_GREATER_DIFFERENT_NAMES", "You are about to install version $NEW of the extension '$NAME'.\n" \ + "The older version $DEPLOYED, named '$OLDNAME', is already installed.\n" \ + "Click 'OK' to replace the installed extension.\n" \ + "Click 'Cancel' to stop the installation.") + +#define RID_DLG_UPDATE_NONE NC_("RID_DLG_UPDATE_NONE", "No new updates are available.") +#define RID_DLG_UPDATE_NOINSTALLABLE NC_("RID_DLG_UPDATE_NOINSTALLABLE", "No installable updates are available. To see ignored or disabled updates, mark the check box 'Show all updates'.") +#define RID_DLG_UPDATE_FAILURE NC_("RID_DLG_UPDATE_FAILURE", "An error occurred:") +#define RID_DLG_UPDATE_UNKNOWNERROR NC_("RID_DLG_UPDATE_UNKNOWNERROR", "Unknown error.") +#define RID_DLG_UPDATE_NODESCRIPTION NC_("RID_DLG_UPDATE_NODESCRIPTION", "No more details are available for this update.") +#define RID_DLG_UPDATE_NOINSTALL NC_("RID_DLG_UPDATE_NOINSTALL", "The extension cannot be updated because:") +#define RID_DLG_UPDATE_NODEPENDENCY NC_("RID_DLG_UPDATE_NODEPENDENCY", "Required %PRODUCTNAME version doesn't match:") +#define RID_DLG_UPDATE_NODEPENDENCY_CUR_VER NC_("RID_DLG_UPDATE_NODEPENDENCY_CUR_VER", "You have %PRODUCTNAME %VERSION") +#define RID_DLG_UPDATE_BROWSERBASED NC_("RID_DLG_UPDATE_BROWSERBASED", "browser based update") +#define RID_DLG_UPDATE_VERSION NC_("RID_DLG_UPDATE_VERSION", "Version") +#define RID_DLG_UPDATE_IGNORE NC_("RID_DLG_UPDATE_IGNORE", "Ignore this Update") +#define RID_DLG_UPDATE_IGNORE_ALL NC_("RID_DLG_UPDATE_IGNORE_ALL", "Ignore all Updates") +#define RID_DLG_UPDATE_ENABLE NC_("RID_DLG_UPDATE_ENABLE", "Enable Updates") +#define RID_DLG_UPDATE_IGNORED_UPDATE NC_("RID_DLG_UPDATE_IGNORED_UPDATE", "This update will be ignored.\n") + +#define STR_BOOTSTRAP_ERR_CANNOT_START NC_("STR_BOOTSTRAP_ERR_CANNOT_START", "The application cannot be started. ") +#define STR_BOOTSTRAP_ERR_DIR_MISSING NC_("STR_BOOTSTRAP_ERR_DIR_MISSING", "The configuration directory \"$1\" could not be found.") +#define STR_BOOTSTRAP_ERR_PATH_INVALID NC_("STR_BOOTSTRAP_ERR_PATH_INVALID", "The installation path is invalid.") +#define STR_BOOTSTRAP_ERR_INTERNAL NC_("STR_BOOTSTRAP_ERR_INTERNAL", "An internal error occurred.") +#define STR_BOOTSTRAP_ERR_FILE_CORRUPT NC_("STR_BOOTSTRAP_ERR_FILE_CORRUPT", "The configuration file \"$1\" is corrupt.") +#define STR_BOOTSTRAP_ERR_FILE_MISSING NC_("STR_BOOTSTRAP_ERR_FILE_MISSING", "The configuration file \"$1\" was not found.") +#define STR_BOOTSTRAP_ERR_NO_SUPPORT NC_("STR_BOOTSTRAP_ERR_NO_SUPPORT", "The configuration file \"$1\" does not support the current version.") +#define STR_BOOTSTRAP_ERR_LANGUAGE_MISSING NC_("STR_BOOTSTRAP_ERR_LANGUAGE_MISSING", "The user interface language cannot be determined.") +#define STR_BOOTSTRAP_ERR_USERINSTALL_FAILED NC_("STR_BOOTSTRAP_ERR_USERINSTALL_FAILED", "User installation could not be completed. ") +#define STR_BOOTSTRAP_ERR_NO_CFG_SERVICE NC_("STR_BOOTSTRAP_ERR_NO_CFG_SERVICE", "The configuration service is not available.") +#define STR_ASK_START_SETUP_MANUALLY NC_("STR_ASK_START_SETUP_MANUALLY", "Start the setup application to repair the installation from the CD or the folder containing the installation packages.") +#define STR_CONFIG_ERR_ACCESS_GENERAL NC_("STR_CONFIG_ERR_ACCESS_GENERAL", "A general error occurred while accessing your central configuration. ") +#define STR_BOOTSTRAP_ERR_CFG_DATAACCESS NC_("STR_BOOTSTRAP_ERR_CFG_DATAACCESS", "%PRODUCTNAME cannot be started due to an error in accessing the %PRODUCTNAME configuration data.\n\nPlease contact your system administrator." ) +#define STR_INTERNAL_ERRMSG NC_("STR_INTERNAL_ERRMSG", "The following internal error has occurred: " ) +#define STR_LO_MUST_BE_RESTARTED NC_("STR_LO_MUST_BE_RESTARTED", "%PRODUCTNAME must unfortunately be manually restarted once after installation or update." ) +#define STR_QUERY_USERDATALOCKED NC_("STR_QUERY_USERDATALOCKED", "Either another instance of %PRODUCTNAME is accessing your personal settings or your personal settings are locked.\nSimultaneous access can lead to inconsistencies in your personal settings. Before continuing, you should make sure user '$u' closes %PRODUCTNAME on host '$h'.\n\nDo you really want to continue?") +#define STR_TITLE_USERDATALOCKED NC_("STR_TITLE_USERDATALOCKED", "%PRODUCTNAME %PRODUCTVERSION") +#define STR_ERR_PRINTDISABLED NC_("STR_ERR_PRINTDISABLED", "Printing is disabled. No documents can be printed.") +#define STR_BOOTSTRAP_ERR_NO_PATHSET_SERVICE NC_("STR_BOOTSTRAP_ERR_NO_PATHSET_SERVICE", "The path manager is not available.\n") +#define STR_BOOSTRAP_ERR_NOTENOUGHDISKSPACE NC_("STR_BOOSTRAP_ERR_NOTENOUGHDISKSPACE", "%PRODUCTNAME user installation could not be completed due to insufficient free disk space. Please free more disc space at the following location and restart %PRODUCTNAME:\n\n") +#define STR_BOOSTRAP_ERR_NOACCESSRIGHTS NC_("STR_BOOSTRAP_ERR_NOACCESSRIGHTS", "%PRODUCTNAME user installation could not be processed due to missing access rights. Please make sure that you have sufficient access rights for the following location and restart %PRODUCTNAME:\n\n") + +#define RID_STR_UNOPKG_ACCEPT_LIC_1 NC_("RID_STR_UNOPKG_ACCEPT_LIC_1", "Extension Software License Agreement of $NAME:") +#define RID_STR_UNOPKG_ACCEPT_LIC_2 NC_("RID_STR_UNOPKG_ACCEPT_LIC_2", "Read the complete License Agreement displayed above. " \ + "Accept the License Agreement by typing \"yes\" on the console " \ + "then press the Return key. Type \"no\" to decline and to abort the " \ + "extension setup.") +#define RID_STR_UNOPKG_ACCEPT_LIC_3 NC_("RID_STR_UNOPKG_ACCEPT_LIC_3", "[Enter \"yes\" or \"no\"]:") +#define RID_STR_UNOPKG_ACCEPT_LIC_4 NC_("RID_STR_UNOPKG_ACCEPT_LIC_4", "Your input was not correct. Please enter \"yes\" or \"no\":") +#define RID_STR_UNOPKG_ACCEPT_LIC_YES NC_("RID_STR_UNOPKG_ACCEPT_LIC_YES", "YES") +#define RID_STR_UNOPKG_ACCEPT_LIC_Y NC_("RID_STR_UNOPKG_ACCEPT_LIC_Y", "Y") +#define RID_STR_UNOPKG_ACCEPT_LIC_NO NC_("RID_STR_UNOPKG_ACCEPT_LIC_NO", "NO") +#define RID_STR_UNOPKG_ACCEPT_LIC_N NC_("RID_STR_UNOPKG_ACCEPT_LIC_N", "N") +#define RID_STR_CONCURRENTINSTANCE NC_("RID_STR_CONCURRENTINSTANCE", "unopkg cannot be started. The lock file indicates it is already running. " \ + "If this does not apply, delete the lock file at:") +#define RID_STR_UNOPKG_ERROR NC_("RID_STR_UNOPKG_ERROR", "ERROR: ") + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index d39a8564366b..927912fcdc67 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -30,7 +30,8 @@ #endif #include "app.hxx" -#include "desktop.hrc" +#include "dp_shared.hxx" +#include "strings.hrc" #include "cmdlineargs.hxx" #include "cmdlinehelp.hxx" #include "dispatchwatcher.hxx" @@ -164,8 +165,6 @@ using namespace ::com::sun::star::ui; using namespace ::com::sun::star::ui::dialogs; using namespace ::com::sun::star::container; -ResMgr* desktop::Desktop::pResMgr = nullptr; - namespace desktop { @@ -333,59 +332,14 @@ void DoRestartActionsIfNecessary(bool quickstart) { } - -ResMgr* Desktop::GetDesktopResManager() -{ - if ( !Desktop::pResMgr ) - { - // Create desktop resource manager and bootstrap process - // was successful. Use default way to get language specific message. - if ( Application::IsInExecute() ) - Desktop::pResMgr = ResMgr::CreateResMgr("dkt"); - - if ( !Desktop::pResMgr ) - { - // Use VCL to get the correct language specific message as we - // are in the bootstrap process and not able to get the installed - // language!! - OUString aUILocaleString = langselect::getEmergencyLocale(); - LanguageTag aLanguageTag( aUILocaleString); - //! ResMgr may modify the Locale for fallback! - Desktop::pResMgr = ResMgr::SearchCreateResMgr( "dkt", aLanguageTag); - } - } - - return Desktop::pResMgr; -} - namespace { -// Get a message string securely. There is a fallback string if the resource -// is not available. - -OUString GetMsgString( - sal_uInt16 nId, const OUString& aFallbackMsg, - bool bAlwaysUseFallbackMsg = false ) -{ - if ( !bAlwaysUseFallbackMsg ) - { - ResMgr* resMgr = Desktop::GetDesktopResManager(); - if ( resMgr ) - return ResId(nId, *resMgr); - } - return aFallbackMsg; -} - -OUString MakeStartupErrorMessage( - OUString const & aErrorMessage, bool bAlwaysUseFallbackMsg = false ) +OUString MakeStartupErrorMessage(OUString const & aErrorMessage) { OUStringBuffer aDiagnosticMessage( 100 ); - aDiagnosticMessage.append( - GetMsgString( - STR_BOOTSTRAP_ERR_CANNOT_START, "The program cannot be started.", - bAlwaysUseFallbackMsg ) ); + aDiagnosticMessage.append(DpResId(STR_BOOTSTRAP_ERR_CANNOT_START)); aDiagnosticMessage.append( "\n" ); @@ -398,20 +352,13 @@ OUString MakeStartupConfigAccessErrorMessage( OUString const & aInternalErrMsg ) { OUStringBuffer aDiagnosticMessage( 200 ); - ResMgr* pResMgr = Desktop::GetDesktopResManager(); - if ( pResMgr ) - aDiagnosticMessage.append( ResId(STR_BOOTSTRAP_ERR_CFG_DATAACCESS, *pResMgr) ); - else - aDiagnosticMessage.append( "The program cannot be started." ); + aDiagnosticMessage.append(DpResId(STR_BOOTSTRAP_ERR_CFG_DATAACCESS)); if ( !aInternalErrMsg.isEmpty() ) { - aDiagnosticMessage.append( "\n\n" ); - if ( pResMgr ) - aDiagnosticMessage.append( ResId(STR_INTERNAL_ERRMSG, *pResMgr) ); - else - aDiagnosticMessage.append( "The following internal error has occurred:\n\n" ); - aDiagnosticMessage.append( aInternalErrMsg ); + aDiagnosticMessage.append("\n\n"); + aDiagnosticMessage.append(DpResId(STR_INTERNAL_ERRMSG)); + aDiagnosticMessage.append(aInternalErrMsg); } return aDiagnosticMessage.makeStringAndClear(); @@ -731,8 +678,7 @@ OUString Desktop::CreateErrorMsgString( /// the shared installation directory could not be located case ::utl::Bootstrap::MISSING_INSTALL_DIRECTORY: { - aMsg = GetMsgString( STR_BOOTSTRAP_ERR_PATH_INVALID, - "The installation path is not available." ); + aMsg = DpResId(STR_BOOTSTRAP_ERR_PATH_INVALID); bFileInfo = false; } break; @@ -740,8 +686,7 @@ OUString Desktop::CreateErrorMsgString( /// the bootstrap INI file could not be found or read case ::utl::Bootstrap::MISSING_BOOTSTRAP_FILE: { - aMsg = GetMsgString( STR_BOOTSTRAP_ERR_FILE_MISSING, - "The configuration file \"$1\" is missing." ); + aMsg = DpResId(STR_BOOTSTRAP_ERR_FILE_MISSING); } break; @@ -750,40 +695,35 @@ OUString Desktop::CreateErrorMsgString( case ::utl::Bootstrap::MISSING_BOOTSTRAP_FILE_ENTRY: case ::utl::Bootstrap::INVALID_BOOTSTRAP_FILE_ENTRY: { - aMsg = GetMsgString( STR_BOOTSTRAP_ERR_FILE_CORRUPT, - "The configuration file \"$1\" is corrupt." ); + aMsg = DpResId(STR_BOOTSTRAP_ERR_FILE_CORRUPT); } break; /// the version locator INI file could not be found or read case ::utl::Bootstrap::MISSING_VERSION_FILE: { - aMsg = GetMsgString( STR_BOOTSTRAP_ERR_FILE_MISSING, - "The configuration file \"$1\" is missing." ); + aMsg = DpResId(STR_BOOTSTRAP_ERR_FILE_MISSING); } break; /// the version locator INI has no entry for this version - case ::utl::Bootstrap::MISSING_VERSION_FILE_ENTRY: + case ::utl::Bootstrap::MISSING_VERSION_FILE_ENTRY: { - aMsg = GetMsgString( STR_BOOTSTRAP_ERR_NO_SUPPORT, - "The main configuration file \"$1\" does not support the current version." ); + aMsg = DpResId(STR_BOOTSTRAP_ERR_NO_SUPPORT); } break; /// the user installation directory does not exist - case ::utl::Bootstrap::MISSING_USER_DIRECTORY: + case ::utl::Bootstrap::MISSING_USER_DIRECTORY: { - aMsg = GetMsgString( STR_BOOTSTRAP_ERR_DIR_MISSING, - "The configuration directory \"$1\" is missing." ); + aMsg = DpResId(STR_BOOTSTRAP_ERR_DIR_MISSING); } break; /// some bootstrap data was invalid in unexpected ways case ::utl::Bootstrap::INVALID_BOOTSTRAP_DATA: { - aMsg = GetMsgString( STR_BOOTSTRAP_ERR_INTERNAL, - "An internal failure occurred." ); + aMsg = DpResId(STR_BOOTSTRAP_ERR_INTERNAL); bFileInfo = false; } break; @@ -892,10 +832,7 @@ void Desktop::HandleBootstrapErrors( // Currently we are not able to display a message box with a service manager due to this limitations inside VCL. // When UNO is not properly initialized, all kinds of things can fail - // and cause the process to crash (e.g., a call to GetMsgString may - // crash when somewhere deep within that call Any::operator <= is used - // with a PropertyValue, and no binary UNO type description for - // PropertyValue is available). To give the user a hint even if + // and cause the process to crash. To give the user a hint even if // generating and displaying a message box below crashes, print a // hard-coded message on stderr first: std::cerr @@ -915,13 +852,7 @@ void Desktop::HandleBootstrapErrors( OUString aMessage; OUStringBuffer aDiagnosticMessage( 100 ); - OUString aErrorMsg; - - if ( aBootstrapError == BE_UNO_SERVICEMANAGER ) - aErrorMsg = "The service manager is not available."; - else - aErrorMsg = GetMsgString( STR_BOOTSTRAP_ERR_NO_CFG_SERVICE, - "The configuration service is not available." ); + OUString aErrorMsg = DpResId(STR_BOOTSTRAP_ERR_NO_CFG_SERVICE); aDiagnosticMessage.append( aErrorMsg ); aDiagnosticMessage.append( "\n" ); @@ -935,15 +866,10 @@ void Desktop::HandleBootstrapErrors( // Due to the fact the we haven't a backup applicat.rdb file anymore it is not possible to // repair the installation with the setup executable besides the office executable. Now // we have to ask the user to start the setup on CD/installation directory manually!! - OUString aStartSetupManually( GetMsgString( - STR_ASK_START_SETUP_MANUALLY, - "Start setup application to repair the installation from CD, or the folder containing the installation packages.", - aBootstrapError == BE_UNO_SERVICEMANAGER ) ); + OUString aStartSetupManually(DpResId(STR_ASK_START_SETUP_MANUALLY)); - aDiagnosticMessage.append( aStartSetupManually ); - aMessage = MakeStartupErrorMessage( - aDiagnosticMessage.makeStringAndClear(), - aBootstrapError == BE_UNO_SERVICEMANAGER ); + aDiagnosticMessage.append(aStartSetupManually); + aMessage = MakeStartupErrorMessage(aDiagnosticMessage.makeStringAndClear()); FatalError( aMessage); } @@ -957,11 +883,7 @@ void Desktop::HandleBootstrapErrors( // enter safe mode, too sfx2::SafeMode::putFlag(); - OUString msg( - GetMsgString( - STR_CONFIG_ERR_ACCESS_GENERAL, - ("A general error occurred while accessing your central" - " configuration. SafeMode is initiated."))); + OUString msg(DpResId(STR_CONFIG_ERR_ACCESS_GENERAL)); if (!aErrorMessage.isEmpty()) { msg += "\n(\"" + aErrorMessage + "\")"; } @@ -972,8 +894,7 @@ void Desktop::HandleBootstrapErrors( OUString aMessage; OUStringBuffer aDiagnosticMessage( 100 ); OUString aErrorMsg; - aErrorMsg = GetMsgString( STR_BOOTSTRAP_ERR_USERINSTALL_FAILED, - "User installation could not be completed" ); + aErrorMsg = DpResId(STR_BOOTSTRAP_ERR_USERINSTALL_FAILED); aDiagnosticMessage.append( aErrorMsg ); aMessage = MakeStartupErrorMessage( aDiagnosticMessage.makeStringAndClear() ); FatalError(aMessage); @@ -983,10 +904,9 @@ void Desktop::HandleBootstrapErrors( OUString aMessage; OUStringBuffer aDiagnosticMessage( 100 ); OUString aErrorMsg; - aErrorMsg = GetMsgString( + aErrorMsg = DpResId( //@@@ FIXME: should use an own resource string => #i36213# - STR_BOOTSTRAP_ERR_LANGUAGE_MISSING, - "Language could not be determined." ); + STR_BOOTSTRAP_ERR_LANGUAGE_MISSING); aDiagnosticMessage.append( aErrorMsg ); aMessage = MakeStartupErrorMessage( aDiagnosticMessage.makeStringAndClear() ); @@ -1004,13 +924,9 @@ void Desktop::HandleBootstrapErrors( utl::Bootstrap::locateUserInstallation( aUserInstallationURL ); if ( aBootstrapError == BE_USERINSTALL_NOTENOUGHDISKSPACE ) - aErrorMsg = GetMsgString( - STR_BOOSTRAP_ERR_NOTENOUGHDISKSPACE, - "User installation could not be completed due to insufficient free disk space." ); + aErrorMsg = DpResId(STR_BOOSTRAP_ERR_NOTENOUGHDISKSPACE); else - aErrorMsg = GetMsgString( - STR_BOOSTRAP_ERR_NOACCESSRIGHTS, - "User installation could not be processed due to missing access rights." ); + aErrorMsg = DpResId(STR_BOOSTRAP_ERR_NOACCESSRIGHTS); osl::File::getSystemPathFromFileURL( aUserInstallationURL, aUserInstallationPath ); @@ -1158,8 +1074,7 @@ void restartOnMac(bool passArguments) { RequestHandler::Disable(); #if HAVE_FEATURE_MACOSX_SANDBOX (void) passArguments; // avoid warnings - ResMgr *resMgr = Desktop::GetDesktopResManager(); - OUString aMessage = ResId(STR_LO_MUST_BE_RESTARTED, *resMgr); + OUString aMessage = DpResId(STR_LO_MUST_BE_RESTARTED); MessageDialog aRestartBox(NULL, aMessage); aRestartBox.Execute(); @@ -1399,7 +1314,7 @@ int Desktop::Main() } #endif - ResMgr::SetReadStringHook( ReplaceStringHookProc ); + Translate::SetReadStringHook(ReplaceStringHookProc); // Startup screen OpenSplashScreen(); @@ -1792,8 +1707,6 @@ int Desktop::doShutdown() pExecGlobals->xGlobalBroadcaster->documentEventOccured(aEvent); } - delete pResMgr; - pResMgr = nullptr; // Restore old value const CommandLineArgs& rCmdLineArgs = GetCommandLineArgs(); if ( rCmdLineArgs.IsHeadless() || rCmdLineArgs.IsEventTesting() ) @@ -2272,12 +2185,8 @@ void Desktop::OpenClients() { aRequest.aPrintList.clear(); aRequest.aPrintToList.clear(); - ResMgr* pDtResMgr = GetDesktopResManager(); - if( pDtResMgr ) - { - ScopedVclPtrInstance< MessageDialog > aBox(nullptr, ResId(STR_ERR_PRINTDISABLED, *pDtResMgr)); - aBox->Execute(); - } + ScopedVclPtrInstance< MessageDialog > aBox(nullptr, DpResId(STR_ERR_PRINTDISABLED)); + aBox->Execute(); } // Process request diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx index 83bace868f04..5571b9460646 100644 --- a/desktop/source/app/appinit.cxx +++ b/desktop/source/app/appinit.cxx @@ -23,9 +23,9 @@ #include <config_vclplug.h> #include "app.hxx" +#include "dp_shared.hxx" #include "cmdlineargs.hxx" -#include "desktopresid.hxx" -#include "desktop.hrc" +#include "strings.hrc" #include <com/sun/star/registry/XSimpleRegistry.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XInitialization.hpp> @@ -45,8 +45,6 @@ #include <rtl/bootstrap.hxx> #include <sal/log.hxx> -#include <tools/rcid.h> - #include <rtl/instance.hxx> #include <comphelper/processfactory.hxx> #include <unotools/ucbhelper.hxx> @@ -238,13 +236,7 @@ void Desktop::CreateTemporaryDirectory() { // Catch runtime exception here: We have to add language dependent info // to the exception message. Fallback solution uses hard coded string. - OUString aMsg; - DesktopResId aResId( STR_BOOTSTRAP_ERR_NO_PATHSET_SERVICE ); - aResId.SetRT( RSC_STRING ); - if ( aResId.GetResMgr()->IsAvailable( aResId )) - aMsg = aResId; - else - aMsg = "The path manager is not available.\n"; + OUString aMsg = DpResId(STR_BOOTSTRAP_ERR_NO_PATHSET_SERVICE); e.Message = aMsg + e.Message; throw; } diff --git a/desktop/source/app/desktop.hrc b/desktop/source/app/desktop.hrc deleted file mode 100644 index 6863b1b6ed2c..000000000000 --- a/desktop/source/app/desktop.hrc +++ /dev/null @@ -1,60 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_DESKTOP_SOURCE_APP_DESKTOP_HRC -#define INCLUDED_DESKTOP_SOURCE_APP_DESKTOP_HRC - -#include <svl/solar.hrc> - -// RID_FIRSTSTSTART_START 3000 -#define RID_DESKTOP_STRING_START 10000 - -#define STR_QUERY_USERDATALOCKED (RID_DESKTOP_STRING_START+2) - -#define STR_BOOTSTRAP_ERR_CANNOT_START (RID_DESKTOP_STRING_START+100) -#define STR_BOOTSTRAP_ERR_DIR_MISSING (RID_DESKTOP_STRING_START+101) -#define STR_BOOTSTRAP_ERR_PATH_INVALID (RID_DESKTOP_STRING_START+102) -#define STR_BOOTSTRAP_ERR_INTERNAL (RID_DESKTOP_STRING_START+104) -#define STR_BOOTSTRAP_ERR_FILE_CORRUPT (RID_DESKTOP_STRING_START+105) -#define STR_BOOTSTRAP_ERR_FILE_MISSING (RID_DESKTOP_STRING_START+106) -#define STR_BOOTSTRAP_ERR_NO_SUPPORT (RID_DESKTOP_STRING_START+107) -#define STR_BOOTSTRAP_ERR_LANGUAGE_MISSING (RID_DESKTOP_STRING_START+108) -#define STR_BOOTSTRAP_ERR_USERINSTALL_FAILED (RID_DESKTOP_STRING_START+109) - -#define STR_BOOTSTRAP_ERR_NO_CFG_SERVICE (RID_DESKTOP_STRING_START+121) -#define STR_BOOTSTRAP_ERR_CFG_DATAACCESS (RID_DESKTOP_STRING_START+122) -#define STR_BOOTSTRAP_ERR_NO_PATHSET_SERVICE (RID_DESKTOP_STRING_START+123) - -#define STR_ASK_START_SETUP_MANUALLY (RID_DESKTOP_STRING_START+152) - -#define STR_ERR_PRINTDISABLED (RID_DESKTOP_STRING_START+153) - -#define STR_INTERNAL_ERRMSG (RID_DESKTOP_STRING_START+161) -#define STR_LO_MUST_BE_RESTARTED (RID_DESKTOP_STRING_START+162) - -#define STR_CONFIG_ERR_ACCESS_GENERAL (RID_DESKTOP_STRING_START+187) - -#define STR_BOOSTRAP_ERR_NOTENOUGHDISKSPACE (RID_DESKTOP_STRING_START+189) -#define STR_BOOSTRAP_ERR_NOACCESSRIGHTS (RID_DESKTOP_STRING_START+190) - -#define STR_TITLE_USERDATALOCKED (RID_DESKTOP_STRING_START+206) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/app/desktop.src b/desktop/source/app/desktop.src deleted file mode 100644 index a4dd5da46f85..000000000000 --- a/desktop/source/app/desktop.src +++ /dev/null @@ -1,127 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "desktop.hrc" - -String STR_BOOTSTRAP_ERR_CANNOT_START -{ - Text [ en-US ] = "The application cannot be started. "; -}; - -String STR_BOOTSTRAP_ERR_DIR_MISSING -{ - Text [ en-US ] = "The configuration directory \"$1\" could not be found."; -}; - -String STR_BOOTSTRAP_ERR_PATH_INVALID -{ - Text [ en-US ] = "The installation path is invalid."; -}; - -String STR_BOOTSTRAP_ERR_INTERNAL -{ - Text [ en-US ] = "An internal error occurred."; -}; - -String STR_BOOTSTRAP_ERR_FILE_CORRUPT -{ - Text [ en-US ] = "The configuration file \"$1\" is corrupt."; -}; - -String STR_BOOTSTRAP_ERR_FILE_MISSING -{ - Text [ en-US ] = "The configuration file \"$1\" was not found."; -}; - -String STR_BOOTSTRAP_ERR_NO_SUPPORT -{ - Text [ en-US ] = "The configuration file \"$1\" does not support the current version."; -}; - -String STR_BOOTSTRAP_ERR_LANGUAGE_MISSING -{ - Text [ en-US ] = "The user interface language cannot be determined."; -}; - -String STR_BOOTSTRAP_ERR_USERINSTALL_FAILED -{ - Text [ en-US ] = "User installation could not be completed. "; -}; - -String STR_BOOTSTRAP_ERR_NO_CFG_SERVICE -{ - Text [ en-US ] = "The configuration service is not available."; -}; - -String STR_ASK_START_SETUP_MANUALLY -{ - Text [ en-US ] = "Start the setup application to repair the installation from the CD or the folder containing the installation packages."; -}; - -String STR_CONFIG_ERR_ACCESS_GENERAL -{ - Text [ en-US ] = "A general error occurred while accessing your central configuration. "; -}; - -String STR_BOOTSTRAP_ERR_CFG_DATAACCESS -{ - Text [ en-US ] = "%PRODUCTNAME cannot be started due to an error in accessing the %PRODUCTNAME configuration data.\n\nPlease contact your system administrator." ; -}; - -String STR_INTERNAL_ERRMSG -{ - Text [ en-US ] = "The following internal error has occurred: " ; -}; - -String STR_LO_MUST_BE_RESTARTED -{ - Text [ en-US ] = "%PRODUCTNAME must unfortunately be manually restarted once after installation or update." ; -}; - -String STR_QUERY_USERDATALOCKED -{ - Text [ en-US ] = "Either another instance of %PRODUCTNAME is accessing your personal settings or your personal settings are locked.\nSimultaneous access can lead to inconsistencies in your personal settings. Before continuing, you should make sure user '$u' closes %PRODUCTNAME on host '$h'.\n\nDo you really want to continue?"; -}; - -String STR_TITLE_USERDATALOCKED -{ - Text [ en-US ] = "%PRODUCTNAME %PRODUCTVERSION"; -}; - -String STR_ERR_PRINTDISABLED -{ - Text [ en-US ] = "Printing is disabled. No documents can be printed."; -}; - -String STR_BOOTSTRAP_ERR_NO_PATHSET_SERVICE -{ - Text [ en-US ] = "The path manager is not available.\n"; -}; - -String STR_BOOSTRAP_ERR_NOTENOUGHDISKSPACE -{ - Text [ en-US ] = "%PRODUCTNAME user installation could not be completed due to insufficient free disk space. Please free more disc space at the following location and restart %PRODUCTNAME:\n\n"; -}; - -String STR_BOOSTRAP_ERR_NOACCESSRIGHTS -{ - Text [ en-US ] = "%PRODUCTNAME user installation could not be processed due to missing access rights. Please make sure that you have sufficient access rights for the following location and restart %PRODUCTNAME:\n\n"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/app/desktopresid.cxx b/desktop/source/app/desktopresid.cxx deleted file mode 100644 index 87784a83cbe5..000000000000 --- a/desktop/source/app/desktopresid.cxx +++ /dev/null @@ -1,34 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "desktopresid.hxx" -#include "app.hxx" - - -namespace desktop -{ - -DesktopResId::DesktopResId( sal_uInt16 nId ) : - ResId( nId, *Desktop::GetDesktopResManager() ) -{ -} - -} - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/app/desktopresid.hxx b/desktop/source/app/desktopresid.hxx deleted file mode 100644 index 43114219f626..000000000000 --- a/desktop/source/app/desktopresid.hxx +++ /dev/null @@ -1,38 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_DESKTOP_SOURCE_APP_DESKTOPRESID_HXX -#define INCLUDED_DESKTOP_SOURCE_APP_DESKTOPRESID_HXX - -#include <tools/resid.hxx> - -namespace desktop -{ - -class DesktopResId : public ResId -{ - public: - explicit DesktopResId( sal_uInt16 nId ); -}; - -} - -#endif // INCLUDED_DESKTOP_SOURCE_APP_DESKTOPRESID_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/app/lockfile2.cxx b/desktop/source/app/lockfile2.cxx index fbcd5633f524..42f3081fb7d5 100644 --- a/desktop/source/app/lockfile2.cxx +++ b/desktop/source/app/lockfile2.cxx @@ -19,8 +19,8 @@ #include <vcl/layout.hxx> -#include "desktopresid.hxx" -#include "desktop.hrc" +#include "dp_shared.hxx" +#include "strings.hrc" #include <tools/config.hxx> #include "lockfile.hxx" @@ -38,10 +38,10 @@ bool Lockfile_execWarning( Lockfile const * that ) OString aTime = aConfig.ReadKey( LOCKFILE_TIMEKEY ); // display warning and return response - ScopedVclPtrInstance<MessageDialog> aBox(nullptr, DesktopResId(STR_QUERY_USERDATALOCKED), + ScopedVclPtrInstance<MessageDialog> aBox(nullptr, DpResId(STR_QUERY_USERDATALOCKED), VclMessageType::Question, VclButtonsType::YesNo); // set box title - OUString aTitle = OUString( DesktopResId( STR_TITLE_USERDATALOCKED )); + OUString aTitle = DpResId(STR_TITLE_USERDATALOCKED); aBox->SetText( aTitle ); // insert values... OUString aMsgText = aBox->get_primary_text(); diff --git a/desktop/source/deployment/gui/dp_gui.h b/desktop/source/deployment/gui/dp_gui.h index 8ab6ee063825..8f1820387c5c 100644 --- a/desktop/source/deployment/gui/dp_gui.h +++ b/desktop/source/deployment/gui/dp_gui.h @@ -22,7 +22,7 @@ #include "dp_gui_updatedata.hxx" #include "dp_misc.h" -#include "dp_gui.hrc" +#include "strings.hrc" #include <rtl/ref.hxx> #include <rtl/instance.hxx> #include <osl/thread.hxx> diff --git a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx index 56db76bd1b64..a5720c7532a2 100644 --- a/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_dependencydialog.cxx @@ -24,12 +24,11 @@ #include <vector> #include <rtl/ustring.hxx> -#include <tools/resid.hxx> #include <vcl/dialog.hxx> -#include "dp_gui.hrc" +#include "strings.hrc" #include "dp_gui_dependencydialog.hxx" -#include "dp_gui_shared.hxx" +#include "dp_shared.hxx" namespace vcl { class Window; } diff --git a/desktop/source/deployment/gui/dp_gui_dialog.src b/desktop/source/deployment/gui/dp_gui_dialog.src deleted file mode 100644 index 27ebb4b7f6f1..000000000000 --- a/desktop/source/deployment/gui/dp_gui_dialog.src +++ /dev/null @@ -1,164 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ -#include <svtools/controldims.hrc> -#include "dp_gui.hrc" - -String RID_STR_ADD_PACKAGES -{ - Text [ en-US ] = "Add Extension(s)"; -}; - -String RID_CTX_ITEM_REMOVE -{ - Text [ en-US ] = "~Remove"; -}; - -String RID_CTX_ITEM_ENABLE -{ - Text [ en-US ] = "~Enable"; -}; - -String RID_CTX_ITEM_DISABLE -{ - Text [ en-US ] = "~Disable"; -}; - -String RID_CTX_ITEM_CHECK_UPDATE -{ - Text [ en-US ] = "~Update..."; -}; - -String RID_STR_ADDING_PACKAGES -{ - Text [ en-US ] = "Adding %EXTENSION_NAME"; -}; - -String RID_STR_REMOVING_PACKAGES -{ - Text [ en-US ] = "Removing %EXTENSION_NAME"; -}; - -String RID_STR_ENABLING_PACKAGES -{ - Text [ en-US ] = "Enabling %EXTENSION_NAME"; -}; - -String RID_STR_DISABLING_PACKAGES -{ - Text [ en-US ] = "Disabling %EXTENSION_NAME"; -}; - -String RID_STR_ACCEPT_LICENSE -{ - Text [ en-US ] = "Accept license for %EXTENSION_NAME"; -}; - -String RID_STR_ERROR_UNKNOWN_STATUS -{ - Text [ en-US ] = "Error: The status of this extension is unknown"; -}; - -String RID_STR_CLOSE_BTN -{ - Text [ en-US ] = "Close"; -}; - -String RID_STR_EXIT_BTN -{ - Text [ en-US ] = "Quit"; -}; - -String RID_STR_NO_ADMIN_PRIVILEGE -{ - Text [ en-US ] = "%PRODUCTNAME has been updated to a new version. " - "Some shared %PRODUCTNAME extensions are not compatible with this version and need to be updated before %PRODUCTNAME can be started.\n\n" - "Updating of shared extension requires administrator privileges. Contact your system administrator to update the following shared extensions:"; -}; - -String RID_STR_ERROR_MISSING_DEPENDENCIES -{ - Text [ en-US ] = "The extension cannot be enabled as the following system dependencies are not fulfilled:"; -}; - -String RID_STR_ERROR_MISSING_LICENSE -{ - Text [ en-US ] = "This extension is disabled because you haven't accepted the license yet.\n"; -}; - -String RID_STR_SHOW_LICENSE_CMD -{ - Text [ en-US ] = "Show license"; -}; - -String RID_STR_WARNING_INSTALL_EXTENSION -{ - Text [en-US] = "You are about to install the extension '%NAME'.\n" - "Click 'OK' to proceed with the installation.\n" - "Click 'Cancel' to stop the installation."; -}; - -String RID_STR_WARNING_INSTALL_EXTENSION_DISABLED -{ - Text [en-US] = "Extension installation is currently disabled. " - "Please consult your system administrator for more information."; -}; - -String RID_STR_WARNING_REMOVE_EXTENSION -{ - Text [en-US] = "You are about to remove the extension '%NAME'.\n" - "Click 'OK' to remove the extension.\n" - "Click 'Cancel' to stop removing the extension."; -}; - -String RID_STR_WARNING_REMOVE_EXTENSION_DISABLED -{ - Text [en-US] = "Extension removal is currently disabled. " - "Please consult your system administrator for more information."; -}; - -String RID_STR_WARNING_REMOVE_SHARED_EXTENSION -{ - Text [en-US] = "Make sure that no further users are working with the same " - "%PRODUCTNAME, when changing shared extensions in a multi user environment.\n" - "Click 'OK' to remove the extension.\n" - "Click 'Cancel' to stop removing the extension."; -}; - -String RID_STR_WARNING_ENABLE_SHARED_EXTENSION -{ - Text [en-US] = "Make sure that no further users are working with the same " - "%PRODUCTNAME, when changing shared extensions in a multi user environment.\n" - "Click 'OK' to enable the extension.\n" - "Click 'Cancel' to stop enabling the extension."; -}; - -String RID_STR_WARNING_DISABLE_SHARED_EXTENSION -{ - Text [en-US] = "Make sure that no further users are working with the same " - "%PRODUCTNAME, when changing shared extensions in a multi user environment.\n" - "Click 'OK' to disable the extension.\n" - "Click 'Cancel' to stop disabling the extension."; -}; - -String RID_STR_UNSUPPORTED_PLATFORM -{ - Text [ en-US ] = "The extension '%Name' does not work on this computer."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index f5c1f5f07c1c..04bd0a2354f7 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -17,14 +17,15 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include "dp_gui.hrc" -#include <svtools/controldims.hrc> -#include <svtools/svtools.hrc> +#include "strings.hrc" +#include "helpid.hrc" +#include <svtools/controldims.hxx> +#include <svtools/strings.hrc> #include "dp_gui.h" #include "dp_gui_dialog2.hxx" #include "dp_gui_extlistbox.hxx" -#include "dp_gui_shared.hxx" +#include "dp_shared.hxx" #include "dp_gui_theextmgr.hxx" #include "dp_gui_extensioncmdqueue.hxx" #include "dp_misc.h" @@ -33,6 +34,8 @@ #include "dp_identifier.hxx" #include "dp_descriptioninfoset.hxx" +#include "fpicker/fpicker.hrc" + #include <vcl/ctrl.hxx> #include <vcl/menu.hxx> #include <vcl/layout.hxx> @@ -92,16 +95,13 @@ struct StrAllFiles : public rtl::StaticWithInit< OUString, StrAllFiles > { const OUString operator () () { const SolarMutexGuard guard; - std::unique_ptr< ResMgr > const resmgr( ResMgr::CreateResMgr( "fps_office" ) ); - OSL_ASSERT( resmgr.get() != nullptr ); - return ResId(STR_FILTERNAME_ALL, *resmgr.get()); + std::locale loc = Translate::Create("fps", Application::GetSettings().GetUILanguageTag()); + return Translate::get(STR_FILTERNAME_ALL, loc); } }; - // ExtBoxWithBtns_Impl - enum MENU_COMMAND { CMD_NONE = 0, @@ -250,7 +250,7 @@ MENU_COMMAND ExtBoxWithBtns_Impl::ShowPopupMenu( const Point & rPos, const long ScopedVclPtrInstance<PopupMenu> aPopup; #if ENABLE_EXTENSION_UPDATE - aPopup->InsertItem( CMD_UPDATE, DialogHelper::getResourceString( RID_CTX_ITEM_CHECK_UPDATE ) ); + aPopup->InsertItem( CMD_UPDATE, DpResId( RID_CTX_ITEM_CHECK_UPDATE ) ); #endif if ( ! GetEntryData( nPos )->m_bLocked ) @@ -258,18 +258,18 @@ MENU_COMMAND ExtBoxWithBtns_Impl::ShowPopupMenu( const Point & rPos, const long if ( GetEntryData( nPos )->m_bUser ) { if ( GetEntryData( nPos )->m_eState == REGISTERED ) - aPopup->InsertItem( CMD_DISABLE, DialogHelper::getResourceString( RID_CTX_ITEM_DISABLE ) ); + aPopup->InsertItem( CMD_DISABLE, DpResId( RID_CTX_ITEM_DISABLE ) ); else if ( GetEntryData( nPos )->m_eState != NOT_AVAILABLE ) - aPopup->InsertItem( CMD_ENABLE, DialogHelper::getResourceString( RID_CTX_ITEM_ENABLE ) ); + aPopup->InsertItem( CMD_ENABLE, DpResId( RID_CTX_ITEM_ENABLE ) ); } if (!officecfg::Office::ExtensionManager::ExtensionSecurity::DisableExtensionRemoval::get()) { - aPopup->InsertItem( CMD_REMOVE, DialogHelper::getResourceString( RID_CTX_ITEM_REMOVE ) ); + aPopup->InsertItem( CMD_REMOVE, DpResId( RID_CTX_ITEM_REMOVE ) ); } } if ( !GetEntryData( nPos )->m_sLicenseText.isEmpty() ) - aPopup->InsertItem( CMD_SHOW_LICENSE, DialogHelper::getResourceString( RID_STR_SHOW_LICENSE_CMD ) ); + aPopup->InsertItem( CMD_SHOW_LICENSE, DpResId( RID_STR_SHOW_LICENSE_CMD ) ); return (MENU_COMMAND) aPopup->Execute( this, rPos ); } @@ -352,25 +352,6 @@ DialogHelper::~DialogHelper() } -ResId DialogHelper::getResId( sal_uInt16 nId ) -{ - const SolarMutexGuard guard; - return ResId( nId, *DeploymentGuiResMgr::get() ); -} - - -OUString DialogHelper::getResourceString(sal_uInt16 id) -{ - const SolarMutexGuard guard; - OUString ret(ResId(id, *DeploymentGuiResMgr::get())); - if (ret.indexOf("%PRODUCTNAME" ) != -1) - { - ret = ret.replaceAll("%PRODUCTNAME", utl::ConfigManager::getProductName()); - } - return ret; -} - - bool DialogHelper::IsSharedPkgMgr( const uno::Reference< deployment::XPackage > &xPackage ) { return xPackage->getRepositoryName() == SHARED_PACKAGE_MANAGER; @@ -379,13 +360,13 @@ bool DialogHelper::IsSharedPkgMgr( const uno::Reference< deployment::XPackage > bool DialogHelper::continueOnSharedExtension( const uno::Reference< deployment::XPackage > &xPackage, vcl::Window *pParent, - const sal_uInt16 nResID, + const char* pResID, bool &bHadWarning ) { if ( !bHadWarning && IsSharedPkgMgr( xPackage ) ) { const SolarMutexGuard guard; - ScopedVclPtrInstance<MessageDialog> aInfoBox(pParent, getResId(nResID), + ScopedVclPtrInstance<MessageDialog> aInfoBox(pParent, DpResId(pResID), VclMessageType::Warning, VclButtonsType::OkCancel); bHadWarning = true; @@ -427,14 +408,14 @@ bool DialogHelper::installExtensionWarn( const OUString &rExtensionName ) const // Check if extension installation is disabled in the expert configurations if (officecfg::Office::ExtensionManager::ExtensionSecurity::DisableExtensionInstallation::get()) { - ScopedVclPtrInstance<MessageDialog> aWarn(m_pVCLWindow, getResId(RID_STR_WARNING_INSTALL_EXTENSION_DISABLED), + ScopedVclPtrInstance<MessageDialog> aWarn(m_pVCLWindow, DpResId(RID_STR_WARNING_INSTALL_EXTENSION_DISABLED), VclMessageType::Warning, VclButtonsType::Ok); aWarn->Execute(); return false; } - ScopedVclPtrInstance<MessageDialog> aInfo(m_pVCLWindow, getResId(RID_STR_WARNING_INSTALL_EXTENSION), + ScopedVclPtrInstance<MessageDialog> aInfo(m_pVCLWindow, DpResId(RID_STR_WARNING_INSTALL_EXTENSION), VclMessageType::Warning, VclButtonsType::OkCancel); OUString sText(aInfo->get_primary_text()); @@ -470,7 +451,7 @@ void DialogHelper::PostUserEvent( const Link<void*,void>& rLink, void* pCaller ) ExtMgrDialog::ExtMgrDialog(vcl::Window *pParent, TheExtensionManager *pManager, Dialog::InitFlag eFlag) : ModelessDialog(pParent, "ExtensionManagerDialog", "desktop/ui/extensionmanager.ui", eFlag) , DialogHelper(pManager->getContext(), static_cast<Dialog*>(this)) - , m_sAddPackages(getResourceString(RID_STR_ADD_PACKAGES)) + , m_sAddPackages(DpResId(RID_STR_ADD_PACKAGES)) , m_bHasProgress(false) , m_bProgressChanged(false) , m_bStartProgress(false) @@ -529,12 +510,12 @@ ExtMgrDialog::ExtMgrDialog(vcl::Window *pParent, TheExtensionManager *pManager, if (officecfg::Office::ExtensionManager::ExtensionSecurity::DisableExtensionInstallation::get()) { m_pAddBtn->Disable(); - m_pAddBtn->SetQuickHelpText(getResId(RID_STR_WARNING_INSTALL_EXTENSION_DISABLED)); + m_pAddBtn->SetQuickHelpText(DpResId(RID_STR_WARNING_INSTALL_EXTENSION_DISABLED)); } if (officecfg::Office::ExtensionManager::ExtensionSecurity::DisableExtensionRemoval::get()) { m_pRemoveBtn->Disable(); - m_pRemoveBtn->SetQuickHelpText(getResId(RID_STR_WARNING_REMOVE_EXTENSION_DISABLED)); + m_pRemoveBtn->SetQuickHelpText(DpResId(RID_STR_WARNING_REMOVE_EXTENSION_DISABLED)); } m_aIdle.SetPriority(TaskPriority::LOWEST); @@ -607,7 +588,7 @@ void ExtMgrDialog::checkEntries() bool ExtMgrDialog::removeExtensionWarn( const OUString &rExtensionName ) const { const SolarMutexGuard guard; - ScopedVclPtrInstance<MessageDialog> aInfo(const_cast<ExtMgrDialog*>(this), getResId(RID_STR_WARNING_REMOVE_EXTENSION), + ScopedVclPtrInstance<MessageDialog> aInfo(const_cast<ExtMgrDialog*>(this), DpResId(RID_STR_WARNING_REMOVE_EXTENSION), VclMessageType::Warning, VclButtonsType::OkCancel); OUString sText(aInfo->get_primary_text()); @@ -767,7 +748,7 @@ void ExtMgrDialog::enableRemoveButton( bool bEnable ) if (officecfg::Office::ExtensionManager::ExtensionSecurity::DisableExtensionRemoval::get()) { - m_pRemoveBtn->SetQuickHelpText(getResId(RID_STR_WARNING_REMOVE_EXTENSION_DISABLED)); + m_pRemoveBtn->SetQuickHelpText(DpResId(RID_STR_WARNING_REMOVE_EXTENSION_DISABLED)); } else { @@ -784,12 +765,12 @@ void ExtMgrDialog::enableButtontoEnable( bool bEnable ) { if (bEnable) { - m_pEnableBtn->SetText( DialogHelper::getResourceString( RID_CTX_ITEM_ENABLE ) ); + m_pEnableBtn->SetText( DpResId( RID_CTX_ITEM_ENABLE ) ); m_pEnableBtn->SetHelpId( HID_EXTENSION_MANAGER_LISTBOX_ENABLE ); } else { - m_pEnableBtn->SetText( DialogHelper::getResourceString( RID_CTX_ITEM_DISABLE ) ); + m_pEnableBtn->SetText( DpResId( RID_CTX_ITEM_DISABLE ) ); m_pEnableBtn->SetHelpId( HID_EXTENSION_MANAGER_LISTBOX_DISABLE ); } } @@ -840,7 +821,7 @@ IMPL_LINK( ExtMgrDialog, startProgress, void*, _bLockInterface, void ) m_pAddBtn->Enable( !bLockInterface && !officecfg::Office::ExtensionManager::ExtensionSecurity::DisableExtensionInstallation::get()); if (officecfg::Office::ExtensionManager::ExtensionSecurity::DisableExtensionInstallation::get()) { - m_pAddBtn->SetQuickHelpText(getResId(RID_STR_WARNING_INSTALL_EXTENSION_DISABLED)); + m_pAddBtn->SetQuickHelpText(DpResId(RID_STR_WARNING_INSTALL_EXTENSION_DISABLED)); } else { @@ -1066,7 +1047,7 @@ bool ExtMgrDialog::Close() UpdateRequiredDialog::UpdateRequiredDialog(vcl::Window *pParent, TheExtensionManager *pManager) : ModalDialog(pParent, "UpdateRequiredDialog", "desktop/ui/updaterequireddialog.ui") , DialogHelper(pManager->getContext(), static_cast<Dialog*>(this)) - , m_sCloseText(getResourceString(RID_STR_CLOSE_BTN)) + , m_sCloseText(DpResId(RID_STR_CLOSE_BTN)) , m_bHasProgress(false) , m_bProgressChanged(false) , m_bStartProgress(false) @@ -1338,8 +1319,8 @@ short UpdateRequiredDialog::Execute() if ( m_bHasLockedEntries ) { // Set other text, disable update btn, remove not shared entries from list; - m_pUpdateNeeded->SetText( DialogHelper::getResourceString( RID_STR_NO_ADMIN_PRIVILEGE ) ); - m_pCloseBtn->SetText( DialogHelper::getResourceString( RID_STR_EXIT_BTN ) ); + m_pUpdateNeeded->SetText( DpResId( RID_STR_NO_ADMIN_PRIVILEGE ) ); + m_pCloseBtn->SetText( DpResId( RID_STR_EXIT_BTN ) ); m_pUpdateBtn->Enable( false ); m_pExtensionBox->RemoveUnlocked(); Resize(); diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.hxx b/desktop/source/deployment/gui/dp_gui_dialog2.hxx index 5b9a8cc403e3..60a87d75b6e5 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.hxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.hxx @@ -83,12 +83,10 @@ public: virtual void prepareChecking() = 0; virtual void checkEntries() = 0; - static ResId getResId( sal_uInt16 nId ); - static OUString getResourceString( sal_uInt16 id ); static bool IsSharedPkgMgr( const css::uno::Reference< css::deployment::XPackage > &); static bool continueOnSharedExtension( const css::uno::Reference< css::deployment::XPackage > &, vcl::Window *pParent, - const sal_uInt16 nResID, + const char* pResID, bool &bHadWarning ); void setBusy( const bool bBusy ) { m_bIsBusy = bBusy; } diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx index 65b8053306ef..d6b620e1e69b 100644 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx @@ -69,7 +69,7 @@ #include "dp_gui_extensioncmdqueue.hxx" #include "dp_gui_dependencydialog.hxx" #include "dp_gui_dialog2.hxx" -#include "dp_gui_shared.hxx" +#include "dp_shared.hxx" #include "dp_gui_theextmgr.hxx" #include "dp_gui_updatedialog.hxx" #include "dp_gui_updateinstalldialog.hxx" @@ -405,7 +405,7 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const & } else if (request >>= verExc) { - sal_uInt32 id; + const char* id; switch (dp_misc::compareVersions( verExc.NewVersion, verExc.Deployed->getVersion() )) { @@ -425,26 +425,26 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const & { SolarMutexGuard guard; ScopedVclPtrInstance<MessageDialog> box(m_pDialogHelper? m_pDialogHelper->getWindow() : nullptr, - ResId(id, *DeploymentGuiResMgr::get()), VclMessageType::Warning, VclButtonsType::OkCancel); + DpResId(id), VclMessageType::Warning, VclButtonsType::OkCancel); OUString s; if (bEqualNames) { s = box->get_primary_text(); } - else if (id == RID_STR_WARNING_VERSION_EQUAL) + else if (!strcmp(id, RID_STR_WARNING_VERSION_EQUAL)) { //hypothetical: requires two instances of an extension with the same //version to have different display names. Probably the developer forgot //to change the version. - s = ResId(RID_STR_WARNINGBOX_VERSION_EQUAL_DIFFERENT_NAMES, *DeploymentGuiResMgr::get()); + s = DpResId(RID_STR_WARNINGBOX_VERSION_EQUAL_DIFFERENT_NAMES); } - else if (id == RID_STR_WARNING_VERSION_LESS) + else if (!strcmp(id, RID_STR_WARNING_VERSION_LESS)) { - s = ResId(RID_STR_WARNINGBOX_VERSION_LESS_DIFFERENT_NAMES, *DeploymentGuiResMgr::get()); + s = DpResId(RID_STR_WARNINGBOX_VERSION_LESS_DIFFERENT_NAMES); } - else if (id == RID_STR_WARNING_VERSION_GREATER) + else if (!strcmp(id, RID_STR_WARNING_VERSION_GREATER)) { - s = ResId(RID_STR_WARNINGBOX_VERSION_GREATER_DIFFERENT_NAMES, *DeploymentGuiResMgr::get()); + s = DpResId(RID_STR_WARNINGBOX_VERSION_GREATER_DIFFERENT_NAMES); } s = s.replaceAll("$NAME", verExc.NewDisplayName); s = s.replaceAll("$OLDNAME", verExc.Deployed->getDisplayName()); @@ -477,7 +477,7 @@ void ProgressCmdEnv::handle( uno::Reference< task::XInteractionRequest > const & else if (request >>= platExc) { SolarMutexGuard guard; - OUString sMsg(ResId(RID_STR_UNSUPPORTED_PLATFORM, *DeploymentGuiResMgr::get())); + OUString sMsg(DpResId(RID_STR_UNSUPPORTED_PLATFORM)); sMsg = sMsg.replaceAll("%Name", platExc.package->getDisplayName()); ScopedVclPtrInstance< MessageDialog > box(m_pDialogHelper? m_pDialogHelper->getWindow() : nullptr, sMsg); box->Execute(); @@ -569,12 +569,12 @@ ExtensionCmdQueue::Thread::Thread( DialogHelper *pDialogHelper, m_xContext( rContext ), m_pDialogHelper( pDialogHelper ), m_pManager( pManager ), - m_sEnablingPackages( DialogHelper::getResourceString( RID_STR_ENABLING_PACKAGES ) ), - m_sDisablingPackages( DialogHelper::getResourceString( RID_STR_DISABLING_PACKAGES ) ), - m_sAddingPackages( DialogHelper::getResourceString( RID_STR_ADDING_PACKAGES ) ), - m_sRemovingPackages( DialogHelper::getResourceString( RID_STR_REMOVING_PACKAGES ) ), - m_sDefaultCmd( DialogHelper::getResourceString( RID_STR_ADD_PACKAGES ) ), - m_sAcceptLicense( DialogHelper::getResourceString( RID_STR_ACCEPT_LICENSE ) ), + m_sEnablingPackages( DpResId( RID_STR_ENABLING_PACKAGES ) ), + m_sDisablingPackages( DpResId( RID_STR_DISABLING_PACKAGES ) ), + m_sAddingPackages( DpResId( RID_STR_ADDING_PACKAGES ) ), + m_sRemovingPackages( DpResId( RID_STR_REMOVING_PACKAGES ) ), + m_sDefaultCmd( DpResId( RID_STR_ADD_PACKAGES ) ), + m_sAcceptLicense( DpResId( RID_STR_ACCEPT_LICENSE ) ), m_eInput( NONE ), m_bStopped( false ), m_bWorking( false ) diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx index 38db5652b192..49f27bb49669 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx @@ -17,8 +17,9 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <svtools/controldims.hrc> +#include <svtools/controldims.hxx> +#include "dp_shared.hxx" #include "dp_gui.h" #include "dp_gui_extlistbox.hxx" #include "dp_gui_theextmgr.hxx" @@ -96,7 +97,7 @@ Entry_Impl::Entry_Impl( const uno::Reference< deployment::XPackage > &xPackage, m_aIcon = Image( xGraphic ); if ( eState == AMBIGUOUS ) - m_sErrorText = DialogHelper::getResourceString( RID_STR_ERROR_UNKNOWN_STATUS ); + m_sErrorText = DpResId( RID_STR_ERROR_UNKNOWN_STATUS ); else if ( eState == NOT_REGISTERED ) checkDependencies(); } @@ -138,7 +139,7 @@ void Entry_Impl::checkDependencies() deployment::DependencyException depExc; if ( e.Cause >>= depExc ) { - OUString aMissingDep( DialogHelper::getResourceString( RID_STR_ERROR_MISSING_DEPENDENCIES ) ); + OUString aMissingDep( DpResId( RID_STR_ERROR_MISSING_DEPENDENCIES ) ); for ( sal_Int32 i = 0; i < depExc.UnsatisfiedDependencies.getLength(); ++i ) { aMissingDep += "\n"; @@ -951,7 +952,7 @@ void ExtensionBox_Impl::addEntry( const uno::Reference< deployment::XPackage > & pEntry->m_bMissingLic = bLicenseMissing; if ( bLicenseMissing ) - pEntry->m_sErrorText = DialogHelper::getResourceString( RID_STR_ERROR_MISSING_LICENSE ); + pEntry->m_sErrorText = DpResId( RID_STR_ERROR_MISSING_LICENSE ); //access to m_nActive must be guarded if ( !m_bInCheckMode && m_bHasActive && ( m_nActive >= nPos ) ) @@ -982,7 +983,7 @@ void ExtensionBox_Impl::updateEntry( const uno::Reference< deployment::XPackage (*iIndex)->m_bMissingLic = false; if ( eState == AMBIGUOUS ) - (*iIndex)->m_sErrorText = DialogHelper::getResourceString( RID_STR_ERROR_UNKNOWN_STATUS ); + (*iIndex)->m_sErrorText = DpResId( RID_STR_ERROR_UNKNOWN_STATUS ); else if ( ! (*iIndex)->m_bMissingLic ) (*iIndex)->m_sErrorText.clear(); diff --git a/desktop/source/deployment/gui/dp_gui_service.cxx b/desktop/source/deployment/gui/dp_gui_service.cxx index 1673d46ef63f..bf6061634d17 100644 --- a/desktop/source/deployment/gui/dp_gui_service.cxx +++ b/desktop/source/deployment/gui/dp_gui_service.cxx @@ -19,7 +19,7 @@ #include <memory> -#include "dp_gui_shared.hxx" +#include "dp_shared.hxx" #include "dp_gui.h" #include "dp_gui_theextmgr.hxx" #include <cppuhelper/implbase.hxx> @@ -175,9 +175,9 @@ ServiceImpl::ServiceImpl( Sequence<Any> const& args, } catch ( const css::lang::IllegalArgumentException & ) { } - ResHookProc pProc = ResMgr::GetReadStringHook(); + ResHookProc pProc = Translate::GetReadStringHook(); if ( !pProc ) - ResMgr::SetReadStringHook( ReplaceProductNameHookProc ); + Translate::SetReadStringHook(ReplaceProductNameHookProc); } // XAsynchronousExecutableDialog diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx index 31ac8641f60b..16bcc0b5e687 100644 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updatedialog.cxx @@ -82,11 +82,10 @@ #include <salhelper/thread.hxx> #include <svtools/svlbitm.hxx> #include <svtools/treelistbox.hxx> -#include <svtools/controldims.hrc> +#include <svtools/controldims.hxx> #include <svx/checklbx.hxx> #include <tools/gen.hxx> #include <tools/link.hxx> -#include <tools/resid.hxx> #include <tools/solar.h> #include <unotools/configmgr.hxx> #include <vcl/button.hxx> @@ -106,11 +105,11 @@ #include "dp_update.hxx" #include "dp_gui.h" -#include "dp_gui.hrc" +#include "strings.hrc" #include "bitmaps.hlst" #include "dp_gui_updatedata.hxx" #include "dp_gui_updatedialog.hxx" -#include "dp_gui_shared.hxx" +#include "dp_shared.hxx" class KeyEvent; class MouseEvent; @@ -479,17 +478,17 @@ UpdateDialog::UpdateDialog( std::vector< dp_gui::UpdateData > * updateData): ModalDialog(parent, "UpdateDialog", "desktop/ui/updatedialog.ui"), m_context(context), - m_none(DpGuiResId(RID_DLG_UPDATE_NONE)), - m_noInstallable(DpGuiResId(RID_DLG_UPDATE_NOINSTALLABLE)), - m_failure(DpGuiResId(RID_DLG_UPDATE_FAILURE)), - m_unknownError(DpGuiResId(RID_DLG_UPDATE_UNKNOWNERROR)), - m_noDescription(DpGuiResId(RID_DLG_UPDATE_NODESCRIPTION)), - m_noInstall(DpGuiResId(RID_DLG_UPDATE_NOINSTALL)), - m_noDependency(DpGuiResId(RID_DLG_UPDATE_NODEPENDENCY)), - m_noDependencyCurVer(DpGuiResId(RID_DLG_UPDATE_NODEPENDENCY_CUR_VER)), - m_browserbased(DpGuiResId(RID_DLG_UPDATE_BROWSERBASED)), - m_version(DpGuiResId(RID_DLG_UPDATE_VERSION)), - m_ignoredUpdate(DpGuiResId(RID_DLG_UPDATE_IGNORED_UPDATE)), + m_none(DpResId(RID_DLG_UPDATE_NONE)), + m_noInstallable(DpResId(RID_DLG_UPDATE_NOINSTALLABLE)), + m_failure(DpResId(RID_DLG_UPDATE_FAILURE)), + m_unknownError(DpResId(RID_DLG_UPDATE_UNKNOWNERROR)), + m_noDescription(DpResId(RID_DLG_UPDATE_NODESCRIPTION)), + m_noInstall(DpResId(RID_DLG_UPDATE_NOINSTALL)), + m_noDependency(DpResId(RID_DLG_UPDATE_NODEPENDENCY)), + m_noDependencyCurVer(DpResId(RID_DLG_UPDATE_NODEPENDENCY_CUR_VER)), + m_browserbased(DpResId(RID_DLG_UPDATE_BROWSERBASED)), + m_version(DpResId(RID_DLG_UPDATE_VERSION)), + m_ignoredUpdate(DpResId(RID_DLG_UPDATE_IGNORED_UPDATE)), m_updateData(*updateData), m_thread( new UpdateDialog::Thread( @@ -594,9 +593,9 @@ short UpdateDialog::Execute() { UpdateDialog::CheckListBox::CheckListBox( vcl::Window* pParent, UpdateDialog & dialog): SvxCheckListBox( pParent, WinBits(WB_BORDER) ), - m_ignoreUpdate( DpGuiResId( RID_DLG_UPDATE_IGNORE ) ), - m_ignoreAllUpdates( DpGuiResId( RID_DLG_UPDATE_IGNORE_ALL ) ), - m_enableUpdate( DpGuiResId( RID_DLG_UPDATE_ENABLE ) ), + m_ignoreUpdate( DpResId( RID_DLG_UPDATE_IGNORE ) ), + m_ignoreAllUpdates( DpResId( RID_DLG_UPDATE_IGNORE_ALL ) ), + m_enableUpdate( DpResId( RID_DLG_UPDATE_ENABLE ) ), m_dialog(dialog) { SetNormalStaticImage(Image(BitmapEx(RID_DLG_UPDATE_NORMALALERT))); diff --git a/desktop/source/deployment/gui/dp_gui_updatedialog.src b/desktop/source/deployment/gui/dp_gui_updatedialog.src deleted file mode 100644 index 7100eb4cfff2..000000000000 --- a/desktop/source/deployment/gui/dp_gui_updatedialog.src +++ /dev/null @@ -1,80 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include <svtools/controldims.hrc> - -#include "dp_gui.hrc" - -String RID_DLG_UPDATE_NONE { - Text[en-US] = "No new updates are available."; -}; - -String RID_DLG_UPDATE_NOINSTALLABLE { - Text[en-US] = "No installable updates are available. To see ignored or disabled updates, mark the check box 'Show all updates'."; -}; - -String RID_DLG_UPDATE_FAILURE { - Text[en-US] = "An error occurred:"; -}; - -String RID_DLG_UPDATE_UNKNOWNERROR { - Text[en-US] = "Unknown error."; -}; - -String RID_DLG_UPDATE_NODESCRIPTION { - Text[en-US] = "No more details are available for this update."; -}; - -String RID_DLG_UPDATE_NOINSTALL { - Text[en-US] = "The extension cannot be updated because:"; -}; - -String RID_DLG_UPDATE_NODEPENDENCY { - Text[en-US] = "Required %PRODUCTNAME version doesn't match:"; -}; - -String RID_DLG_UPDATE_NODEPENDENCY_CUR_VER { - Text[en-US] = "You have %PRODUCTNAME %VERSION"; -}; - -String RID_DLG_UPDATE_BROWSERBASED { - Text[en-US] = "browser based update"; -}; - -String RID_DLG_UPDATE_VERSION { - Text[en-US] = "Version"; -}; - -String RID_DLG_UPDATE_IGNORE { - Text[en-US] = "Ignore this Update"; -}; - -String RID_DLG_UPDATE_IGNORE_ALL { - Text[en-US] = "Ignore all Updates"; -}; - -String RID_DLG_UPDATE_ENABLE { - Text[en-US] = "Enable Updates"; -}; - -String RID_DLG_UPDATE_IGNORED_UPDATE { - Text[en-US] = "This update will be ignored.\n"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx index e112cd38d389..c433384da5e5 100644 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx +++ b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.cxx @@ -24,7 +24,6 @@ #include <osl/file.hxx> #include <osl/conditn.hxx> #include <cppuhelper/exc_hlp.hxx> -#include <tools/resid.hxx> #include <vcl/dialog.hxx> #include <vcl/msgbox.hxx> #include <vcl/svapp.hxx> @@ -54,9 +53,9 @@ #include <com/sun/star/task/XInteractionApprove.hpp> #include "dp_descriptioninfoset.hxx" -#include "dp_gui.hrc" +#include "strings.hrc" #include "dp_gui_updateinstalldialog.hxx" -#include "dp_gui_shared.hxx" +#include "dp_shared.hxx" #include "dp_ucb.h" #include "dp_misc.h" #include "dp_version.hxx" @@ -204,14 +203,14 @@ UpdateInstallDialog::UpdateInstallDialog( m_thread(new Thread(xCtx, *this, aVecUpdateData)), m_bError(false), m_bNoEntry(true), - m_sInstalling(DpGuiResId(RID_DLG_UPDATE_INSTALL_INSTALLING)), - m_sFinished(DpGuiResId(RID_DLG_UPDATE_INSTALL_FINISHED)), - m_sNoErrors(DpGuiResId(RID_DLG_UPDATE_INSTALL_NO_ERRORS)), - m_sErrorDownload(DpGuiResId(RID_DLG_UPDATE_INSTALL_ERROR_DOWNLOAD)), - m_sErrorInstallation(DpGuiResId(RID_DLG_UPDATE_INSTALL_ERROR_INSTALLATION)), - m_sErrorLicenseDeclined(DpGuiResId(RID_DLG_UPDATE_INSTALL_ERROR_LIC_DECLINED)), - m_sNoInstall(DpGuiResId(RID_DLG_UPDATE_INSTALL_EXTENSION_NOINSTALL)), - m_sThisErrorOccurred(DpGuiResId(RID_DLG_UPDATE_INSTALL_THIS_ERROR_OCCURRED)) + m_sInstalling(DpResId(RID_DLG_UPDATE_INSTALL_INSTALLING)), + m_sFinished(DpResId(RID_DLG_UPDATE_INSTALL_FINISHED)), + m_sNoErrors(DpResId(RID_DLG_UPDATE_INSTALL_NO_ERRORS)), + m_sErrorDownload(DpResId(RID_DLG_UPDATE_INSTALL_ERROR_DOWNLOAD)), + m_sErrorInstallation(DpResId(RID_DLG_UPDATE_INSTALL_ERROR_INSTALLATION)), + m_sErrorLicenseDeclined(DpResId(RID_DLG_UPDATE_INSTALL_ERROR_LIC_DECLINED)), + m_sNoInstall(DpResId(RID_DLG_UPDATE_INSTALL_EXTENSION_NOINSTALL)), + m_sThisErrorOccurred(DpResId(RID_DLG_UPDATE_INSTALL_THIS_ERROR_OCCURRED)) { get(m_pFt_action, "DOWNLOADING"); get(m_pStatusbar, "STATUSBAR"); diff --git a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src b/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src deleted file mode 100644 index e8d52761777d..000000000000 --- a/desktop/source/deployment/gui/dp_gui_updateinstalldialog.src +++ /dev/null @@ -1,54 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "dp_gui.hrc" - -String RID_DLG_UPDATE_INSTALL_INSTALLING { - Text[en-US] = "Installing extensions..."; -}; - -String RID_DLG_UPDATE_INSTALL_FINISHED { - Text[en-US] = "Installation finished"; -}; - -String RID_DLG_UPDATE_INSTALL_NO_ERRORS { - Text[en-US] = "No errors."; -}; - -String RID_DLG_UPDATE_INSTALL_ERROR_DOWNLOAD { - Text[en-US] = "Error while downloading extension %NAME. "; -}; - -String RID_DLG_UPDATE_INSTALL_THIS_ERROR_OCCURRED { - Text[en-US] = "The error message is: "; -}; - -String RID_DLG_UPDATE_INSTALL_ERROR_INSTALLATION { - Text[en-US] = "Error while installing extension %NAME. "; -}; - -String RID_DLG_UPDATE_INSTALL_ERROR_LIC_DECLINED { - Text[en-US] = "The license agreement for extension %NAME was refused. "; -}; - -String RID_DLG_UPDATE_INSTALL_EXTENSION_NOINSTALL{ - Text[en-US] = "The extension will not be installed."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/dp_gui_versionboxes.src b/desktop/source/deployment/gui/dp_gui_versionboxes.src deleted file mode 100644 index 7e18fa6ae53d..000000000000 --- a/desktop/source/deployment/gui/dp_gui_versionboxes.src +++ /dev/null @@ -1,67 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "dp_gui.hrc" - -String RID_STR_WARNING_VERSION_LESS -{ - Text [en-US] = "You are about to install version $NEW of the extension '$NAME'.\n" - "The newer version $DEPLOYED is already installed.\n" - "Click 'OK' to replace the installed extension.\n" - "Click 'Cancel' to stop the installation."; -}; - -String RID_STR_WARNINGBOX_VERSION_LESS_DIFFERENT_NAMES { - Text [en-US] = "You are about to install version $NEW of the extension '$NAME'.\n" - "The newer version $DEPLOYED, named '$OLDNAME', is already installed.\n" - "Click 'OK' to replace the installed extension.\n" - "Click 'Cancel' to stop the installation."; -}; - -String RID_STR_WARNING_VERSION_EQUAL -{ - Text [en-US] = "You are about to install version $NEW of the extension '$NAME'.\n" - "That version is already installed.\n" - "Click 'OK' to replace the installed extension.\n" - "Click 'Cancel' to stop the installation."; -}; - -String RID_STR_WARNINGBOX_VERSION_EQUAL_DIFFERENT_NAMES { - Text [en-US] = "You are about to install version $NEW of the extension '$NAME'.\n" - "That version, named '$OLDNAME', is already installed.\n" - "Click 'OK' to replace the installed extension.\n" - "Click 'Cancel' to stop the installation."; -}; - -String RID_STR_WARNING_VERSION_GREATER -{ - Text [en-US] = "You are about to install version $NEW of the extension '$NAME'.\n" - "The older version $DEPLOYED is already installed.\n" - "Click 'OK' to replace the installed extension.\n" - "Click 'Cancel' to stop the installation."; -}; - -String RID_STR_WARNINGBOX_VERSION_GREATER_DIFFERENT_NAMES -{ - Text [en-US] = "You are about to install version $NEW of the extension '$NAME'.\n" - "The older version $DEPLOYED, named '$OLDNAME', is already installed.\n" - "Click 'OK' to replace the installed extension.\n" - "Click 'Cancel' to stop the installation."; -}; -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/gui/license_dialog.cxx b/desktop/source/deployment/gui/license_dialog.cxx index 8d97f786fd60..f3e741324aff 100644 --- a/desktop/source/deployment/gui/license_dialog.cxx +++ b/desktop/source/deployment/gui/license_dialog.cxx @@ -34,9 +34,9 @@ #include <vcl/threadex.hxx> #include <vcl/builderfactory.hxx> -#include "dp_gui_shared.hxx" +#include "dp_shared.hxx" #include "license_dialog.hxx" -#include "dp_gui.hrc" +#include "strings.hrc" #include <functional> diff --git a/desktop/source/deployment/inc/dp_resource.h b/desktop/source/deployment/inc/dp_resource.h index c6ecfcdee645..b1aacd579de9 100644 --- a/desktop/source/deployment/inc/dp_resource.h +++ b/desktop/source/deployment/inc/dp_resource.h @@ -20,28 +20,13 @@ #ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_RESOURCE_H #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_INC_DP_RESOURCE_H -#include <tools/resid.hxx> #include <i18nlangtag/languagetag.hxx> #include "dp_misc.h" #include "dp_misc_api.hxx" namespace dp_misc { - -ResId getResId( sal_uInt16 id ); - - -DESKTOP_DEPLOYMENTMISC_DLLPUBLIC OUString getResourceString( sal_uInt16 id ); - -template <typename Unique, sal_uInt16 id> -struct StaticResourceString : - public ::rtl::StaticWithInit< OUString, Unique > { - const OUString operator () () { return getResourceString(id); } -}; - - -DESKTOP_DEPLOYMENTMISC_DLLPUBLIC -const LanguageTag & getOfficeLanguageTag(); +DESKTOP_DEPLOYMENTMISC_DLLPUBLIC const LanguageTag & getOfficeLanguageTag(); } diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx index 34f862c8f6f6..e770bad31ef9 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.cxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx @@ -1229,13 +1229,13 @@ sal_Bool ExtensionManager::synchronize( try { ::osl::MutexGuard guard(getMutex()); - OUString sSynchronizingShared(StrSyncRepository::get()); + OUString sSynchronizingShared(StrSyncRepository()); sSynchronizingShared = sSynchronizingShared.replaceAll("%NAME", "shared"); dp_misc::ProgressLevel progressShared(xCmdEnv, sSynchronizingShared); bool bModified = getSharedRepository()->synchronize(xAbortChannel, xCmdEnv); progressShared.update("\n\n"); - OUString sSynchronizingBundled(StrSyncRepository::get()); + OUString sSynchronizingBundled(StrSyncRepository()); sSynchronizingBundled = sSynchronizingBundled.replaceAll("%NAME", "bundled"); dp_misc::ProgressLevel progressBundled(xCmdEnv, sSynchronizingBundled); bModified |= (bool)getBundledRepository()->synchronize(xAbortChannel, xCmdEnv); @@ -1314,12 +1314,12 @@ void ExtensionManager::checkInstall( { OSL_ASSERT( !approve && !abort ); throw css::deployment::DeploymentException( - dp_misc::getResourceString(RID_STR_ERROR_WHILE_ADDING) + displayName, + DpResId(RID_STR_ERROR_WHILE_ADDING) + displayName, static_cast<OWeakObject *>(this), request ); } if (abort || !approve) throw ucb::CommandFailedException( - dp_misc::getResourceString(RID_STR_ERROR_WHILE_ADDING) + displayName, + DpResId(RID_STR_ERROR_WHILE_ADDING) + displayName, static_cast<OWeakObject *>(this), request ); } @@ -1336,7 +1336,7 @@ void ExtensionManager::checkUpdate( // package already deployed, interact --force: uno::Any request( (css::deployment::VersionException( - dp_misc::getResourceString( + DpResId( RID_STR_PACKAGE_ALREADY_ADDED ) + newDisplayName, static_cast<OWeakObject *>(this), newVersion, newDisplayName, oldExtension ) ) ); @@ -1346,13 +1346,13 @@ void ExtensionManager::checkUpdate( xCmdEnv, &replace, &abort )) { OSL_ASSERT( !replace && !abort ); throw css::deployment::DeploymentException( - dp_misc::getResourceString( + DpResId( RID_STR_ERROR_WHILE_ADDING) + newDisplayName, static_cast<OWeakObject *>(this), request ); } if (abort || !replace) throw ucb::CommandFailedException( - dp_misc::getResourceString( + DpResId( RID_STR_PACKAGE_ALREADY_ADDED) + newDisplayName, static_cast<OWeakObject *>(this), request ); } diff --git a/desktop/source/deployment/manager/dp_extensionmanager.hxx b/desktop/source/deployment/manager/dp_extensionmanager.hxx index fd060446a9a2..a31172e55b83 100644 --- a/desktop/source/deployment/manager/dp_extensionmanager.hxx +++ b/desktop/source/deployment/manager/dp_extensionmanager.hxx @@ -20,8 +20,9 @@ #ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_MANAGER_DP_EXTENSIONMANAGER_HXX #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_MANAGER_DP_EXTENSIONMANAGER_HXX -#include "dp_manager.hrc" +#include "strings.hrc" #include "dp_misc.h" +#include "dp_shared.hxx" #include "dp_interact.h" #include "dp_activepackages.hxx" #include <rtl/ref.hxx> @@ -137,8 +138,7 @@ public: private: - struct StrSyncRepository : public ::dp_misc::StaticResourceString< - StrSyncRepository, RID_STR_SYNCHRONIZING_REPOSITORY> {}; + static OUString StrSyncRepository() { return DpResId(RID_STR_SYNCHRONIZING_REPOSITORY); } css::uno::Reference< css::uno::XComponentContext> m_xContext; css::uno::Reference<css::deployment::XPackageManagerFactory> m_xPackageManagerFactory; diff --git a/desktop/source/deployment/manager/dp_manager.cxx b/desktop/source/deployment/manager/dp_manager.cxx index a0eb96fdcc02..8244d4f88ee3 100644 --- a/desktop/source/deployment/manager/dp_manager.cxx +++ b/desktop/source/deployment/manager/dp_manager.cxx @@ -20,6 +20,7 @@ #include <config_features.h> #include "dp_registry.hxx" +#include "dp_shared.hxx" #include "dp_ucb.h" #include "dp_resource.h" #include "dp_platform.hxx" @@ -738,7 +739,7 @@ Reference<deployment::XPackage> PackageManagerImpl::addPackage( Reference<deployment::XPackage> xPackage; // copy file: progressUpdate( - getResourceString(RID_STR_COPYING_PACKAGE) + title, xCmdEnv ); + DpResId(RID_STR_COPYING_PACKAGE) + title, xCmdEnv ); if (m_activePackages.isEmpty()) { ::ucbhelper::Content docFolderContent; @@ -829,7 +830,7 @@ Reference<deployment::XPackage> PackageManagerImpl::addPackage( Any exc( ::cppu::getCaughtException() ); logIntern( exc ); throw deployment::DeploymentException( - getResourceString(RID_STR_ERROR_WHILE_ADDING) + url, + DpResId(RID_STR_ERROR_WHILE_ADDING) + url, static_cast<OWeakObject *>(this), exc ); } } @@ -928,7 +929,7 @@ void PackageManagerImpl::removePackage( Any exc( ::cppu::getCaughtException() ); logIntern( exc ); throw deployment::DeploymentException( - getResourceString(RID_STR_ERROR_WHILE_REMOVING) + id, + DpResId(RID_STR_ERROR_WHILE_REMOVING) + id, static_cast<OWeakObject *>(this), exc ); } } @@ -962,7 +963,7 @@ Reference<deployment::XPackage> PackageManagerImpl::getDeployedPackage_( return getDeployedPackage_( id, val, xCmdEnv ); } throw lang::IllegalArgumentException( - getResourceString(RID_STR_NO_SUCH_PACKAGE) + id, + DpResId(RID_STR_NO_SUCH_PACKAGE) + id, static_cast<OWeakObject *>(this), static_cast<sal_Int16>(-1) ); } @@ -980,7 +981,7 @@ Reference<deployment::XPackage> PackageManagerImpl::getDeployedPackage_( auto const iter = params.find(OString("platform")); if (iter != params.end() && !platform_fits(iter->second.m_sValue)) throw lang::IllegalArgumentException( - getResourceString(RID_STR_NO_SUCH_PACKAGE) + id, + DpResId(RID_STR_NO_SUCH_PACKAGE) + id, static_cast<OWeakObject *>(this), static_cast<sal_Int16>(-1) ); } diff --git a/desktop/source/deployment/manager/dp_manager.h b/desktop/source/deployment/manager/dp_manager.h index c10122454ea3..4e584a6e1d14 100644 --- a/desktop/source/deployment/manager/dp_manager.h +++ b/desktop/source/deployment/manager/dp_manager.h @@ -20,7 +20,7 @@ #ifndef INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_MANAGER_DP_MANAGER_H #define INCLUDED_DESKTOP_SOURCE_DEPLOYMENT_MANAGER_DP_MANAGER_H -#include "dp_manager.hrc" +#include "strings.hrc" #include "dp_misc.h" #include "dp_interact.h" #include "dp_activepackages.hxx" diff --git a/desktop/source/deployment/manager/dp_manager.hrc b/desktop/source/deployment/manager/dp_manager.hrc deleted file mode 100644 index ef0945b483b6..000000000000 --- a/desktop/source/deployment/manager/dp_manager.hrc +++ /dev/null @@ -1,33 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_DP_MANAGER_HRC -#define INCLUDED_DP_MANAGER_HRC - -#include "deployment.hrc" - -#define RID_STR_ERROR_WHILE_ADDING (RID_DEPLOYMENT_MANAGER_START+0) -#define RID_STR_ERROR_WHILE_REMOVING (RID_DEPLOYMENT_MANAGER_START+1) -#define RID_STR_PACKAGE_ALREADY_ADDED (RID_DEPLOYMENT_MANAGER_START+2) -#define RID_STR_COPYING_PACKAGE (RID_DEPLOYMENT_MANAGER_START+3) -#define RID_STR_NO_SUCH_PACKAGE (RID_DEPLOYMENT_MANAGER_START+4) -#define RID_STR_SYNCHRONIZING_REPOSITORY (RID_DEPLOYMENT_MANAGER_START+5) -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/manager/dp_manager.src b/desktop/source/deployment/manager/dp_manager.src deleted file mode 100644 index e01a160d26dd..000000000000 --- a/desktop/source/deployment/manager/dp_manager.src +++ /dev/null @@ -1,52 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "dp_manager.hrc" - -String RID_STR_COPYING_PACKAGE -{ - Text [ en-US ] = "Copying: "; -}; - -String RID_STR_ERROR_WHILE_ADDING -{ - Text [ en-US ] = "Error while adding: "; -}; - -String RID_STR_ERROR_WHILE_REMOVING -{ - Text [ en-US ] = "Error while removing: "; -}; - -String RID_STR_PACKAGE_ALREADY_ADDED -{ - Text [ en-US ] = "Extension has already been added: "; -}; - -String RID_STR_NO_SUCH_PACKAGE -{ - Text [ en-US ] = "There is no such extension deployed: "; -}; - -String RID_STR_SYNCHRONIZING_REPOSITORY -{ - Text [ en-US ] = "Synchronizing repository for %NAME extensions"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/misc/dp_dependencies.cxx b/desktop/source/deployment/misc/dp_dependencies.cxx index 6112ad114593..1b858319f894 100644 --- a/desktop/source/deployment/misc/dp_dependencies.cxx +++ b/desktop/source/deployment/misc/dp_dependencies.cxx @@ -30,11 +30,11 @@ #include <rtl/ustring.h> #include <rtl/ustring.hxx> #include <sal/types.h> -#include <tools/resid.hxx> #include <unotools/configmgr.hxx> -#include "deployment.hrc" +#include "strings.hrc" #include "dp_resource.h" +#include "dp_shared.hxx" #include "dp_dependencies.hxx" #include "dp_descriptioninfoset.hxx" @@ -85,7 +85,7 @@ OUString produceErrorText( { return reason.replaceFirst("%VERSION", (version.isEmpty() - ? dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_UNKNOWN) + ? DpResId(RID_DEPLOYMENT_DEPENDENCIES_UNKNOWN) : version)); } @@ -156,27 +156,27 @@ OUString getErrorText( if ( dependency->getNamespaceURI() == namespaceOpenOfficeOrg && dependency->getTagName() == minimalVersionOpenOfficeOrg ) { return produceErrorText( - dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_OOO_MIN), + DpResId(RID_DEPLOYMENT_DEPENDENCIES_OOO_MIN), dependency->getAttribute("value")); } else if (dependency->getNamespaceURI() == namespaceOpenOfficeOrg && dependency->getTagName() == maximalVersionOpenOfficeOrg ) { return produceErrorText( - dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_OOO_MAX), + DpResId(RID_DEPLOYMENT_DEPENDENCIES_OOO_MAX), dependency->getAttribute("value")); } else if (dependency->getNamespaceURI() == namespaceLibreOffice && dependency->getTagName() == minimalVersionLibreOffice ) { return produceErrorText( - dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_LO_MIN), + DpResId(RID_DEPLOYMENT_DEPENDENCIES_LO_MIN), dependency->getAttribute("value")); } else if (dependency->hasAttributeNS(namespaceOpenOfficeOrg, minimalVersionOpenOfficeOrg)) { return produceErrorText( - dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_OOO_MIN), + DpResId(RID_DEPLOYMENT_DEPENDENCIES_OOO_MIN), dependency->getAttributeNS(namespaceOpenOfficeOrg, minimalVersionOpenOfficeOrg)); } else { - return dp_misc::getResId(RID_DEPLOYMENT_DEPENDENCIES_UNKNOWN); + return DpResId(RID_DEPLOYMENT_DEPENDENCIES_UNKNOWN); } } diff --git a/desktop/source/deployment/misc/dp_misc.src b/desktop/source/deployment/misc/dp_misc.src deleted file mode 100644 index 498e042009dd..000000000000 --- a/desktop/source/deployment/misc/dp_misc.src +++ /dev/null @@ -1,38 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "deployment.hrc" - -String RID_DEPLOYMENT_DEPENDENCIES_UNKNOWN { - Text[en-US] = "Unknown"; -}; - -String RID_DEPLOYMENT_DEPENDENCIES_OOO_MIN { - Text[en-US] = "Extension requires at least OpenOffice.org reference version %VERSION"; -}; - -String RID_DEPLOYMENT_DEPENDENCIES_OOO_MAX { - Text[en-US] = "Extension does not support OpenOffice.org reference versions greater than %VERSION"; -}; - -String RID_DEPLOYMENT_DEPENDENCIES_LO_MIN { - Text[en-US] = "Extension requires at least %PRODUCTNAME version %VERSION"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/misc/dp_resource.cxx b/desktop/source/deployment/misc/dp_resource.cxx index b7f3739c85a2..2d37cd6685b5 100644 --- a/desktop/source/deployment/misc/dp_resource.cxx +++ b/desktop/source/deployment/misc/dp_resource.cxx @@ -46,32 +46,8 @@ struct OfficeLocale : } }; -struct DeploymentResMgr : public rtl::StaticWithInit< - ResMgr *, DeploymentResMgr> { - ResMgr * operator () () { - return ResMgr::CreateResMgr( "deployment", OfficeLocale::get() ); - } -}; - -class theResourceMutex : public rtl::Static<osl::Mutex, theResourceMutex> {}; - } // anon namespace - -ResId getResId( sal_uInt16 id ) -{ - const osl::MutexGuard guard( theResourceMutex::get() ); - return ResId( id, *DeploymentResMgr::get() ); -} - - -OUString getResourceString( sal_uInt16 id ) -{ - const osl::MutexGuard guard(theResourceMutex::get()); - OUString ret(ResId(id, *DeploymentResMgr::get())); - return ret.replaceAll("%PRODUCTNAME", utl::ConfigManager::getProductName()); -} - const LanguageTag & getOfficeLanguageTag() { return OfficeLocale::get(); diff --git a/desktop/source/deployment/misc/dp_ucb.cxx b/desktop/source/deployment/misc/dp_ucb.cxx index 2028d18c2192..d74bfc5e3f3d 100644 --- a/desktop/source/deployment/misc/dp_ucb.cxx +++ b/desktop/source/deployment/misc/dp_ucb.cxx @@ -18,7 +18,7 @@ */ -#include "deployment.hrc" +#include "strings.hrc" #include "dp_misc.h" #include "dp_ucb.h" #include <rtl/uri.hxx> diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx index 60a2686ca99a..24949b8e9586 100644 --- a/desktop/source/deployment/registry/component/dp_component.cxx +++ b/desktop/source/deployment/registry/component/dp_component.cxx @@ -18,7 +18,8 @@ */ -#include "dp_component.hrc" +#include "strings.hrc" +#include "dp_shared.hxx" #include "dp_backend.h" #include "dp_platform.hxx" #include "dp_services.hxx" @@ -495,33 +496,33 @@ BackendImpl::BackendImpl( "application/vnd.sun.star.uno-component;type=native;platform=" + getPlatformString(), "*" SAL_DLLEXTENSION, - getResourceString(RID_STR_DYN_COMPONENT) + DpResId(RID_STR_DYN_COMPONENT) ) ), m_xJavaComponentTypeInfo( new Package::TypeInfo( "application/vnd.sun.star.uno-component;type=Java", "*.jar", - getResourceString(RID_STR_JAVA_COMPONENT) + DpResId(RID_STR_JAVA_COMPONENT) ) ), m_xPythonComponentTypeInfo( new Package::TypeInfo( "application/vnd.sun.star.uno-component;type=Python", "*.py", - getResourceString( + DpResId( RID_STR_PYTHON_COMPONENT) ) ), m_xComponentsTypeInfo( new Package::TypeInfo( "application/vnd.sun.star.uno-components", "*.components", - getResourceString(RID_STR_COMPONENTS) + DpResId(RID_STR_COMPONENTS) ) ), m_xRDBTypelibTypeInfo( new Package::TypeInfo( "application/vnd.sun.star.uno-typelibrary;type=RDB", "*.rdb", - getResourceString(RID_STR_RDB_TYPELIB) + DpResId(RID_STR_RDB_TYPELIB) ) ), m_xJavaTypelibTypeInfo( new Package::TypeInfo( "application/vnd.sun.star.uno-typelibrary;type=Java", "*.jar", - getResourceString(RID_STR_JAVA_TYPELIB) + DpResId(RID_STR_JAVA_TYPELIB) ) ), m_typeInfos( 6 ) { @@ -629,7 +630,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( } if (mediaType.isEmpty()) throw lang::IllegalArgumentException( - StrCannotDetectMediaType::get() + url, + StrCannotDetectMediaType() + url, static_cast<OWeakObject *>(this), static_cast<sal_Int16>(-1) ); } @@ -721,7 +722,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( } } throw lang::IllegalArgumentException( - StrUnsupportedMediaType::get() + mediaType, + StrUnsupportedMediaType() + mediaType, static_cast<OWeakObject *>(this), static_cast<sal_Int16>(-1) ); } diff --git a/desktop/source/deployment/registry/component/dp_component.hrc b/desktop/source/deployment/registry/component/dp_component.hrc deleted file mode 100644 index 91caa2082402..000000000000 --- a/desktop/source/deployment/registry/component/dp_component.hrc +++ /dev/null @@ -1,34 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_DP_COMPONENT_HRC -#define INCLUDED_DP_COMPONENT_HRC - -#include "deployment.hrc" - -#define RID_STR_DYN_COMPONENT (RID_DEPLOYMENT_COMPONENT_START+10) -#define RID_STR_JAVA_COMPONENT (RID_DEPLOYMENT_COMPONENT_START+11) -#define RID_STR_PYTHON_COMPONENT (RID_DEPLOYMENT_COMPONENT_START+12) -#define RID_STR_COMPONENTS (RID_DEPLOYMENT_COMPONENT_START+13) -#define RID_STR_RDB_TYPELIB (RID_DEPLOYMENT_COMPONENT_START+20) -#define RID_STR_JAVA_TYPELIB (RID_DEPLOYMENT_COMPONENT_START+21) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/component/dp_component.src b/desktop/source/deployment/registry/component/dp_component.src deleted file mode 100644 index fea67f326600..000000000000 --- a/desktop/source/deployment/registry/component/dp_component.src +++ /dev/null @@ -1,52 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "dp_component.hrc" - -String RID_STR_DYN_COMPONENT -{ - Text [ en-US ] = "UNO Dynamic Library Component"; -}; - -String RID_STR_JAVA_COMPONENT -{ - Text [ en-US ] = "UNO Java Component"; -}; - -String RID_STR_PYTHON_COMPONENT -{ - Text [ en-US ] = "UNO Python Component"; -}; - -String RID_STR_COMPONENTS -{ - Text [ en-US ] = "UNO Components"; -}; - -String RID_STR_RDB_TYPELIB -{ - Text [ en-US ] = "UNO RDB Type Library"; -}; - -String RID_STR_JAVA_TYPELIB -{ - Text [ en-US ] = "UNO Java Type Library"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.cxx b/desktop/source/deployment/registry/configuration/dp_configuration.cxx index ad372fa73297..cdf61b289ec7 100644 --- a/desktop/source/deployment/registry/configuration/dp_configuration.cxx +++ b/desktop/source/deployment/registry/configuration/dp_configuration.cxx @@ -22,7 +22,6 @@ #include <config_features.h> -#include "dp_configuration.hrc" #include "dp_backend.h" #if HAVE_FEATURE_EXTENSIONS #include "dp_persmap.h" @@ -186,12 +185,12 @@ BackendImpl::BackendImpl( m_xConfDataTypeInfo( new Package::TypeInfo( "application/vnd.sun.star.configuration-data", "*.xcu", - getResourceString(RID_STR_CONF_DATA) + DpResId(RID_STR_CONF_DATA) ) ), m_xConfSchemaTypeInfo( new Package::TypeInfo( "application/vnd.sun.star.configuration-schema", "*.xcs", - getResourceString(RID_STR_CONF_SCHEMA) + DpResId(RID_STR_CONF_SCHEMA) ) ), m_typeInfos( 2 ) { @@ -317,7 +316,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( } if (mediaType.isEmpty()) throw lang::IllegalArgumentException( - StrCannotDetectMediaType::get() + url, + StrCannotDetectMediaType() + url, static_cast<OWeakObject *>(this), static_cast<sal_Int16>(-1) ); } @@ -349,7 +348,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( } } throw lang::IllegalArgumentException( - StrUnsupportedMediaType::get() + mediaType, + StrUnsupportedMediaType() + mediaType, static_cast<OWeakObject *>(this), static_cast<sal_Int16>(-1) ); } diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.hrc b/desktop/source/deployment/registry/configuration/dp_configuration.hrc deleted file mode 100644 index 3895d1113fdf..000000000000 --- a/desktop/source/deployment/registry/configuration/dp_configuration.hrc +++ /dev/null @@ -1,30 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_DP_CONFIGURATION_HRC -#define INCLUDED_DP_CONFIGURATION_HRC - -#include "deployment.hrc" - -#define RID_STR_CONF_SCHEMA (RID_DEPLOYMENT_CONF_START+10) -#define RID_STR_CONF_DATA (RID_DEPLOYMENT_CONF_START+11) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/configuration/dp_configuration.src b/desktop/source/deployment/registry/configuration/dp_configuration.src deleted file mode 100644 index be4ae80eebf1..000000000000 --- a/desktop/source/deployment/registry/configuration/dp_configuration.src +++ /dev/null @@ -1,32 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "dp_configuration.hrc" - -String RID_STR_CONF_SCHEMA -{ - Text [ en-US ] = "Configuration Schema"; -}; - -String RID_STR_CONF_DATA -{ - Text [ en-US ] = "Configuration Data"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/dp_backend.cxx b/desktop/source/deployment/registry/dp_backend.cxx index 9078d61b8f79..bbd752f3d07c 100644 --- a/desktop/source/deployment/registry/dp_backend.cxx +++ b/desktop/source/deployment/registry/dp_backend.cxx @@ -628,8 +628,8 @@ void Package::processPackage_impl( ProgressLevel progress( xCmdEnv, (doRegisterPackage - ? PackageRegistryBackend::StrRegisteringPackage::get() - : PackageRegistryBackend::StrRevokingPackage::get()) + ? PackageRegistryBackend::StrRegisteringPackage() + : PackageRegistryBackend::StrRevokingPackage()) + displayName ); processPackage_( guard, doRegisterPackage, @@ -642,8 +642,8 @@ void Package::processPackage_impl( Any e(cppu::getCaughtException()); throw deployment::DeploymentException( ((doRegisterPackage - ? getResourceString(RID_STR_ERROR_WHILE_REGISTERING) - : getResourceString(RID_STR_ERROR_WHILE_REVOKING)) + ? DpResId(RID_STR_ERROR_WHILE_REGISTERING) + : DpResId(RID_STR_ERROR_WHILE_REVOKING)) + getDisplayName()), static_cast< OWeakObject * >(this), e); } @@ -666,8 +666,8 @@ void Package::processPackage_impl( Any exc( ::cppu::getCaughtException() ); throw deployment::DeploymentException( (doRegisterPackage - ? getResourceString(RID_STR_ERROR_WHILE_REGISTERING) - : getResourceString(RID_STR_ERROR_WHILE_REVOKING)) + ? DpResId(RID_STR_ERROR_WHILE_REGISTERING) + : DpResId(RID_STR_ERROR_WHILE_REVOKING)) + getDisplayName(), static_cast<OWeakObject *>(this), exc ); } } diff --git a/desktop/source/deployment/registry/dp_registry.cxx b/desktop/source/deployment/registry/dp_registry.cxx index da6c96195158..745dc66a8717 100644 --- a/desktop/source/deployment/registry/dp_registry.cxx +++ b/desktop/source/deployment/registry/dp_registry.cxx @@ -19,8 +19,9 @@ #include <sal/config.h> +#include "dp_shared.hxx" #include "dp_package.hxx" -#include "dp_registry.hrc" +#include "strings.hrc" #include "dp_registry.hxx" #include "dp_misc.h" #include "dp_resource.h" @@ -494,7 +495,7 @@ Reference<deployment::XPackage> PackageRegistryImpl::bindPackage( } } throw lang::IllegalArgumentException( - getResourceString(RID_STR_CANNOT_DETECT_MEDIA_TYPE) + url, + DpResId(RID_STR_CANNOT_DETECT_MEDIA_TYPE) + url, static_cast<OWeakObject *>(this), static_cast<sal_Int16>(-1) ); } else @@ -514,7 +515,7 @@ Reference<deployment::XPackage> PackageRegistryImpl::bindPackage( } if (iFind == m_mediaType2backend.end()) { throw lang::IllegalArgumentException( - getResourceString(RID_STR_UNSUPPORTED_MEDIA_TYPE) + mediaType, + DpResId(RID_STR_UNSUPPORTED_MEDIA_TYPE) + mediaType, static_cast<OWeakObject *>(this), static_cast<sal_Int16>(-1) ); } return iFind->second->bindPackage( url, mediaType, bRemoved, diff --git a/desktop/source/deployment/registry/dp_registry.src b/desktop/source/deployment/registry/dp_registry.src deleted file mode 100644 index a8cf5d2deb15..000000000000 --- a/desktop/source/deployment/registry/dp_registry.src +++ /dev/null @@ -1,52 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "dp_registry.hrc" - -String RID_STR_REGISTERING_PACKAGE -{ - Text [ en-US ] = "Enabling: "; -}; - -String RID_STR_REVOKING_PACKAGE -{ - Text [ en-US ] = "Disabling: "; -}; - -String RID_STR_CANNOT_DETECT_MEDIA_TYPE -{ - Text [ en-US ] = "Cannot detect media-type: "; -}; - -String RID_STR_UNSUPPORTED_MEDIA_TYPE -{ - Text [ en-US ] = "This media-type is not supported: "; -}; - -String RID_STR_ERROR_WHILE_REGISTERING -{ - Text [ en-US ] = "An error occurred while enabling: "; -}; - -String RID_STR_ERROR_WHILE_REVOKING -{ - Text [ en-US ] = "An error occurred while disabling: "; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx index a5bac639d480..fbdb4614455e 100644 --- a/desktop/source/deployment/registry/executable/dp_executable.cxx +++ b/desktop/source/deployment/registry/executable/dp_executable.cxx @@ -159,7 +159,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( if (mediaType.isEmpty()) { throw lang::IllegalArgumentException( - StrCannotDetectMediaType::get() + url, + StrCannotDetectMediaType() + url, static_cast<OWeakObject *>(this), static_cast<sal_Int16>(-1) ); } diff --git a/desktop/source/deployment/registry/help/dp_help.cxx b/desktop/source/deployment/registry/help/dp_help.cxx index f7b64bb3a59d..88b9e59f24c6 100644 --- a/desktop/source/deployment/registry/help/dp_help.cxx +++ b/desktop/source/deployment/registry/help/dp_help.cxx @@ -20,7 +20,7 @@ #include <memory> #include <config_features.h> -#include "dp_help.hrc" +#include "strings.hrc" #include "dp_backend.h" #include "dp_helpbackenddb.hxx" #include "dp_services.hxx" @@ -128,7 +128,7 @@ BackendImpl::BackendImpl( : PackageRegistryBackend( args, xComponentContext ), m_xHelpTypeInfo( new Package::TypeInfo("application/vnd.sun.star.help", OUString(), - getResourceString(RID_STR_HELP) + DpResId(RID_STR_HELP) ) ), m_typeInfos( 1 ) { @@ -173,7 +173,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( // we don't support auto detection: if (mediaType_.isEmpty()) throw lang::IllegalArgumentException( - StrCannotDetectMediaType::get() + url, + StrCannotDetectMediaType() + url, static_cast<OWeakObject *>(this), static_cast<sal_Int16>(-1) ); OUString type, subType; @@ -199,7 +199,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( } } throw lang::IllegalArgumentException( - StrUnsupportedMediaType::get() + mediaType_, + StrUnsupportedMediaType() + mediaType_, static_cast<OWeakObject *>(this), static_cast<sal_Int16>(-1) ); } @@ -370,7 +370,7 @@ void BackendImpl::implProcessHelp( OUString aExpandedHelpURL = dp_misc::expandUnoRcUrl( aHelpURL ); if( !xSFA->isFolder( aExpandedHelpURL ) ) { - OUString aErrStr = getResourceString( RID_STR_HELPPROCESSING_GENERAL_ERROR ); + OUString aErrStr = DpResId( RID_STR_HELPPROCESSING_GENERAL_ERROR ); aErrStr += "No help folder"; OWeakObject* oWeakThis = static_cast<OWeakObject *>(this); throw deployment::DeploymentException( OUString(), oWeakThis, @@ -475,18 +475,18 @@ void BackendImpl::implProcessHelp( if( !bSuccess ) { - sal_uInt16 nErrStrId = 0; + const char* pErrStrId = nullptr; switch( aErrorInfo.m_eErrorClass ) { - case HelpProcessingErrorClass::General: nErrStrId = RID_STR_HELPPROCESSING_GENERAL_ERROR; break; - case HelpProcessingErrorClass::XmlParsing: nErrStrId = RID_STR_HELPPROCESSING_XMLPARSING_ERROR; break; + case HelpProcessingErrorClass::General: pErrStrId = RID_STR_HELPPROCESSING_GENERAL_ERROR; break; + case HelpProcessingErrorClass::XmlParsing: pErrStrId = RID_STR_HELPPROCESSING_XMLPARSING_ERROR; break; default: ; }; OUString aErrStr; - if( nErrStrId != 0 ) + if (pErrStrId) { - aErrStr = getResourceString( nErrStrId ); + aErrStr = DpResId(pErrStrId); // Remove CR/LF OUString aErrMsg( aErrorInfo.m_aErrorMsg ); @@ -506,7 +506,7 @@ void BackendImpl::implProcessHelp( aErrMsg = aErrMsg.copy( 0, nCopy ); } aErrStr += aErrMsg; - if( nErrStrId == RID_STR_HELPPROCESSING_XMLPARSING_ERROR && !aErrorInfo.m_aXMLParsingFile.isEmpty() ) + if (!strcmp(pErrStrId, RID_STR_HELPPROCESSING_XMLPARSING_ERROR) && !aErrorInfo.m_aXMLParsingFile.isEmpty() ) { aErrStr += " in "; diff --git a/desktop/source/deployment/registry/help/dp_help.hrc b/desktop/source/deployment/registry/help/dp_help.hrc deleted file mode 100644 index 59cb6136c458..000000000000 --- a/desktop/source/deployment/registry/help/dp_help.hrc +++ /dev/null @@ -1,32 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_DP_HELP_HRC -#define INCLUDED_DP_HELP_HRC - -#include "deployment.hrc" - -#define RID_STR_HELP (RID_DEPLOYMENT_HELP_START+2) - -#define RID_STR_HELPPROCESSING_GENERAL_ERROR (RID_DEPLOYMENT_HELP_START+3) -#define RID_STR_HELPPROCESSING_XMLPARSING_ERROR (RID_DEPLOYMENT_HELP_START+4) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/help/dp_help.src b/desktop/source/deployment/registry/help/dp_help.src deleted file mode 100644 index 0d8d663c4107..000000000000 --- a/desktop/source/deployment/registry/help/dp_help.src +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "dp_help.hrc" - -String RID_STR_HELP -{ - Text [ en-US ] = "Help"; -}; - -String RID_STR_HELPPROCESSING_GENERAL_ERROR -{ - Text [ en-US ] = "The extension cannot be installed because:\n"; -}; - -String RID_STR_HELPPROCESSING_XMLPARSING_ERROR -{ - Text [ en-US ] = "The extension will not be installed because an error occurred in the Help files:\n"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/inc/dp_backend.h b/desktop/source/deployment/registry/inc/dp_backend.h index 33ea1e5a7a37..6aebe1124026 100644 --- a/desktop/source/deployment/registry/inc/dp_backend.h +++ b/desktop/source/deployment/registry/inc/dp_backend.h @@ -22,6 +22,7 @@ #include "dp_misc.h" #include "dp_resource.h" +#include "dp_shared.hxx" #include "dp_interact.h" #include <rtl/ref.hxx> #include <cppuhelper/weakref.hxx> @@ -33,7 +34,7 @@ #include <com/sun/star/deployment/InvalidRemovedParameterException.hpp> #include <list> #include <unordered_map> -#include "dp_registry.hrc" +#include "strings.hrc" namespace dp_registry { @@ -221,10 +222,8 @@ protected: Unknown, User, Shared, Bundled, Tmp, Document } m_eContext; - struct StrCannotDetectMediaType : public ::dp_misc::StaticResourceString< - StrCannotDetectMediaType, RID_STR_CANNOT_DETECT_MEDIA_TYPE> {}; - struct StrUnsupportedMediaType : public ::dp_misc::StaticResourceString< - StrUnsupportedMediaType, RID_STR_UNSUPPORTED_MEDIA_TYPE> {}; + static OUString StrCannotDetectMediaType() { return DpResId(RID_STR_CANNOT_DETECT_MEDIA_TYPE); } + static OUString StrUnsupportedMediaType() { return DpResId(RID_STR_UNSUPPORTED_MEDIA_TYPE); } // @@@ to be implemented by specific backend: virtual css::uno::Reference<css::deployment::XPackage> bindPackage_( @@ -261,10 +260,8 @@ protected: OUString const & folderUrl); public: - struct StrRegisteringPackage : public ::dp_misc::StaticResourceString< - StrRegisteringPackage, RID_STR_REGISTERING_PACKAGE> {}; - struct StrRevokingPackage : public ::dp_misc::StaticResourceString< - StrRevokingPackage, RID_STR_REVOKING_PACKAGE> {}; + static OUString StrRegisteringPackage() { return DpResId(RID_STR_REGISTERING_PACKAGE); } + static OUString StrRevokingPackage() { return DpResId(RID_STR_REVOKING_PACKAGE); } css::uno::Reference<css::uno::XComponentContext> const & getComponentContext() const { return m_xComponentContext; } diff --git a/desktop/source/deployment/registry/inc/dp_registry.hrc b/desktop/source/deployment/registry/inc/dp_registry.hrc deleted file mode 100644 index c6a8d67ea77a..000000000000 --- a/desktop/source/deployment/registry/inc/dp_registry.hrc +++ /dev/null @@ -1,34 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_DP_REGISTRY_HRC -#define INCLUDED_DP_REGISTRY_HRC - -#include "deployment.hrc" - -#define RID_STR_CANNOT_DETECT_MEDIA_TYPE (RID_DEPLOYMENT_REGISTRY_START+0) -#define RID_STR_UNSUPPORTED_MEDIA_TYPE (RID_DEPLOYMENT_REGISTRY_START+1) -#define RID_STR_ERROR_WHILE_REGISTERING (RID_DEPLOYMENT_REGISTRY_START+2) -#define RID_STR_ERROR_WHILE_REVOKING (RID_DEPLOYMENT_REGISTRY_START+3) -#define RID_STR_REGISTERING_PACKAGE (RID_DEPLOYMENT_REGISTRY_START+4) -#define RID_STR_REVOKING_PACKAGE (RID_DEPLOYMENT_REGISTRY_START+5) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx index 8d051bc2ee45..e5c061d021f9 100644 --- a/desktop/source/deployment/registry/package/dp_package.cxx +++ b/desktop/source/deployment/registry/package/dp_package.cxx @@ -18,7 +18,7 @@ */ -#include "dp_package.hrc" +#include "strings.hrc" #include "dp_package.hxx" #include "dp_backend.h" #include "dp_ucb.h" @@ -270,7 +270,7 @@ BackendImpl::BackendImpl( m_xBundleTypeInfo( new Package::TypeInfo( "application/vnd.sun.star.package-bundle", "*.oxt;*.uno.pkg", - getResourceString(RID_STR_PACKAGE_BUNDLE) + DpResId(RID_STR_PACKAGE_BUNDLE) ) ), m_xLegacyBundleTypeInfo( new Package::TypeInfo( "application/vnd.sun.star.legacy-package-bundle", @@ -375,7 +375,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( } if (mediaType.isEmpty()) throw lang::IllegalArgumentException( - StrCannotDetectMediaType::get() + url, + StrCannotDetectMediaType() + url, static_cast<OWeakObject *>(this), static_cast<sal_Int16>(-1) ); } @@ -410,7 +410,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( } } throw lang::IllegalArgumentException( - StrUnsupportedMediaType::get() + mediaType, + StrUnsupportedMediaType() + mediaType, static_cast<OWeakObject *>(this), static_cast<sal_Int16>(-1) ); } diff --git a/desktop/source/deployment/registry/package/dp_package.hrc b/desktop/source/deployment/registry/package/dp_package.hrc deleted file mode 100644 index 253dccb9e3a2..000000000000 --- a/desktop/source/deployment/registry/package/dp_package.hrc +++ /dev/null @@ -1,29 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_DP_PACKAGE_HRC -#define INCLUDED_DP_PACKAGE_HRC - -#include "deployment.hrc" - -#define RID_STR_PACKAGE_BUNDLE (RID_DEPLOYMENT_BUNDLE_START+10) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/package/dp_package.src b/desktop/source/deployment/registry/package/dp_package.src deleted file mode 100644 index c091c1b14acb..000000000000 --- a/desktop/source/deployment/registry/package/dp_package.src +++ /dev/null @@ -1,27 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "dp_package.hrc" - -String RID_STR_PACKAGE_BUNDLE -{ - Text [ en-US ] = "Extension"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/script/dp_lib_container.cxx b/desktop/source/deployment/registry/script/dp_lib_container.cxx index b743ad2f1eed..8843b04b6b0c 100644 --- a/desktop/source/deployment/registry/script/dp_lib_container.cxx +++ b/desktop/source/deployment/registry/script/dp_lib_container.cxx @@ -21,8 +21,9 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/ucb/XCommandEnvironment.hpp> -#include "dp_script.hrc" +#include "strings.hrc" #include "dp_resource.h" +#include "dp_shared.hxx" #include "dp_xml.h" #include "dp_lib_container.h" @@ -41,11 +42,9 @@ namespace backend { namespace script { namespace { -struct StrCannotDetermineLibName : public StaticResourceString< - StrCannotDetermineLibName, RID_STR_CANNOT_DETERMINE_LIBNAME> {}; + OUString StrCannotDetermineLibName() { return DpResId(RID_STR_CANNOT_DETERMINE_LIBNAME); } } - OUString LibraryContainer::get_libname( OUString const & url, Reference<XCommandEnvironment> const & xCmdEnv, @@ -56,7 +55,7 @@ OUString LibraryContainer::get_libname( xml_parse( ::xmlscript::importLibrary( import ), ucb_content, xContext ); if (import.aName.isEmpty()) { - throw Exception( StrCannotDetermineLibName::get(), + throw Exception( StrCannotDetermineLibName(), Reference<XInterface>() ); } return import.aName; diff --git a/desktop/source/deployment/registry/script/dp_script.cxx b/desktop/source/deployment/registry/script/dp_script.cxx index 332a6057a01e..e806617845f2 100644 --- a/desktop/source/deployment/registry/script/dp_script.cxx +++ b/desktop/source/deployment/registry/script/dp_script.cxx @@ -18,7 +18,7 @@ */ -#include "dp_script.hrc" +#include "strings.hrc" #include "dp_services.hxx" #include "dp_lib_container.h" #include "dp_backend.h" @@ -144,12 +144,12 @@ BackendImpl::BackendImpl( m_xBasicLibTypeInfo( new Package::TypeInfo( "application/vnd.sun.star.basic-library", OUString() /* no file filter */, - getResourceString(RID_STR_BASIC_LIB) + DpResId(RID_STR_BASIC_LIB) ) ), m_xDialogLibTypeInfo( new Package::TypeInfo( "application/vnd.sun.star.dialog-library", OUString() /* no file filter */, - getResourceString(RID_STR_DIALOG_LIB) + DpResId(RID_STR_DIALOG_LIB) ) ), m_typeInfos( 2 ) { @@ -233,7 +233,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( } if (mediaType.isEmpty()) throw lang::IllegalArgumentException( - StrCannotDetectMediaType::get() + url, + StrCannotDetectMediaType() + url, static_cast<OWeakObject *>(this), static_cast<sal_Int16>(-1) ); } @@ -272,7 +272,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( } } throw lang::IllegalArgumentException( - StrUnsupportedMediaType::get() + mediaType, + StrUnsupportedMediaType() + mediaType, static_cast<OWeakObject *>(this), static_cast<sal_Int16>(-1) ); } diff --git a/desktop/source/deployment/registry/script/dp_script.hrc b/desktop/source/deployment/registry/script/dp_script.hrc deleted file mode 100644 index 7f75edb38ac0..000000000000 --- a/desktop/source/deployment/registry/script/dp_script.hrc +++ /dev/null @@ -1,32 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_DP_SCRIPT_HRC -#define INCLUDED_DP_SCRIPT_HRC - -#include "deployment.hrc" - -#define RID_STR_BASIC_LIB (RID_DEPLOYMENT_SCRIPT_START+10) -#define RID_STR_DIALOG_LIB (RID_DEPLOYMENT_SCRIPT_START+11) - -#define RID_STR_CANNOT_DETERMINE_LIBNAME (RID_DEPLOYMENT_SCRIPT_START+16) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/script/dp_script.src b/desktop/source/deployment/registry/script/dp_script.src deleted file mode 100644 index f3162f8f86e3..000000000000 --- a/desktop/source/deployment/registry/script/dp_script.src +++ /dev/null @@ -1,37 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "dp_script.hrc" - -String RID_STR_BASIC_LIB -{ - Text [ en-US ] = "%PRODUCTNAME Basic Library"; -}; - -String RID_STR_DIALOG_LIB -{ - Text [ en-US ] = "Dialog Library"; -}; - -String RID_STR_CANNOT_DETERMINE_LIBNAME -{ - Text [ en-US ] = "The library name could not be determined."; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx index 274ee2f827c2..d5a8a5df2843 100644 --- a/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx +++ b/desktop/source/deployment/registry/sfwk/dp_sfwk.cxx @@ -20,7 +20,7 @@ #include <sal/config.h> #include "dp_services.hxx" -#include "dp_sfwk.hrc" +#include "strings.hrc" #include "dp_backend.h" #include "dp_ucb.h" #include "dp_parceldesc.hxx" @@ -208,7 +208,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( } if (mediaType.isEmpty()) throw lang::IllegalArgumentException( - StrCannotDetectMediaType::get() + url, + StrCannotDetectMediaType() + url, static_cast<OWeakObject *>(this), static_cast<sal_Int16>(-1) ); } @@ -251,7 +251,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( } } - OUString sfwkLibType = getResourceString( RID_STR_SFWK_LIB ); + OUString sfwkLibType = DpResId( RID_STR_SFWK_LIB ); // replace %MACRONAME placeholder with language name OUString MACRONAME( "%MACROLANG" ); sal_Int32 startOfReplace = sfwkLibType.indexOf( MACRONAME ); @@ -266,7 +266,7 @@ Reference<deployment::XPackage> BackendImpl::bindPackage_( } } throw lang::IllegalArgumentException( - StrUnsupportedMediaType::get() + mediaType, + StrUnsupportedMediaType() + mediaType, static_cast<OWeakObject *>(this), static_cast<sal_Int16>(-1) ); } diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.hrc b/desktop/source/deployment/registry/sfwk/dp_sfwk.hrc deleted file mode 100644 index 505c54015b95..000000000000 --- a/desktop/source/deployment/registry/sfwk/dp_sfwk.hrc +++ /dev/null @@ -1,29 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#ifndef INCLUDED_DP_SFWK_HRC -#define INCLUDED_DP_SFWK_HRC - -#include "deployment.hrc" - -#define RID_STR_SFWK_LIB (RID_DEPLOYMENT_SCRIPT_START+20) - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/registry/sfwk/dp_sfwk.src b/desktop/source/deployment/registry/sfwk/dp_sfwk.src deleted file mode 100644 index 23cd3197eabe..000000000000 --- a/desktop/source/deployment/registry/sfwk/dp_sfwk.src +++ /dev/null @@ -1,27 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "dp_sfwk.hrc" - -String RID_STR_SFWK_LIB -{ - Text [ en-US ] = "%MACROLANG Library"; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/deployment/unopkg/unopkg.src b/desktop/source/deployment/unopkg/unopkg.src deleted file mode 100644 index d000036f6481..000000000000 --- a/desktop/source/deployment/unopkg/unopkg.src +++ /dev/null @@ -1,76 +0,0 @@ -/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ -/* - * This file is part of the LibreOffice project. - * - * This Source Code Form is subject to the terms of the Mozilla Public - * License, v. 2.0. If a copy of the MPL was not distributed with this - * file, You can obtain one at http://mozilla.org/MPL/2.0/. - * - * This file incorporates work covered by the following license notice: - * - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed - * with this work for additional information regarding copyright - * ownership. The ASF licenses this file to you under the Apache - * License, Version 2.0 (the "License"); you may not use this file - * except in compliance with the License. You may obtain a copy of - * the License at http://www.apache.org/licenses/LICENSE-2.0 . - */ - -#include "deployment.hrc" - -String RID_STR_UNOPKG_ACCEPT_LIC_1 -{ - Text [ en-US ] = "Extension Software License Agreement of $NAME:"; -}; - -String RID_STR_UNOPKG_ACCEPT_LIC_2 -{ - Text [ en-US ] = "Read the complete License Agreement displayed above. " - "Accept the License Agreement by typing \"yes\" on the console " - "then press the Return key. Type \"no\" to decline and to abort the " - "extension setup."; -}; - -String RID_STR_UNOPKG_ACCEPT_LIC_3 -{ - Text [ en-US ] = "[Enter \"yes\" or \"no\"]:"; -}; - -String RID_STR_UNOPKG_ACCEPT_LIC_4 -{ - Text [ en-US ] = "Your input was not correct. Please enter \"yes\" or \"no\":"; -}; - -String RID_STR_UNOPKG_ACCEPT_LIC_YES -{ - Text [ en-US ] = "YES"; -}; - -String RID_STR_UNOPKG_ACCEPT_LIC_Y -{ - Text [ en-US ] = "Y"; -}; - -String RID_STR_UNOPKG_ACCEPT_LIC_NO -{ - Text [ en-US ] = "NO"; -}; - -String RID_STR_UNOPKG_ACCEPT_LIC_N -{ - Text [ en-US ] = "N"; -}; - -String RID_STR_CONCURRENTINSTANCE -{ - Text [ en-US ] = "unopkg cannot be started. The lock file indicates it is already running. " - "If this does not apply, delete the lock file at:"; -}; - -String RID_STR_UNOPKG_ERROR -{ - Text [ en-US ] = "ERROR: "; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index fd62da29d704..36aca9643248 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -64,6 +64,7 @@ #include <sfx2/lokhelper.hxx> #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> +#include <svx/strings.hrc> #include <svx/svxids.hrc> #include <svx/ucsubset.hxx> #include <vcl/svapp.hxx> @@ -2997,8 +2998,6 @@ static void force_c_locale() { // force locale (and resource files loaded) to en-US OUString aLangISO("en-US"); - LanguageTag aLocale(aLangISO); - ResMgr::SetDefaultLocale(aLocale); SvtSysLocaleOptions aLocalOptions; aLocalOptions.SetLocaleConfigString(aLangISO); aLocalOptions.SetUILocaleConfigString(aLangISO); diff --git a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx index d501c1954c64..9bb354d7db70 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_cmdenv.cxx @@ -18,8 +18,8 @@ */ -#include "dp_gui.hrc" -#include "dp_gui_shared.hxx" +#include "strings.hrc" +#include "dp_shared.hxx" #include "unopkg_shared.h" #include <osl/thread.h> #include <tools/resmgr.hxx> @@ -40,7 +40,8 @@ #include <com/sun/star/i18n/CollatorOptions.hpp> #include <stdio.h> -#include "deployment.hrc" +#include "strings.hrc" +#include "dp_shared.hxx" #include "dp_version.hxx" using namespace ::com::sun::star; @@ -134,16 +135,15 @@ CommandEnvironmentImpl::~CommandEnvironmentImpl() void CommandEnvironmentImpl::printLicense( const OUString & sName, const OUString& sLicense, bool & accept, bool &decline) { - ResMgr * pResMgr = DeploymentResMgr::get(); - OUString s1tmp(ResId(RID_STR_UNOPKG_ACCEPT_LIC_1, *pResMgr)); + OUString s1tmp(DpResId(RID_STR_UNOPKG_ACCEPT_LIC_1)); OUString s1(s1tmp.replaceAll("$NAME", sName)); - OUString s2 = ResId(RID_STR_UNOPKG_ACCEPT_LIC_2, *pResMgr); - OUString s3 = ResId(RID_STR_UNOPKG_ACCEPT_LIC_3, *pResMgr); - OUString s4 = ResId(RID_STR_UNOPKG_ACCEPT_LIC_4, *pResMgr); - OUString sYES = ResId(RID_STR_UNOPKG_ACCEPT_LIC_YES, *pResMgr); - OUString sY = ResId(RID_STR_UNOPKG_ACCEPT_LIC_Y, *pResMgr); - OUString sNO = ResId(RID_STR_UNOPKG_ACCEPT_LIC_NO, *pResMgr); - OUString sN = ResId(RID_STR_UNOPKG_ACCEPT_LIC_N, *pResMgr); + OUString s2 = DpResId(RID_STR_UNOPKG_ACCEPT_LIC_2); + OUString s3 = DpResId(RID_STR_UNOPKG_ACCEPT_LIC_3); + OUString s4 = DpResId(RID_STR_UNOPKG_ACCEPT_LIC_4); + OUString sYES = DpResId(RID_STR_UNOPKG_ACCEPT_LIC_YES); + OUString sY = DpResId(RID_STR_UNOPKG_ACCEPT_LIC_Y); + OUString sNO = DpResId(RID_STR_UNOPKG_ACCEPT_LIC_NO); + OUString sN = DpResId(RID_STR_UNOPKG_ACCEPT_LIC_N); OUString sNewLine("\n"); @@ -262,7 +262,7 @@ void CommandEnvironmentImpl::handle( } else if (request >>= platExc) { - OUString sMsg(ResId(RID_STR_UNSUPPORTED_PLATFORM, *dp_gui::DeploymentGuiResMgr::get())); + OUString sMsg(DpResId(RID_STR_UNSUPPORTED_PLATFORM)); sMsg = sMsg.replaceAll("%Name", platExc.package->getDisplayName()); dp_misc::writeConsole("\n" + sMsg + "\n\n"); approve = true; diff --git a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx index 8e692cdf2fc8..2e9fdda4dadb 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_misc.cxx +++ b/desktop/source/pkgchk/unopkg/unopkg_misc.cxx @@ -38,10 +38,11 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/ucb/UniversalContentBroker.hpp> -#include "deployment.hrc" +#include "strings.hrc" #include "unopkg_shared.h" #include "dp_identifier.hxx" -#include "dp_gui.hrc" +#include "dp_shared.hxx" +#include "strings.hrc" #include "lockfile.hxx" using namespace ::com::sun::star; @@ -441,10 +442,8 @@ Reference<XComponentContext> getUNO( { if (! s_lockfile.check( nullptr )) { - OUString sMsg(ResId(RID_STR_CONCURRENTINSTANCE, *DeploymentResMgr::get())); - //Create this string before we call DeInitVCL, because this will kill - //the ResMgr - OUString sError(ResId(RID_STR_UNOPKG_ERROR, *DeploymentResMgr::get())); + OUString sMsg(DpResId(RID_STR_CONCURRENTINSTANCE)); + OUString sError(DpResId(RID_STR_UNOPKG_ERROR)); sMsg += "\n" + getLockFilePath(); diff --git a/desktop/source/pkgchk/unopkg/unopkg_shared.h b/desktop/source/pkgchk/unopkg/unopkg_shared.h index 1bd6a04b46bd..20ade0b5e4fd 100644 --- a/desktop/source/pkgchk/unopkg/unopkg_shared.h +++ b/desktop/source/pkgchk/unopkg/unopkg_shared.h @@ -22,6 +22,7 @@ #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/ucb/XCommandEnvironment.hpp> #include <com/sun/star/deployment/XPackage.hpp> +#include <osl/diagnose.h> #include <tools/resmgr.hxx> #include <rtl/ustring.hxx> #include <unotools/configmgr.hxx> @@ -31,14 +32,6 @@ namespace unopkg { -struct DeploymentResMgr : public rtl::StaticWithInit< ResMgr *, DeploymentResMgr > -{ - ResMgr * operator () () { - return ResMgr::CreateResMgr( - "deployment", LanguageTag( utl::ConfigManager::getLocale() ) ); - } -}; - struct OptionInfo { char const * m_name; diff --git a/desktop/uiconfig/ui/dependenciesdialog.ui b/desktop/uiconfig/ui/dependenciesdialog.ui index cdc6bf35362f..d810db078d54 100644 --- a/desktop/uiconfig/ui/dependenciesdialog.ui +++ b/desktop/uiconfig/ui/dependenciesdialog.ui @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> -<interface> +<interface domain="dkt"> <!-- interface-requires gtk+ 3.0 --> <object class="GtkDialog" id="Dependencies"> <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <property name="border_width">6</property> - <property name="title" translatable="yes">System dependencies check</property> + <property name="title" translatable="yes" context="dependenciesdialog|Dependencies">System dependencies check</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -57,7 +57,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">The extension cannot be installed as the following system dependencies are not fulfilled:</property> + <property name="label" translatable="yes" context="dependenciesdialog|label1">The extension cannot be installed as the following system dependencies are not fulfilled:</property> <property name="wrap">True</property> <property name="max_width_chars">60</property> </object> diff --git a/desktop/uiconfig/ui/extensionmanager.ui b/desktop/uiconfig/ui/extensionmanager.ui index f40b38679134..d4aa71991655 100644 --- a/desktop/uiconfig/ui/extensionmanager.ui +++ b/desktop/uiconfig/ui/extensionmanager.ui @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.20.0 --> -<interface> +<interface domain="dkt"> <requires lib="gtk+" version="3.0"/> <requires lib="LibreOffice" version="1.0"/> <object class="GtkDialog" id="ExtensionManagerDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Extension Manager</property> + <property name="title" translatable="yes" context="extensionmanager|ExtensionManagerDialog">Extension Manager</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -79,7 +79,7 @@ <property name="layout_style">start</property> <child> <object class="GtkButton" id="optionsbtn"> - <property name="label" translatable="yes">_Options</property> + <property name="label" translatable="yes" context="extensionmanager|optionsbtn">_Options</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -93,7 +93,7 @@ </child> <child> <object class="GtkButton" id="updatebtn"> - <property name="label" translatable="yes">Check for _Updates</property> + <property name="label" translatable="yes" context="extensionmanager|updatebtn">Check for _Updates</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -108,7 +108,7 @@ </child> <child> <object class="GtkButton" id="addbtn"> - <property name="label" translatable="yes">_Add</property> + <property name="label" translatable="yes" context="extensionmanager|addbtn">_Add</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> @@ -125,7 +125,7 @@ </child> <child> <object class="GtkButton" id="removebtn"> - <property name="label" translatable="yes">_Remove</property> + <property name="label" translatable="yes" context="extensionmanager|removebtn">_Remove</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -140,7 +140,7 @@ </child> <child> <object class="GtkButton" id="enablebtn"> - <property name="label" translatable="yes">_Enable</property> + <property name="label" translatable="yes" context="extensionmanager|enablebtn">_Enable</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -184,7 +184,7 @@ <property name="column_spacing">12</property> <child> <object class="GtkCheckButton" id="shared"> - <property name="label" translatable="yes">Installed for all users</property> + <property name="label" translatable="yes" context="extensionmanager|shared">Installed for all users</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -200,7 +200,7 @@ </child> <child> <object class="GtkCheckButton" id="user"> - <property name="label" translatable="yes">Installed for current user</property> + <property name="label" translatable="yes" context="extensionmanager|user">Installed for current user</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -216,7 +216,7 @@ </child> <child> <object class="GtkCheckButton" id="bundled"> - <property name="label" translatable="yes">Bundled with %PRODUCTNAME</property> + <property name="label" translatable="yes" context="extensionmanager|bundled">Bundled with %PRODUCTNAME</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -238,7 +238,7 @@ <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Display Extensions</property> + <property name="label" translatable="yes" context="extensionmanager|label1">Display Extensions</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -260,7 +260,7 @@ <object class="GtkLabel" id="progressft"> <property name="can_focus">False</property> <property name="no_show_all">True</property> - <property name="label" translatable="yes">Adding %EXTENSION_NAME</property> + <property name="label" translatable="yes" context="extensionmanager|progressft">Adding %EXTENSION_NAME</property> <property name="justify">right</property> </object> <packing> @@ -295,7 +295,7 @@ </child> <child> <object class="GtkLinkButton" id="getextensions"> - <property name="label" translatable="yes">Get more extensions online...</property> + <property name="label" translatable="yes" context="extensionmanager|getextensions">Get more extensions online...</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> diff --git a/desktop/uiconfig/ui/installforalldialog.ui b/desktop/uiconfig/ui/installforalldialog.ui index 354afcf280cb..c3d3576db024 100644 --- a/desktop/uiconfig/ui/installforalldialog.ui +++ b/desktop/uiconfig/ui/installforalldialog.ui @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.16.1 --> -<interface> +<interface domain="dkt"> <requires lib="gtk+" version="3.0"/> <object class="GtkMessageDialog" id="InstallForAllDialog"> <property name="can_focus">False</property> @@ -9,8 +9,8 @@ <property name="type_hint">dialog</property> <property name="skip_taskbar_hint">True</property> <property name="message_type">question</property> - <property name="text" translatable="yes">For whom do you want to install the extension?</property> - <property name="secondary_text" translatable="yes">Make sure that no further users are working with the same %PRODUCTNAME, when installing an extension for all users in a multi user environment.</property> + <property name="text" translatable="yes" context="installforalldialog|InstallForAllDialog">For whom do you want to install the extension?</property> + <property name="secondary_text" translatable="yes" context="installforalldialog|InstallForAllDialog">Make sure that no further users are working with the same %PRODUCTNAME, when installing an extension for all users in a multi user environment.</property> <child internal-child="vbox"> <object class="GtkBox" id="messagedialog-vbox"> <property name="can_focus">False</property> @@ -22,7 +22,7 @@ <property name="layout_style">end</property> <child> <object class="GtkButton" id="no"> - <property name="label" translatable="yes">_For all users</property> + <property name="label" translatable="yes" context="installforalldialog|no">_For all users</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -36,7 +36,7 @@ </child> <child> <object class="GtkButton" id="yes"> - <property name="label" translatable="yes">_Only for me</property> + <property name="label" translatable="yes" context="installforalldialog|yes">_Only for me</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> diff --git a/desktop/uiconfig/ui/licensedialog.ui b/desktop/uiconfig/ui/licensedialog.ui index bc357838da06..3dac862f09ff 100644 --- a/desktop/uiconfig/ui/licensedialog.ui +++ b/desktop/uiconfig/ui/licensedialog.ui @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> -<interface> +<interface domain="dkt"> <!-- interface-requires gtk+ 3.0 --> <!-- interface-requires LibreOffice 1.0 --> <object class="GtkDialog" id="LicenseDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Extension Software License Agreement</property> + <property name="title" translatable="yes" context="licensedialog|LicenseDialog">Extension Software License Agreement</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -18,7 +18,7 @@ <property name="layout_style">end</property> <child> <object class="GtkButton" id="accept"> - <property name="label" translatable="yes">Accept</property> + <property name="label" translatable="yes" context="licensedialog|accept">Accept</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> @@ -33,7 +33,7 @@ </child> <child> <object class="GtkButton" id="decline"> - <property name="label" translatable="yes">Decline</property> + <property name="label" translatable="yes" context="licensedialog|decline">Decline</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -64,7 +64,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Please follow these steps to proceed with the installation of the extension:</property> + <property name="label" translatable="yes" context="licensedialog|head">Please follow these steps to proceed with the installation of the extension:</property> </object> <packing> <property name="left_attach">0</property> @@ -87,7 +87,7 @@ <property name="can_focus">False</property> <property name="valign">start</property> <property name="xalign">0</property> - <property name="label" translatable="yes">1.</property> + <property name="label" translatable="yes" context="licensedialog|label2">1.</property> </object> <packing> <property name="left_attach">1</property> @@ -102,7 +102,7 @@ <property name="can_focus">False</property> <property name="valign">start</property> <property name="xalign">0</property> - <property name="label" translatable="yes">2.</property> + <property name="label" translatable="yes" context="licensedialog|label3">2.</property> </object> <packing> <property name="left_attach">1</property> @@ -146,7 +146,7 @@ <property name="valign">start</property> <property name="hexpand">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Read the complete License Agreement. Use the scroll bar or the 'Scroll Down' button in this dialog to view the entire license text.</property> + <property name="label" translatable="yes" context="licensedialog|label4">Read the complete License Agreement. Use the scroll bar or the 'Scroll Down' button in this dialog to view the entire license text.</property> <property name="wrap">True</property> <property name="max_width_chars">55</property> </object> @@ -164,7 +164,7 @@ <property name="valign">start</property> <property name="hexpand">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Accept the License Agreement for the extension by pressing the 'Accept' button.</property> + <property name="label" translatable="yes" context="licensedialog|label5">Accept the License Agreement for the extension by pressing the 'Accept' button.</property> <property name="wrap">True</property> <property name="max_width_chars">55</property> </object> @@ -177,7 +177,7 @@ </child> <child> <object class="GtkButton" id="down"> - <property name="label" translatable="yes">_Scroll Down</property> + <property name="label" translatable="yes" context="licensedialog|down">_Scroll Down</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> diff --git a/desktop/uiconfig/ui/showlicensedialog.ui b/desktop/uiconfig/ui/showlicensedialog.ui index e6dc728f9c40..eef638282720 100644 --- a/desktop/uiconfig/ui/showlicensedialog.ui +++ b/desktop/uiconfig/ui/showlicensedialog.ui @@ -1,10 +1,10 @@ <?xml version="1.0" encoding="UTF-8"?> -<interface> +<interface domain="dkt"> <!-- interface-requires gtk+ 3.0 --> <object class="GtkDialog" id="ShowLicenseDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Extension Software License Agreement</property> + <property name="title" translatable="yes" context="showlicensedialog|ShowLicenseDialog">Extension Software License Agreement</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> diff --git a/desktop/uiconfig/ui/updatedialog.ui b/desktop/uiconfig/ui/updatedialog.ui index 9fb3b6bcefdc..ee9a1b16fa57 100644 --- a/desktop/uiconfig/ui/updatedialog.ui +++ b/desktop/uiconfig/ui/updatedialog.ui @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="dkt"> <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="UpdateDialog"> <property name="can_focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Extension Update</property> + <property name="title" translatable="yes" context="updatedialog|UpdateDialog">Extension Update</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -35,7 +35,7 @@ </child> <child> <object class="GtkButton" id="INSTALL"> - <property name="label" translatable="yes">_Install</property> + <property name="label" translatable="yes" context="updatedialog|INSTALL">_Install</property> <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> @@ -101,7 +101,7 @@ <property name="can_focus">False</property> <property name="halign">start</property> <property name="hexpand">True</property> - <property name="label" translatable="yes">_Available extension updates</property> + <property name="label" translatable="yes" context="updatedialog|UPDATE_LABEL">_Available extension updates</property> <property name="use_underline">True</property> </object> <packing> @@ -114,7 +114,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">end</property> - <property name="label" translatable="yes">Checking...</property> + <property name="label" translatable="yes" context="updatedialog|UPDATE_CHECKING">Checking...</property> </object> <packing> <property name="left_attach">1</property> @@ -157,7 +157,7 @@ </child> <child> <object class="GtkCheckButton" id="UPDATE_ALL"> - <property name="label" translatable="yes">_Show all updates</property> + <property name="label" translatable="yes" context="updatedialog|UPDATE_ALL">_Show all updates</property> <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="sensitive">False</property> @@ -193,7 +193,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">Description</property> + <property name="label" translatable="yes" context="updatedialog|DESCRIPTION_LABEL">Description</property> </object> <packing> <property name="expand">False</property> @@ -211,7 +211,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">Publisher:</property> + <property name="label" translatable="yes" context="updatedialog|PUBLISHER_LABEL">Publisher:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">PUBLISHER_LINK</property> </object> @@ -222,7 +222,7 @@ </child> <child> <object class="GtkLinkButton" id="PUBLISHER_LINK"> - <property name="label" translatable="yes">button</property> + <property name="label" translatable="yes" context="updatedialog|PUBLISHER_LINK">button</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> @@ -239,7 +239,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">What is new:</property> + <property name="label" translatable="yes" context="updatedialog|RELEASE_NOTES_LABEL">What is new:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">RELEASE_NOTES_LINK</property> </object> @@ -250,7 +250,7 @@ </child> <child> <object class="GtkLinkButton" id="RELEASE_NOTES_LINK"> - <property name="label" translatable="yes">Release notes</property> + <property name="label" translatable="yes" context="updatedialog|RELEASE_NOTES_LINK">Release notes</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> diff --git a/desktop/uiconfig/ui/updateinstalldialog.ui b/desktop/uiconfig/ui/updateinstalldialog.ui index 42dc29937624..d96a85edef67 100644 --- a/desktop/uiconfig/ui/updateinstalldialog.ui +++ b/desktop/uiconfig/ui/updateinstalldialog.ui @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.18.3 --> -<interface> +<interface domain="dkt"> <requires lib="gtk+" version="3.0"/> <object class="GtkDialog" id="UpdateInstallDialog"> <property name="can_focus">False</property> <property name="border_width">6</property> - <property name="title" translatable="yes">Download and Installation</property> + <property name="title" translatable="yes" context="updateinstalldialog|UpdateInstallDialog">Download and Installation</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -84,7 +84,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">Downloading extensions...</property> + <property name="label" translatable="yes" context="updateinstalldialog|DOWNLOADING">Downloading extensions...</property> <property name="use_underline">True</property> <property name="mnemonic_widget">STATUSBAR</property> </object> @@ -122,7 +122,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="halign">start</property> - <property name="label" translatable="yes">Result</property> + <property name="label" translatable="yes" context="updateinstalldialog|RESULTS">Result</property> <property name="use_underline">True</property> <property name="mnemonic_widget">INFO</property> </object> diff --git a/desktop/uiconfig/ui/updaterequireddialog.ui b/desktop/uiconfig/ui/updaterequireddialog.ui index b1c82d62657e..58e9ced957b9 100644 --- a/desktop/uiconfig/ui/updaterequireddialog.ui +++ b/desktop/uiconfig/ui/updaterequireddialog.ui @@ -1,12 +1,12 @@ <?xml version="1.0" encoding="UTF-8"?> <!-- Generated with glade 3.16.1 --> -<interface> +<interface domain="dkt"> <requires lib="gtk+" version="3.0"/> <!-- interface-requires LibreOffice 1.0 --> <object class="GtkDialog" id="UpdateRequiredDialog"> <property name="can_focus">False</property> <property name="border_width">5</property> - <property name="title" translatable="yes">Extension Update Required</property> + <property name="title" translatable="yes" context="updaterequireddialog|UpdateRequiredDialog">Extension Update Required</property> <property name="type_hint">dialog</property> <child internal-child="vbox"> <object class="GtkBox" id="dialog-vbox1"> @@ -23,7 +23,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="xalign">0</property> - <property name="label" translatable="yes">%PRODUCTNAME has been updated to a new version. Some installed %PRODUCTNAME extensions are not compatible with this version and need to be updated before they can be used.</property> + <property name="label" translatable="yes" context="updaterequireddialog|updatelabel">%PRODUCTNAME has been updated to a new version. Some installed %PRODUCTNAME extensions are not compatible with this version and need to be updated before they can be used.</property> <property name="wrap">True</property> <property name="max_width_chars">95</property> </object> @@ -59,7 +59,7 @@ <property name="can_focus">False</property> <property name="no_show_all">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Adding %EXTENSION_NAME</property> + <property name="label" translatable="yes" context="updaterequireddialog|progresslabel">Adding %EXTENSION_NAME</property> <property name="use_underline">True</property> </object> <packing> @@ -103,7 +103,7 @@ <property name="layout_style">end</property> <child> <object class="GtkButton" id="check"> - <property name="label" translatable="yes">Check for _Updates...</property> + <property name="label" translatable="yes" context="updaterequireddialog|check">Check for _Updates...</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="can_default">True</property> @@ -119,7 +119,7 @@ </child> <child> <object class="GtkButton" id="disable"> - <property name="label" translatable="yes">Disable all</property> + <property name="label" translatable="yes" context="updaterequireddialog|disable">Disable all</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> |