untranslated strings are just strings

Change-Id: Ic7247a6d0e702572ca304bb048bfabfafcbf7505

4 files changed, 20 insertions, 8 deletions

diff --git a/desktop/inc/strings.hxx b/desktop/inc/strings.hxx
new file mode 100644
index 000000000000..f89a3028cafe
--- /dev/null
+++ b/desktop/inc/strings.hxx
@@ -0,0 +1,17 @@
+/* -*- 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_DESKTOP_INC_STRINGS_HRC
+#define INCLUDED_DESKTOP_INC_STRINGS_HRC
+
+#define RID_APPTITLE "%PRODUCTNAME %PRODUCTVERSION%PRODUCTEXTENSION"
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 8a48f0082fde..1b0d26d219a4 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -145,6 +145,8 @@
 #define GETPID getpid
 #endif
 
+#include "strings.hxx"
+
 using namespace ::com::sun::star::awt;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::util;
@@ -1467,8 +1469,7 @@ int Desktop::Main()
         SetSplashScreenProgress(30);
 
         // create title string
-        ResMgr* pLabelResMgr = GetDesktopResManager();
-        OUString aTitle = pLabelResMgr ? ResId(RID_APPTITLE, *pLabelResMgr).toString() : OUString();
+        OUString aTitle(ReplaceStringHookProc(OUString(RID_APPTITLE)));
 
 #ifdef DBG_UTIL
         //include buildid in non product builds
diff --git a/desktop/source/app/desktop.hrc b/desktop/source/app/desktop.hrc
index c4f477ec7b54..6863b1b6ed2c 100644
--- a/desktop/source/app/desktop.hrc
+++ b/desktop/source/app/desktop.hrc
@@ -54,7 +54,6 @@
 #define STR_BOOSTRAP_ERR_NOACCESSRIGHTS     (RID_DESKTOP_STRING_START+190)
 
 #define STR_TITLE_USERDATALOCKED            (RID_DESKTOP_STRING_START+206)
-#define RID_APPTITLE                        (RID_DESKTOP_STRING_START+208)
 
 #endif
 
diff --git a/desktop/source/app/desktop.src b/desktop/source/app/desktop.src
index 76eb81585790..a4dd5da46f85 100644
--- a/desktop/source/app/desktop.src
+++ b/desktop/source/app/desktop.src
@@ -124,9 +124,4 @@ 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";
 };
 
-String RID_APPTITLE
-{
-    Text = "%PRODUCTNAME %PRODUCTVERSION%PRODUCTEXTENSION" ;
-};
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */