migrate to boost::gettext

* all .ui files go from <interface> to <interface domain="MODULE"> e.g. vcl
* all .src files go away and the english source strings folded into the .hrc as NC_("context", "source string")
* ResMgr is dropped in favour of std::locale imbued by boost::locale::generator pointed at matching
  MODULE .mo files
* UIConfig translations are folded into the module .mo, so e.g. UIConfig_cui
  goes from l10n target to normal one, so the res/lang.zips of UI files go away
* translation via Translation::get(hrc-define-key, imbued-std::locale)
* python can now be translated with its inbuilt gettext support (we keep the name strings.hrc there
  to keep finding the .hrc file uniform) so magic numbers can go away there
* java and starbasic components can be translated via the pre-existing css.resource.StringResourceWithLocation
  mechanism
* en-US res files go away, their strings are now the .hrc keys in the source code
* remaining .res files are replaced by .mo files
* in .res/.ui-lang-zip files, the old scheme missing translations of strings
  results in inserting the english original so something can be found, now the
  standard fallback of using the english original from the source key is used, so
  partial translations shrink dramatically in size
* extract .hrc strings with hrcex which backs onto
   xgettext -C --add-comments --keyword=NC_:1c,2 --from-code=UTF-8 --no-wrap
* extract .ui strings with uiex which backs onto
   xgettext --add-comments --no-wrap
* qtz for gettext translations is generated at runtime as ascii-ified crc32 of
   content + "|" + msgid
* [API CHANGE] remove deprecated binary .res resouce loader related uno apis
      com::sun::star::resource::OfficeResourceLoader
      com::sun::star::resource::XResourceBundleLoader
      com::sun::star::resource::XResourceBundle
    when translating strings via uno apis
      com.sun.star.resource.StringResourceWithLocation
    can continue to be used

Change-Id: Ia2594a2672b7301d9c3421fdf31b6cfe7f3f8d0a

10 files changed, 44 insertions, 368 deletions

diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index 0977fa5f1d9b..b418f1ed7a2c 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -83,7 +83,7 @@
 #include "sdpage.hxx"
 #include "pglink.hxx"
 #include "sdattr.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "glob.hxx"
 #include "stlpool.hxx"
 #include "sdiocmpt.hxx"
diff --git a/sd/source/core/drawdoc2.cxx b/sd/source/core/drawdoc2.cxx
index 879c21425742..62d29944df2c 100644
--- a/sd/source/core/drawdoc2.cxx
+++ b/sd/source/core/drawdoc2.cxx
@@ -53,7 +53,7 @@
 #include "drawdoc.hxx"
 #include "sdpage.hxx"
 #include "pglink.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "glob.hxx"
 #include "stlpool.hxx"
 #include "sdiocmpt.hxx"
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index 16a33155df95..ff6a01e2f406 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -42,7 +42,7 @@
 #include <sot/formats.hxx>
 #include <xmloff/autolayout.hxx>
 
-#include "glob.hrc"
+#include "strings.hrc"
 #include "drawdoc.hxx"
 #include "sdpage.hxx"
 #include "stlpool.hxx"
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 3b870da22f9e..7870ff056f3a 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -43,7 +43,7 @@
 #include <editeng/lspcitem.hxx>
 #include <editeng/adjustitem.hxx>
 #include <editeng/numdef.hxx>
-#include <svx/dialogs.hrc>
+#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 #include <editeng/bulletitem.hxx>
 #include <svx/xtable.hxx>
@@ -97,7 +97,7 @@
 #include "sdresid.hxx"
 #include "drawdoc.hxx"
 #include "sdpage.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "glob.hxx"
 #include "stlpool.hxx"
 #include "helpids.h"
