include/svtools/svtools.hrc | 2 -- solenv/gbuild/AllLangResTarget.mk | 26 ++++---------------------- svtools/AllLangResTarget_svt.mk | 4 ---- svtools/inc/strings.hxx | 18 ++++++++++++++++++ svtools/source/misc/ehdl.cxx | 6 +++--- svtools/source/misc/ehdl.src | 32 -------------------------------- 6 files changed, 25 insertions(+), 63 deletions(-)
New commits: commit 5bcd18461b8cb63b477dbb74025374b4c963161a Author: Caolán McNamara <[email protected]> Date: Fri Apr 28 10:17:00 2017 +0100 now this argument is always true Change-Id: I1d53ca095829b13818e58c1da1f0ed4c79a11e91 diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk index 4a0f66e50b74..3976ecc002ff 100644 --- a/solenv/gbuild/AllLangResTarget.mk +++ b/solenv/gbuild/AllLangResTarget.mk @@ -61,7 +61,7 @@ $(call gb_SrsPartMergeTarget_get_target,%) : $(SRCDIR)/% $(gb_Helper_MISCDUMMY) # translations are optional - use "wildcard" to avoid spurious re-builds # when they don't exist define gb_SrsPartMergeTarget_SrsPartMergeTarget -$(call gb_SrsPartMergeTarget__SrsPartMergeTarget_impl,$(1),$(if $(2),$(wildcard $(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(1))).po)))) +$(call gb_SrsPartMergeTarget__SrsPartMergeTarget_impl,$(1),$(wildcard $(foreach lang,$(gb_TRANS_LANGS),$(gb_POLOCATION)/$(lang)/$(patsubst %/,%,$(dir $(1))).po))) endef define gb_SrsPartMergeTarget__SrsPartMergeTarget_impl @@ -112,7 +112,7 @@ $(call gb_SrsPartTarget_get_target,$(1)) : MERGEDFILE := else $(call gb_SrsPartTarget_get_target,$(1)) : MERGEDFILE := $(call gb_SrsPartMergeTarget_get_target,$(1)) $(call gb_SrsPartTarget_get_target,$(1)) : $(call gb_SrsPartMergeTarget_get_target,$(1)) -$(call gb_SrsPartMergeTarget_SrsPartMergeTarget,$(1),$(2)) +$(call gb_SrsPartMergeTarget_SrsPartMergeTarget,$(1)) endif endef @@ -196,7 +196,7 @@ define gb_SrsTarget__add_file ifeq ($(gb_FULLDEPS),$(true)) $(call gb_SrsTarget_get_dep_target,$(1)) : $(call gb_SrsPartTarget_get_dep_target,$(2)) endif -$(call gb_SrsPartTarget_SrsPartTarget,$(2),$(3)) +$(call gb_SrsPartTarget_SrsPartTarget,$(2)) $(call gb_SrsTarget_get_target,$(1)) : $(call gb_SrsPartTarget_get_target,$(2)) $(call gb_SrsPartTarget_get_target,$(2)) :| $(call gb_SrsTarget_get_headers_target,$(1)) $(call gb_SrsTarget_get_clean_target,$(1)) : PARTS += $(2) @@ -208,7 +208,7 @@ endif endef define gb_SrsTarget_add_file -$(call gb_SrsTarget__add_file,$(1),$(2),$(true)) +$(call gb_SrsTarget__add_file,$(1),$(2)) endef commit 6bd8918e5d14ae82ec1fd402f3b4ae2c01900d0f Author: Caolán McNamara <[email protected]> Date: Fri Apr 28 10:13:19 2017 +0100 gb_SrsTarget_add_nonlocalizable_file is now unused Change-Id: Ia525e2a3bdb9a7342fbb0982f637d926c5de9a38 diff --git a/solenv/gbuild/AllLangResTarget.mk b/solenv/gbuild/AllLangResTarget.mk index 2e3c114c1be0..4a0f66e50b74 100644 --- a/solenv/gbuild/AllLangResTarget.mk +++ b/solenv/gbuild/AllLangResTarget.mk @@ -217,24 +217,6 @@ $(foreach file,$(2),$(call gb_SrsTarget_add_file,$(1),$(file))) endef -# Add a srs file that does not have any localizable content. -# These files will be copied instead of parsing them with transex3. -# -# gb_SrsTarget_add_nonlocalizable_file srs file -define gb_SrsTarget_add_nonlocalizable_file -$(call gb_SrsTarget__add_file,$(1),$(2),$(false)) - -endef - -# Add srs files that do not have any localizable content. -# -# gb_SrsTarget_add_nonlocalizable_files srs file(s) -define gb_SrsTarget_add_nonlocalizable_files -$(foreach file,$(2),$(call gb_SrsTarget_add_nonlocalizable_file,$(1),$(file))) - -endef - - # ResTarget gb_ResTarget_DEFIMAGESLOCATION := $(SRCDIR)/icon-themes/galaxy/ commit 0a10bdd0b838a3bc792de5421414fecbe8575550 Author: Caolán McNamara <[email protected]> Date: Fri Apr 28 10:09:32 2017 +0100 another name for a nonlocalized string is a string Change-Id: I165d74c59d1cccba295072a3df7b9f54dfb60449 diff --git a/include/svtools/svtools.hrc b/include/svtools/svtools.hrc index d2cc41dc5a47..7dc331fe91a8 100644 --- a/include/svtools/svtools.hrc +++ b/include/svtools/svtools.hrc @@ -124,8 +124,6 @@ #define STR_SVT_FONTMAP_END (STR_SVT_FONTMAP_NOTAVAILABLE) #define STR_SVT_ERRORCONTEXT_START (STR_SVT_FONTMAP_END+1) -#define STR_ERR_HDLMESS (STR_SVT_ERRORCONTEXT_START+0) -#define RID_ERRHDL_CLASS (STR_SVT_ERRORCONTEXT_START+1) #define RID_ERRCTX (STR_SVT_ERRORCONTEXT_START+2) #define RID_ERRHDL (STR_SVT_ERRORCONTEXT_START+3) #define STR_SVT_ERRORCONTEXT_END (RID_ERRHDL) diff --git a/svtools/AllLangResTarget_svt.mk b/svtools/AllLangResTarget_svt.mk index b0a7545da7d2..eea65ca9354c 100644 --- a/svtools/AllLangResTarget_svt.mk +++ b/svtools/AllLangResTarget_svt.mk @@ -55,8 +55,4 @@ $(eval $(call gb_SrsTarget_add_files,svt/res,\ svtools/source/misc/undo.src \ )) -$(eval $(call gb_SrsTarget_add_nonlocalizable_files,svt/res,\ - svtools/source/misc/ehdl.src \ -)) - # vim: set noet sw=4 ts=4: diff --git a/svtools/inc/strings.hxx b/svtools/inc/strings.hxx new file mode 100644 index 000000000000..68fca72f9aa2 --- /dev/null +++ b/svtools/inc/strings.hxx @@ -0,0 +1,18 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * 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/. + */ + +#ifndef INCLUDED_SVTOOLS_INC_STRINGS_HXX +#define INCLUDED_SVTOOLS_INC_STRINGS_HXX + +#define STR_ERR_HDLMESS "$(ACTION)$(ERROR)" +#define RID_ERRHDL_CLASS "$(CLASS)$(ERROR)" + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx index 850813183f78..8ee0afb640ae 100644 --- a/svtools/source/misc/ehdl.cxx +++ b/svtools/source/misc/ehdl.cxx @@ -30,7 +30,7 @@ #include <svtools/svtools.hrc> #include <svtools/sfxecode.hxx> #include <memory> - +#include "strings.hxx" static DialogMask aWndFunc( vcl::Window *pWin, // Parent of the dialog @@ -84,7 +84,7 @@ static DialogMask aWndFunc( default: break; } - OUString aErr(SvtResId(STR_ERR_HDLMESS).toString()); + OUString aErr(STR_ERR_HDLMESS); OUString aAction(rAction); if ( !aAction.isEmpty() ) aAction += ":\n"; @@ -227,7 +227,7 @@ bool SfxErrorHandler::GetErrorString(sal_uLong lErrId, OUString &rStr) const SolarMutexGuard aGuard; bool bRet = false; - rStr = SvtResId(RID_ERRHDL_CLASS).toString(); + rStr = RID_ERRHDL_CLASS; ResStringArray aEr(ResId(nId, *pMgr)); sal_uInt32 nErrIdx = aEr.FindIndex((sal_uInt16)lErrId); diff --git a/svtools/source/misc/ehdl.src b/svtools/source/misc/ehdl.src deleted file mode 100644 index 6e0fd3bcbf3b..000000000000 --- a/svtools/source/misc/ehdl.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 <svtools/svtools.hrc> -#include <svtools/sfxecode.hxx> - -String STR_ERR_HDLMESS -{ - Text = "$(ACTION)$(ERROR)" ; -}; -String RID_ERRHDL_CLASS -{ - Text = "$(CLASS)$(ERROR)" ; -}; - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
