another name for a nonlocalized string is a string

Change-Id: Ic4ff92720edd1c10dd6d5eff026e79cb02990005

5 files changed, 19 insertions, 32 deletions

diff --git a/sfx2/AllLangResTarget_sfx2.mk b/sfx2/AllLangResTarget_sfx2.mk
index b8a722fe8267..1066e2b671b1 100644
--- a/sfx2/AllLangResTarget_sfx2.mk
+++ b/sfx2/AllLangResTarget_sfx2.mk
@@ -55,8 +55,4 @@ $(eval $(call gb_SrsTarget_add_files,sfx/res,\
     sfx2/source/view/view.src \
 ))
 
-$(eval $(call gb_SrsTarget_add_nonlocalizable_files,sfx/res,\
-    sfx2/source/bastyp/bastyp.src \
-))
-
 # vim: set noet sw=4 ts=4:
diff --git a/sfx2/inc/strings.hxx b/sfx2/inc/strings.hxx
new file mode 100644
index 000000000000..aa4c0c662b26
--- /dev/null
+++ b/sfx2/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_SFX2_INC_STRINGS_HXX
+#define INCLUDED_SFX2_INC_STRINGS_HXX
+
+#define STR_HTML_GENERATOR "%PRODUCTNAME %PRODUCTVERSION%PRODUCTEXTENSION (%1)"
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/sfx2/source/bastyp/bastyp.hrc b/sfx2/source/bastyp/bastyp.hrc
index fd128686b20b..46e836f6b88a 100644
--- a/sfx2/source/bastyp/bastyp.hrc
+++ b/sfx2/source/bastyp/bastyp.hrc
@@ -24,6 +24,5 @@
 #define RC_BASTYP                                               RID_SFX_BASTYP_START
 #define STR_FILTER_NOT_INSTALLED                (RC_BASTYP +  9)
 #define STR_FILTER_CONSULT_SERVICE              (RC_BASTYP + 10)
-#define STR_HTML_GENERATOR                              (RC_BASTYP + 30)
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/bastyp/bastyp.src b/sfx2/source/bastyp/bastyp.src
deleted file mode 100644
index 8356e95b434a..000000000000
--- a/sfx2/source/bastyp/bastyp.src
+++ /dev/null
@@ -1,26 +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 "bastyp.hrc"
-
-String STR_HTML_GENERATOR
-{
-    Text = "%PRODUCTNAME %PRODUCTVERSION%PRODUCTEXTENSION (%1)" ;
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx
index 7229c66a5d85..79e2820edb80 100644
--- a/sfx2/source/bastyp/frmhtmlw.cxx
+++ b/sfx2/source/bastyp/frmhtmlw.cxx
@@ -46,6 +46,7 @@
 #include <rtl/bootstrap.hxx>
 #include <rtl/strbuf.hxx>
 #include <sax/tools/converter.hxx>
+#include "strings.hxx"
 
 using namespace ::com::sun::star;
 
@@ -126,7 +127,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const OUString& rBaseURL,
     }
 
     // Who we are
-    OUString sGenerator( SfxResId(STR_HTML_GENERATOR).toString() );
+    OUString sGenerator(STR_HTML_GENERATOR);
     OUString os( "$_OS" );
     ::rtl::Bootstrap::expandMacros(os);
     sGenerator = sGenerator.replaceFirst( "%1", os );