diff --git a/sd/source/core/glob.src b/sd/source/core/glob.src
deleted file mode 100644
index 459e194381e1..000000000000
--- a/sd/source/core/glob.src
+++ /dev/null
@@ -1,324 +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 .
- */
-/* StarView resource file */
-
-#include "glob.hrc"
-#include "sderror.hxx"
-
-String STR_LAYER_BCKGRND
-{
-    Text [ en-US ] = "Background" ;
-};
-String STR_LAYER_BCKGRNDOBJ
-{
-    Text [ en-US ] = "Background objects" ;
-};
-String STR_LAYER_LAYOUT
-{
-    Text [ en-US ] = "Layout" ;
-};
-String STR_LAYER_CONTROLS
-{
-    Text [ en-US ] = "Controls" ;
-};
-String STR_LAYER_MEASURELINES
-{
-    Text [ en-US ] = "Dimension Lines" ;
-};
-String STR_PAGE
-{
-    Text [ en-US ] = "Slide" ;
-};
-String STR_PAGE_NAME
-{
-    Text [ en-US ] = "Page" ;
-};
-String STR_SLIDE_NAME
-{
-    Text [ en-US ] = "Slide" ;
-};
-String STR_MASTERSLIDE_NAME
-{
-    Text [ en-US ] = "Master Slide";
-};
-String STR_MASTERPAGE_NAME
-{
-    Text [ en-US ] = "Master Page";
-};
-String STR_NOTES
-{
-    Text [ en-US ] = "(Notes)" ;
-};
-String STR_HANDOUT
-{
-    Text [ en-US ] = "Handouts" ;
-};
-String STR_PRESOBJ_MPTITLE
-{
-    Text [ en-US ] = "Click to edit the title text format" ;
-};
-String STR_PRESOBJ_MPOUTLINE
-{
-    Text [ en-US ] = "Click to edit the outline text format" ;
-};
-String STR_PRESOBJ_MPOUTLLAYER2
-{
-    Text [ en-US ] = "Second Outline Level" ;
-};
-String STR_PRESOBJ_MPOUTLLAYER3
-{
-    Text [ en-US ] = "Third Outline Level" ;
-};
-String STR_PRESOBJ_MPOUTLLAYER4
-{
-    Text [ en-US ] = "Fourth Outline Level" ;
-};
-String STR_PRESOBJ_MPOUTLLAYER5
-{
-    Text [ en-US ] = "Fifth Outline Level" ;
-};
-String STR_PRESOBJ_MPOUTLLAYER6
-{
-    Text [ en-US ] = "Sixth Outline Level" ;
-};
-String STR_PRESOBJ_MPOUTLLAYER7
-{
-    Text [ en-US ] = "Seventh Outline Level" ;
-};
-String STR_PRESOBJ_MPNOTESTITLE
-{
-    Text [ en-US ] = "Click to move the slide" ;
-};
-String STR_PRESOBJ_MPNOTESTEXT
-{
-    Text [ en-US ] = "Click to edit the notes format" ;
-};
-String STR_PRESOBJ_TITLE
-{
-    Text [ en-US ] = "Click to add Title" ;
-};
-String STR_PRESOBJ_OUTLINE
-{
-    Text [ en-US ] = "Click to add Text" ;
-};
-String STR_PRESOBJ_TEXT
-{
-    Text [ en-US ] = "Click to add Text" ;
-};
-String STR_PRESOBJ_NOTESTEXT
-{
-    Text [ en-US ] = "Click to add Notes" ;
-};
-String STR_PRESOBJ_GRAPHIC
-{
-    Text [ en-US ] = "Double-click to add an Image" ;
-};
-String STR_PRESOBJ_OBJECT
-{
-    Text [ en-US ] = "Double-click to add an Object" ;
-};
-String STR_PRESOBJ_CHART
-{
-    Text [ en-US ] = "Double-click to add a Chart" ;
-};
-String STR_PRESOBJ_ORGCHART
-{
-    Text [ en-US ] = "Double-click to add an Organization Chart" ;
-};
-String STR_PRESOBJ_TABLE
-{
-    Text [ en-US ] = "Double-click to add a Spreadsheet" ;
-};
-String STR_LAYOUT_DEFAULT_NAME
-{
-    Text [ en-US ] = "Default" ;
-};
-String STR_LAYOUT_DEFAULT_TITLE_NAME
-{
-    Text [ en-US ] = "Title" ;
-};
-String STR_STANDARD_STYLESHEET_NAME
-{
-    Text [ en-US ] = "Default" ;
-};
-String STR_UNDO_MOVEPAGES
-{
-    Text [ en-US ] = "Move slides" ;
-};
-String STR_POOLSHEET_MEASURE
-{
-    Text [ en-US ] = "Dimension Line" ;
-};
-String STR_POOLSHEET_OBJNOLINENOFILL
-{
-    Text [ en-US ] = "Object with no fill and no line" ;
-};
-String STR_POOLSHEET_OBJWITHARROW
-{
-    Text [ en-US ] = "Object with arrow" ;
-};
-String STR_POOLSHEET_OBJWITHSHADOW
-{
-    Text [ en-US ] = "Object with shadow" ;
-};
-String STR_POOLSHEET_OBJWITHOUTFILL
-{
-    Text [ en-US ] = "Object without fill" ;
-};
-String STR_POOLSHEET_TEXT
-{
-    Text [ en-US ] = "Text" ;
-};
-String STR_POOLSHEET_TEXTBODY
-{
-    Text [ en-US ] = "Text body" ;
-};
-String STR_POOLSHEET_TEXTBODY_JUSTIFY
-{
-    Text [ en-US ] = "Text body justified" ;
-};
-String STR_POOLSHEET_TEXTBODY_INDENT
-{
-    Text [ en-US ] = "First line indent" ;
-};
-String STR_POOLSHEET_TITLE
-{
-    Text [ en-US ] = "Title" ;
-};
-String STR_POOLSHEET_TITLE1
-{
-    Text [ en-US ] = "Title1" ;
-};
-String STR_POOLSHEET_TITLE2
-{
-    Text [ en-US ] = "Title2" ;
-};
-String STR_POOLSHEET_HEADLINE
-{
-    Text [ en-US ] = "Heading" ;
-};
-String STR_POOLSHEET_HEADLINE1
-{
-    Text [ en-US ] = "Heading1" ;
-};
-
-String STR_POOLSHEET_HEADLINE2
-{
-    Text [ en-US ] = "Heading2" ;
-};
-String STR_PSEUDOSHEET_TITLE
-{
-    Text [ en-US ] = "Title" ;
-};
-String STR_PSEUDOSHEET_SUBTITLE
-{
-    Text [ en-US ] = "Subtitle";
-};
-String STR_PSEUDOSHEET_OUTLINE
-{
-    Text [ en-US ] = "Outline" ;
-};
-String STR_PSEUDOSHEET_BACKGROUNDOBJECTS
-{
-    Text [ en-US ] = "Background objects" ;
-};
-String STR_PSEUDOSHEET_BACKGROUND
-{
-    Text [ en-US ] = "Background" ;
-};
-String STR_PSEUDOSHEET_NOTES
-{
-    Text [ en-US ] = "Notes" ;
-};
-
-String STR_POWERPOINT_IMPORT
-{
-    Text [ en-US ] = "PowerPoint Import";
-};
-
-String STR_LOAD_DOC
-{
-    Text [ en-US ] = "Load Document" ;
-};
-String STR_SAVE_DOC
-{
-    Text [ en-US ] = "Save Document" ;
-};
-
-#define ERR_CODE( class, err )  (class | (err - ERROR_SD_BASE))
-#define WARN_CODE( class, err ) (class | ( err - WARN_SD_BASE))
-
-StringArray RID_SD_ERRHDL
-{
-    ItemList [ en-US ] =
-    {
-        < "File format error found at $(ARG1)(row,col)." ;
-          ERR_CODE ( ERRCODE_CLASS_READ , ERR_FORMAT_ROWCOL ) ; >;
-        < "Format error discovered in the file in sub-document $(ARG1) at position $(ARG2)(row,col).";
-          ERR_CODE ( ERRCODE_CLASS_READ , ERR_FORMAT_FILE_ROWCOL ) ; >;
-        < "Format error discovered in the file in sub-document $(ARG1) at position $(ARG2)(row,col).";
-          ERR_CODE ( ERRCODE_CLASS_READ , WARN_FORMAT_FILE_ROWCOL ) ; >;
-    };
-};
-
-String STR_POOLSHEET_BANDED_CELL
-{
-    Text [ en-US ] = "Banding cell" ;
-};
-
-String STR_POOLSHEET_HEADER
-{
-    Text [ en-US ] = "Header" ;
-};
-
-String STR_POOLSHEET_TOTAL
-{
-    Text [ en-US ] = "Total line" ;
-};
-
-String STR_POOLSHEET_FIRST_COLUMN
-{
-    Text [ en-US ] = "First column" ;
-};
-
-String STR_POOLSHEET_LAST_COLUMN
-{
-    Text [ en-US ] = "Last column" ;
-};
-
-String STR_ENTER_PIN
-{
-    Text [ en-US ] = "Enter PIN:";
-};
-
-String STR_DEAUTHORISE_CLIENT
-{
-    Text [ en-US ] = "Remove client authorisation";
-};
-
-String STR_SHRINK_FONT_SIZE
-{
-    Text [ en-US ] = "Shrink font size";
-};
-String STR_GROW_FONT_SIZE
-{
-    Text [ en-US ] = "Grow font size";
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 65539844c4ed..15ba3c9fb9a1 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -69,7 +69,7 @@
 #include "pglink.hxx"
 #include "sdresid.hxx"
 #include "stlsheet.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "strings.hxx"
 #include "bitmaps.hlst"
 #include "glob.hxx"
diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx
index 6fbc8be11560..0c333b006999 100644
--- a/sd/source/core/sdpage2.cxx
+++ b/sd/source/core/sdpage2.cxx
@@ -35,7 +35,7 @@
 #include "sdresid.hxx"
 #include "sdpage.hxx"
 #include "glob.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "drawdoc.hxx"
 #include "stlpool.hxx"
 #include "pglink.hxx"
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index fc6fdaa297b2..8d3d3b697b7b 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -58,7 +58,7 @@
 #include "stlpool.hxx"
 #include "sdresid.hxx"
 #include "stlsheet.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "glob.hxx"
 #include "drawdoc.hxx"
 #include "sdmod.hxx"
@@ -950,28 +950,28 @@ void SdStyleSheetPool::UpdateStdNames()
 
             bool bHelpKnown = true;
             OUString aNewName;
-            sal_uInt16 nNameId = 0;
+            const char* pNameId = nullptr;
             switch( nHelpId )
             {
-                case HID_STANDARD_STYLESHEET_NAME:  nNameId = STR_STANDARD_STYLESHEET_NAME; break;
-                case HID_POOLSHEET_OBJWITHARROW:    nNameId = STR_POOLSHEET_OBJWITHARROW;   break;
-                case HID_POOLSHEET_OBJWITHSHADOW:   nNameId = STR_POOLSHEET_OBJWITHSHADOW;  break;
-                case HID_POOLSHEET_OBJWITHOUTFILL:  nNameId = STR_POOLSHEET_OBJWITHOUTFILL; break;
-                case HID_POOLSHEET_OBJNOLINENOFILL: nNameId = STR_POOLSHEET_OBJNOLINENOFILL;break;
-                case HID_POOLSHEET_TEXT:            nNameId = STR_POOLSHEET_TEXT;           break;
-                case HID_POOLSHEET_TEXTBODY:        nNameId = STR_POOLSHEET_TEXTBODY;       break;
-                case HID_POOLSHEET_TEXTBODY_JUSTIFY:nNameId = STR_POOLSHEET_TEXTBODY_JUSTIFY;break;
-                case HID_POOLSHEET_TEXTBODY_INDENT: nNameId = STR_POOLSHEET_TEXTBODY_INDENT;break;
-                case HID_POOLSHEET_TITLE:           nNameId = STR_POOLSHEET_TITLE;          break;
-                case HID_POOLSHEET_TITLE1:          nNameId = STR_POOLSHEET_TITLE1;         break;
-                case HID_POOLSHEET_TITLE2:          nNameId = STR_POOLSHEET_TITLE2;         break;
-                case HID_POOLSHEET_HEADLINE:        nNameId = STR_POOLSHEET_HEADLINE;       break;
-                case HID_POOLSHEET_HEADLINE1:       nNameId = STR_POOLSHEET_HEADLINE1;      break;
-                case HID_POOLSHEET_HEADLINE2:       nNameId = STR_POOLSHEET_HEADLINE2;      break;
-                case HID_POOLSHEET_MEASURE:         nNameId = STR_POOLSHEET_MEASURE;        break;
-
-                case HID_PSEUDOSHEET_TITLE:         nNameId = STR_PSEUDOSHEET_TITLE;        break;
-                case HID_PSEUDOSHEET_SUBTITLE:      nNameId = STR_PSEUDOSHEET_SUBTITLE;     break;
+                case HID_STANDARD_STYLESHEET_NAME:  pNameId = STR_STANDARD_STYLESHEET_NAME; break;
+                case HID_POOLSHEET_OBJWITHARROW:    pNameId = STR_POOLSHEET_OBJWITHARROW;   break;
+                case HID_POOLSHEET_OBJWITHSHADOW:   pNameId = STR_POOLSHEET_OBJWITHSHADOW;  break;
+                case HID_POOLSHEET_OBJWITHOUTFILL:  pNameId = STR_POOLSHEET_OBJWITHOUTFILL; break;
+                case HID_POOLSHEET_OBJNOLINENOFILL: pNameId = STR_POOLSHEET_OBJNOLINENOFILL;break;
+                case HID_POOLSHEET_TEXT:            pNameId = STR_POOLSHEET_TEXT;           break;
+                case HID_POOLSHEET_TEXTBODY:        pNameId = STR_POOLSHEET_TEXTBODY;       break;
+                case HID_POOLSHEET_TEXTBODY_JUSTIFY:pNameId = STR_POOLSHEET_TEXTBODY_JUSTIFY;break;
+                case HID_POOLSHEET_TEXTBODY_INDENT: pNameId = STR_POOLSHEET_TEXTBODY_INDENT;break;
+                case HID_POOLSHEET_TITLE:           pNameId = STR_POOLSHEET_TITLE;          break;
+                case HID_POOLSHEET_TITLE1:          pNameId = STR_POOLSHEET_TITLE1;         break;
+                case HID_POOLSHEET_TITLE2:          pNameId = STR_POOLSHEET_TITLE2;         break;
+                case HID_POOLSHEET_HEADLINE:        pNameId = STR_POOLSHEET_HEADLINE;       break;
+                case HID_POOLSHEET_HEADLINE1:       pNameId = STR_POOLSHEET_HEADLINE1;      break;
+                case HID_POOLSHEET_HEADLINE2:       pNameId = STR_POOLSHEET_HEADLINE2;      break;
+                case HID_POOLSHEET_MEASURE:         pNameId = STR_POOLSHEET_MEASURE;        break;
+
+                case HID_PSEUDOSHEET_TITLE:         pNameId = STR_PSEUDOSHEET_TITLE;        break;
+                case HID_PSEUDOSHEET_SUBTITLE:      pNameId = STR_PSEUDOSHEET_SUBTITLE;     break;
                 case HID_PSEUDOSHEET_OUTLINE1:
                 case HID_PSEUDOSHEET_OUTLINE2:
                 case HID_PSEUDOSHEET_OUTLINE3:
@@ -980,17 +980,17 @@ void SdStyleSheetPool::UpdateStdNames()
                 case HID_PSEUDOSHEET_OUTLINE6:
                 case HID_PSEUDOSHEET_OUTLINE7:
                 case HID_PSEUDOSHEET_OUTLINE8:
-                case HID_PSEUDOSHEET_OUTLINE9:      nNameId = STR_PSEUDOSHEET_OUTLINE;      break;
-                case HID_PSEUDOSHEET_BACKGROUNDOBJECTS: nNameId = STR_PSEUDOSHEET_BACKGROUNDOBJECTS; break;
-                case HID_PSEUDOSHEET_BACKGROUND:    nNameId = STR_PSEUDOSHEET_BACKGROUND;   break;
-                case HID_PSEUDOSHEET_NOTES:         nNameId = STR_PSEUDOSHEET_NOTES;        break;
-
-                case HID_SD_CELL_STYLE_DEFAULT:         nNameId = STR_STANDARD_STYLESHEET_NAME; break;
-                case HID_SD_CELL_STYLE_BANDED:          nNameId = STR_POOLSHEET_BANDED_CELL; break;
-                case HID_SD_CELL_STYLE_HEADER:          nNameId = STR_POOLSHEET_HEADER; break;
-                case HID_SD_CELL_STYLE_TOTAL:           nNameId = STR_POOLSHEET_TOTAL; break;
-                case HID_SD_CELL_STYLE_FIRST_COLUMN:    nNameId = STR_POOLSHEET_FIRST_COLUMN; break;
-                case HID_SD_CELL_STYLE_LAST_COLUMN:     nNameId = STR_POOLSHEET_LAST_COLUMN; break;
+                case HID_PSEUDOSHEET_OUTLINE9:      pNameId = STR_PSEUDOSHEET_OUTLINE;      break;
+                case HID_PSEUDOSHEET_BACKGROUNDOBJECTS: pNameId = STR_PSEUDOSHEET_BACKGROUNDOBJECTS; break;
+                case HID_PSEUDOSHEET_BACKGROUND:    pNameId = STR_PSEUDOSHEET_BACKGROUND;   break;
+                case HID_PSEUDOSHEET_NOTES:         pNameId = STR_PSEUDOSHEET_NOTES;        break;
+
+                case HID_SD_CELL_STYLE_DEFAULT:         pNameId = STR_STANDARD_STYLESHEET_NAME; break;
+                case HID_SD_CELL_STYLE_BANDED:          pNameId = STR_POOLSHEET_BANDED_CELL; break;
+                case HID_SD_CELL_STYLE_HEADER:          pNameId = STR_POOLSHEET_HEADER; break;
+                case HID_SD_CELL_STYLE_TOTAL:           pNameId = STR_POOLSHEET_TOTAL; break;
+                case HID_SD_CELL_STYLE_FIRST_COLUMN:    pNameId = STR_POOLSHEET_FIRST_COLUMN; break;
+                case HID_SD_CELL_STYLE_LAST_COLUMN:     pNameId = STR_POOLSHEET_LAST_COLUMN; break;
 
                 default:
                     // 0 or wrong (old) HelpId
@@ -998,10 +998,10 @@ void SdStyleSheetPool::UpdateStdNames()
             }
             if( bHelpKnown )
             {
-                if( nNameId )
+                if (pNameId)
                 {
-                    aNewName = SdResId( nNameId );
-                    if( nNameId == STR_PSEUDOSHEET_OUTLINE )
+                    aNewName = SdResId(pNameId);
+                    if (strcmp(pNameId, STR_PSEUDOSHEET_OUTLINE) == 0)
                     {
                         aNewName += " " + OUString::number( sal_Int32( nHelpId - HID_PSEUDOSHEET_OUTLINE ) );
                     }
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 8f7430a8cdd2..18a785284620 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -46,7 +46,7 @@
 #include "sdpage.hxx"
 #include "drawdoc.hxx"
 #include "stlpool.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "app.hrc"
 #include "strings.hxx"
 #include "glob.hxx"
diff --git a/sd/source/core/undoanim.cxx b/sd/source/core/undoanim.cxx
index bc7215554e21..d9c7fc291a77 100644
--- a/sd/source/core/undoanim.cxx
+++ b/sd/source/core/undoanim.cxx
@@ -23,7 +23,7 @@
 #include "CustomAnimationCloner.hxx"
 
 #include "undoanim.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "sdpage.hxx"
 #include "sdresid.hxx"
 #include "CustomAnimationEffect.hxx"