another name for a nonlocalized string is a string

Change-Id: I165d74c59d1cccba295072a3df7b9f54dfb60449

4 files changed, 21 insertions, 39 deletions

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: */