diff options
| -rw-r--r-- | Repository.mk | 1 | ||||
| -rw-r--r-- | scp2/source/ooo/file_resource_ooo.scp | 2 | ||||
| -rw-r--r-- | scp2/source/ooo/module_lang_template.scp | 1 | ||||
| -rw-r--r-- | svtools/AllLangResTarget_svt.mk | 1 | ||||
| -rw-r--r-- | svtools/source/misc/ehdl.cxx | 6 | ||||
| -rw-r--r-- | svtools/source/misc/errtxt.src (renamed from svx/source/src/errtxt.src) | 0 | ||||
| -rw-r--r-- | svx/AllLangResTarget_ofa.mk | 32 | ||||
| -rw-r--r-- | svx/Module_svx.mk | 1 | ||||
| -rw-r--r-- | uui/source/iahndl-errorhandler.cxx | 2 |
9 files changed, 5 insertions, 41 deletions
diff --git a/Repository.mk b/Repository.mk index 9b89385f8593..bf38a3b3504a 100644 --- a/Repository.mk +++ b/Repository.mk @@ -1082,7 +1082,6 @@ $(eval $(call gb_Helper_register_resources,\ frm \ fwe \ gal \ - ofa \ $(call gb_Helper_optional,DBCONNECTIVITY,pcr) \ pdffilter \ pricing \ diff --git a/scp2/source/ooo/file_resource_ooo.scp b/scp2/source/ooo/file_resource_ooo.scp index 77ab890567d9..ac90ee812f5a 100644 --- a/scp2/source/ooo/file_resource_ooo.scp +++ b/scp2/source/ooo/file_resource_ooo.scp @@ -49,8 +49,6 @@ STD_RES_FILE( gid_File_Res_Gal, gal ) STD_RES_FILE( gid_File_Res_Deployment, deployment ) STD_RES_FILE( gid_File_Res_DeploymentGui, deploymentgui ) -STD_RES_FILE( gid_File_Res_Ofa, ofa ) - STD_RES_FILE( gid_File_Res_Pcr, pcr) STD_RES_FILE( gid_File_Res_Pdffilter, pdffilter) diff --git a/scp2/source/ooo/module_lang_template.scp b/scp2/source/ooo/module_lang_template.scp index 78a2b51232f6..6711999a0d1f 100644 --- a/scp2/source/ooo/module_lang_template.scp +++ b/scp2/source/ooo/module_lang_template.scp @@ -81,7 +81,6 @@ Module gid_Module_Langpack_Resource_Template gid_File_Res_Gal, gid_File_Res_Deployment, gid_File_Res_DeploymentGui, - gid_File_Res_Ofa, gid_File_Res_Pcr, gid_File_Res_Pdffilter, gid_File_Res_San, diff --git a/svtools/AllLangResTarget_svt.mk b/svtools/AllLangResTarget_svt.mk index eea65ca9354c..f373af6e4b83 100644 --- a/svtools/AllLangResTarget_svt.mk +++ b/svtools/AllLangResTarget_svt.mk @@ -49,6 +49,7 @@ $(eval $(call gb_SrsTarget_add_files,svt/res,\ svtools/source/dialogs/wizardmachine.src \ $(if $(ENABLE_JAVA), \ svtools/source/java/javaerror.src) \ + svtools/source/misc/errtxt.src \ svtools/source/misc/imagemgr.src \ svtools/source/misc/langtab.src \ svtools/source/misc/svtools.src \ diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx index 856f4f59a86a..216cf7aba132 100644 --- a/svtools/source/misc/ehdl.cxx +++ b/svtools/source/misc/ehdl.cxx @@ -148,7 +148,7 @@ SfxErrorHandler::SfxErrorHandler(sal_uInt16 nIdP, sal_uLong lStartP, sal_uLong l ErrorRegistry::RegisterDisplay(&aWndFunc); if( ! pMgr ) { - pMgr = ResMgr::CreateResMgr("ofa", Application::GetSettings().GetUILanguageTag() ); + pMgr = ResMgr::CreateResMgr("svt", Application::GetSettings().GetUILanguageTag() ); pFreeMgr.reset(pMgr); } } @@ -202,7 +202,7 @@ void SfxErrorHandler::GetClassString(sal_uLong lClassId, OUString &rStr) */ { - std::unique_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr("ofa", Application::GetSettings().GetUILanguageTag() )); + std::unique_ptr<ResMgr> pResMgr(ResMgr::CreateResMgr("svt", Application::GetSettings().GetUILanguageTag() )); if( pResMgr ) { ResStringArray aEr(ResId(RID_ERRHDL, *pResMgr)); @@ -284,7 +284,7 @@ bool SfxErrorContext::GetString(sal_uInt32 nErrId, OUString &rStr) ResMgr* pFreeMgr = nullptr; if( ! pMgr ) { - pFreeMgr = pMgr = ResMgr::CreateResMgr("ofa", Application::GetSettings().GetUILanguageTag() ); + pFreeMgr = pMgr = ResMgr::CreateResMgr("svt", Application::GetSettings().GetUILanguageTag() ); } if( pMgr ) { diff --git a/svx/source/src/errtxt.src b/svtools/source/misc/errtxt.src index a84c5b32c9ab..a84c5b32c9ab 100644 --- a/svx/source/src/errtxt.src +++ b/svtools/source/misc/errtxt.src diff --git a/svx/AllLangResTarget_ofa.mk b/svx/AllLangResTarget_ofa.mk deleted file mode 100644 index 48d45a05e628..000000000000 --- a/svx/AllLangResTarget_ofa.mk +++ /dev/null @@ -1,32 +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/. -# -# 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 . -# - -$(eval $(call gb_AllLangResTarget_AllLangResTarget,ofa)) - -$(eval $(call gb_AllLangResTarget_set_reslocation,ofa,svx)) - -$(eval $(call gb_AllLangResTarget_add_srs,ofa,svx/ofa)) - -$(eval $(call gb_SrsTarget_SrsTarget,svx/ofa)) - -$(eval $(call gb_SrsTarget_add_files,svx/ofa,\ - svx/source/src/errtxt.src \ -)) - -# vim: set noet sw=4 ts=4: diff --git a/svx/Module_svx.mk b/svx/Module_svx.mk index c8bf3a3b7729..50a9abc18069 100644 --- a/svx/Module_svx.mk +++ b/svx/Module_svx.mk @@ -27,7 +27,6 @@ $(eval $(call gb_Module_add_targets,svx,\ $(eval $(call gb_Module_add_l10n_targets,svx,\ AllLangResTarget_svx \ - AllLangResTarget_ofa \ AllLangResTarget_gal \ UIConfig_svx \ )) diff --git a/uui/source/iahndl-errorhandler.cxx b/uui/source/iahndl-errorhandler.cxx index 3e90c6ebdb36..c69fc57d435d 100644 --- a/uui/source/iahndl-errorhandler.cxx +++ b/uui/source/iahndl-errorhandler.cxx @@ -152,7 +152,7 @@ UUIInteractionHelper::handleErrorHandlerRequest( OUString aMessage; { enum Source { SOURCE_DEFAULT, SOURCE_SVX, SOURCE_UUI }; - static char const * const aManager[3] = { "ofa", "svx", "uui" }; + static char const * const aManager[3] = { "svt", "svx", "uui" }; static sal_uInt16 const aId[3] = { RID_ERRHDL, RID_SVXERRCODE, |