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

35 files changed, 88 insertions, 265 deletions

diff --git a/sd/source/ui/view/DocumentRenderer.cxx b/sd/source/ui/view/DocumentRenderer.cxx
index a6966be40195..358a17ea0879 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -20,6 +20,7 @@
 #include <com/sun/star/beans/XPropertySet.hpp>
 
 #include "DocumentRenderer.hxx"
+#include "DocumentRenderer.hrc"
 
 #include "drawdoc.hxx"
 #include "optsitem.hxx"
@@ -47,7 +48,6 @@
 #include <svx/svdopath.hxx>
 #include <svx/xlnclit.hxx>
 #include <toolkit/awt/vclxdevice.hxx>
-#include <tools/resary.hxx>
 #include <unotools/localedatawrapper.hxx>
 #include <vcl/msgbox.hxx>
 #include <unotools/moduleoptions.hxx>
@@ -395,7 +395,7 @@ namespace {
                                     SdResId(STR_IMPRESS_PRINT_UI_CONTENT),
                                     aHelpIds,
                                     "PageContentType" ,
-                                    CreateChoice(STR_IMPRESS_PRINT_UI_CONTENT_CHOICES),
+                                    CreateChoice(STR_IMPRESS_PRINT_UI_CONTENT_CHOICES, SAL_N_ELEMENTS(STR_IMPRESS_PRINT_UI_CONTENT_CHOICES)),
                                     0)
                                 );
 
@@ -420,7 +420,7 @@ namespace {
                                     SdResId(STR_IMPRESS_PRINT_UI_ORDER),
                                     aHelpIds,
                                     "SlidesPerPageOrder" ,
-                                    CreateChoice(STR_IMPRESS_PRINT_UI_ORDER_CHOICES),
+                                    CreateChoice(STR_IMPRESS_PRINT_UI_ORDER_CHOICES, SAL_N_ELEMENTS(STR_IMPRESS_PRINT_UI_ORDER_CHOICES)),
                                     0,
                                     Sequence< sal_Bool >(),
                                     aSlidesPerPageOpt )
@@ -486,7 +486,7 @@ namespace {
                                 "",
                                 aHelpIds,
                                 "Quality" ,
-                                CreateChoice(STR_IMPRESS_PRINT_UI_QUALITY_CHOICES),
+                                CreateChoice(STR_IMPRESS_PRINT_UI_QUALITY_CHOICES, SAL_N_ELEMENTS(STR_IMPRESS_PRINT_UI_QUALITY_CHOICES)),
                                 0)
                             );
 
@@ -510,7 +510,8 @@ namespace {
                                 "",
                                 aHelpIds,
                                 "PageOptions" ,
-                                CreateChoice(mbImpress ? STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES : STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW),
+                                mbImpress ? CreateChoice(STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES, SAL_N_ELEMENTS(STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES)) :
+                                            CreateChoice(STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW, SAL_N_ELEMENTS(STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW)),
                                 0,
                                 Sequence< sal_Bool >(),
                                 aPageOptionsOpt
@@ -543,7 +544,7 @@ namespace {
                                 SdResId(STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE),
                                 aHelpIds,
                                 "PrintProspectInclude" ,
-                                CreateChoice(STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST),
+                                CreateChoice(STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST, SAL_N_ELEMENTS(STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST)),
                                 0,
                                 Sequence< sal_Bool >(),
                                 aIncludeOpt
@@ -612,9 +613,8 @@ namespace {
             AddDialogControl( vcl::PrinterOptionsHelper::setChoiceRadiosControlOpt(aWidgetIds, "",
                                 aHelpIds,
                                 aPrintRangeName,
-                                CreateChoice(mbImpress
-                                             ? STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE
-                                             : STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE),
+                                mbImpress ? CreateChoice(STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE, SAL_N_ELEMENTS(STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE)) :
+                                            CreateChoice(STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE, SAL_N_ELEMENTS(STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE)),
                                 nPrintRange )
                             );
             // create a an Edit dependent on "Pages" selected
@@ -631,23 +631,18 @@ namespace {
             maProperties.push_back( aVal );
         }
 
-        static Sequence<OUString> CreateChoice (const sal_uInt16 nResourceId)
+        static Sequence<OUString> CreateChoice(const char** pResourceId, size_t nCount)
         {
-            ResId aResourceId(nResourceId, *SD_MOD()->GetResMgr());
-            ResStringArray aChoiceStrings (aResourceId);
-
-            const sal_uInt32 nCount (aChoiceStrings.Count());
             Sequence<OUString> aChoices (nCount);
-            for (sal_uInt32 nIndex=0; nIndex<nCount; ++nIndex)
-                aChoices[nIndex] = aChoiceStrings.GetString(nIndex);
-
+            for (size_t nIndex=0; nIndex < nCount; ++nIndex)
+                aChoices[nIndex] = SdResId(pResourceId[nIndex]);
             return aChoices;
         }
 
         Sequence<OUString> GetSlidesPerPageSequence()
         {
             const Sequence<OUString> aChoice (
-                CreateChoice(STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES));
+                CreateChoice(STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES, SAL_N_ELEMENTS(STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES)));
             maSlidesPerPage.clear();
             maSlidesPerPage.push_back(0); // first is using the default
             for (sal_Int32 nIndex=1,nCount=aChoice.getLength(); nIndex<nCount; ++nIndex)
diff --git a/sd/source/ui/view/DocumentRenderer.src b/sd/source/ui/view/DocumentRenderer.src
deleted file mode 100644
index c5c6852e35a6..000000000000
--- a/sd/source/ui/view/DocumentRenderer.src
+++ /dev/null
@@ -1,181 +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 "app.hrc"
-#include "strings.hrc"
-
-String STR_IMPRESS_PRINT_UI_GROUP_NAME
-{
-    Text [en-US] = "%PRODUCTNAME %s";
-};
-String STR_IMPRESS_PRINT_UI_PRINT_GROUP
-{
-    Text [ en-US ] = "Print";
-};
-String STR_IMPRESS_PRINT_UI_CONTENT
-{
-    Text [ en-US ] = "Document";
-};
-StringArray STR_IMPRESS_PRINT_UI_CONTENT_CHOICES
-{
-    ItemList [ en-US ] =
-    {
-        < "Slides" ; > ;
-        < "Handouts" ; > ;
-        < "Notes" ; > ;
-        < "Outline" ; > ;
-    };
-};
-String STR_IMPRESS_PRINT_UI_SLIDESPERPAGE
-{
-    Text [ en-US ] = "Slides per page" ;
-};
-StringArray STR_IMPRESS_PRINT_UI_SLIDESPERPAGE_CHOICES
-{
-    ItemList [ en-US ] =
-    {
-        < "According to layout" ; > ;
-        < "1" ; > ;
-        < "2" ; > ;
-        < "3" ; > ;
-        < "4" ; > ;
-        < "6" ; > ;
-        < "9" ; > ;
-    };
-};
-String STR_IMPRESS_PRINT_UI_ORDER
-{
-    Text [ en-US ] = "Order" ;
-};
-StringArray STR_IMPRESS_PRINT_UI_ORDER_CHOICES
-{
-    ItemList [ en-US ] =
-    {
-        < "Left to right, then down" ; > ;
-        < "Top to bottom, then right" ; > ;
-    };
-};
-String STR_IMPRESS_PRINT_UI_INCLUDE_CONTENT
-{
-    Text [ en-US ] = "~Contents";
-};
-String STR_IMPRESS_PRINT_UI_IS_PRINT_NAME
-{
-    Text [ en-US ] = "~Slide name";
-};
-String STR_DRAW_PRINT_UI_IS_PRINT_NAME
-{
-    Text [ en-US ] = "P~age name";
-};
-String STR_IMPRESS_PRINT_UI_IS_PRINT_DATE
-{
-    Text [ en-US ] = "~Date and time";
-};
-String STR_IMPRESS_PRINT_UI_IS_PRINT_HIDDEN
-{
-    Text [ en-US ] = "Hidden pages";
-};
-String STR_IMPRESS_PRINT_UI_QUALITY
-{
-    Text [ en-US ] = "Color";
-};
-StringArray STR_IMPRESS_PRINT_UI_QUALITY_CHOICES
-{
-    ItemList [ en-US ] =
-    {
-        < "Original colors" ; > ;
-        < "Grayscale" ; > ;
-        < "Black & white" ; > ;
-    };
-};
-String STR_IMPRESS_PRINT_UI_PAGE_OPTIONS
-{
-    Text [ en-US ] = "~Size";
-};
-StringArray STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES
-{
-    ItemList [ en-US ] =
-    {
-        < "Original size" ; > ;
-        < "Fit to printable page" ; > ;
-        < "Distribute on multiple sheets of paper" ; > ;
-        < "Tile sheet of paper with repeated slides" ; > ;
-    };
-};
-StringArray STR_IMPRESS_PRINT_UI_PAGE_OPTIONS_CHOICES_DRAW
-{
-    ItemList [ en-US ] =
-    {
-        < "Original size" ; > ;
-        < "Fit to printable page" ; > ;
-        < "Distribute on multiple sheets of paper" ; > ;
-        < "Tile sheet of paper with repeated pages" ; > ;
-    };
-};
-String STR_IMPRESS_PRINT_UI_BROCHURE
-{
-    Text [en-US] = "Brochure";
-};
-String STR_IMPRESS_PRINT_UI_PAGE_SIDES
-{
-    Text [ en-US ] = "Page sides";
-};
-String STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE
-{
-    Text [ en-US ] = "Include";
-};
-StringArray STR_IMPRESS_PRINT_UI_BROCHURE_INCLUDE_LIST
-{
-    ItemList [ en-US ] =
-    {
-        < "All pages" ; > ;
-        < "Front sides / right pages" ; > ;
-        < "Back sides / left pages" ; > ;
-    };
-};
-
-String STR_IMPRESS_PRINT_UI_PAPER_TRAY
-{
-    Text [ en-US ] = "~Use only paper tray from printer preferences";
-};
-String STR_IMPRESS_PRINT_UI_PAGE_RANGE
-{
-    Text [en-US] = "Print range";
-};
-StringArray STR_IMPRESS_PRINT_UI_PAGE_RANGE_CHOICE
-{
-    ItemList [ en-US ] =
-    {
-        < "~All slides"; >;
-        < "~Slides"; >;
-        < "Se~lection"; >;
-    };
-};
-
-StringArray STR_DRAW_PRINT_UI_PAGE_RANGE_CHOICE
-{
-    ItemList [ en-US ] =
-    {
-        < "~All pages"; >;
-        < "Pa~ges"; >;
-        < "Se~lection"; >;
-    };
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sd/source/ui/view/GraphicObjectBar.cxx b/sd/source/ui/view/GraphicObjectBar.cxx
index eb9b6be057b6..2cc7b4c26672 100644
--- a/sd/source/ui/view/GraphicObjectBar.cxx
+++ b/sd/source/ui/view/GraphicObjectBar.cxx
@@ -36,8 +36,8 @@
 #include <sfx2/objface.hxx>
 
 #include "app.hrc"
-#include "res_bmp.hrc"
-#include "glob.hrc"
+
+#include "strings.hrc"
 #include "strings.hrc"
 #include "DrawDocShell.hxx"
 #include "ViewShell.hxx"
diff --git a/sd/source/ui/view/MediaObjectBar.cxx b/sd/source/ui/view/MediaObjectBar.cxx
index f2413042fd6a..11de79bcfa8a 100644
--- a/sd/source/ui/view/MediaObjectBar.cxx
+++ b/sd/source/ui/view/MediaObjectBar.cxx
@@ -30,8 +30,8 @@
 #include <svx/sdr/contact/viewcontactofsdrmediaobj.hxx>
 
 #include "app.hrc"
-#include "res_bmp.hrc"
-#include "glob.hrc"
+
+#include "strings.hrc"
 #include "strings.hrc"
 #include "DrawDocShell.hxx"
 #include "ViewShell.hxx"
diff --git a/sd/source/ui/view/Outliner.cxx b/sd/source/ui/view/Outliner.cxx
index 0b3c8fcdeda7..9b2619ae4e14 100644
--- a/sd/source/ui/view/Outliner.cxx
+++ b/sd/source/ui/view/Outliner.cxx
@@ -53,7 +53,6 @@
 #include <tools/diagnose_ex.h>
 
 #include "strings.hrc"
-#include "sdstring.hrc"
 #include <editeng/outliner.hxx>
 #include "sdpage.hxx"
 #include "sdmod.hxx"
@@ -1228,15 +1227,15 @@ bool SdOutliner::ShowWrapArroundDialog()
     // The question text depends on the search direction.
     bool bImpress = mpDrawDocument && mpDrawDocument->GetDocumentType() == DocumentType::Impress;
 
-    sal_uInt16 nStringId;
+    const char* pStringId;
     if (mbDirectionIsForward)
-        nStringId = bImpress ? STR_SAR_WRAP_FORWARD : STR_SAR_WRAP_FORWARD_DRAW;
+        pStringId = bImpress ? STR_SAR_WRAP_FORWARD : STR_SAR_WRAP_FORWARD_DRAW;
     else
-        nStringId = bImpress ? STR_SAR_WRAP_BACKWARD : STR_SAR_WRAP_BACKWARD_DRAW;
+        pStringId = bImpress ? STR_SAR_WRAP_BACKWARD : STR_SAR_WRAP_BACKWARD_DRAW;
 
     // Pop up question box that asks the user whether to wrap around.
     // The dialog is made modal with respect to the whole application.
-    ScopedVclPtrInstance<QueryBox> aQuestionBox(nullptr, WB_YES_NO | WB_DEF_YES, SdResId(nStringId));
+    ScopedVclPtrInstance<QueryBox> aQuestionBox(nullptr, WB_YES_NO | WB_DEF_YES, SdResId(pStringId));
     aQuestionBox->SetImage(QueryBox::GetStandardImage());
     sal_uInt16 nBoxResult = ShowModalMessageBox(*aQuestionBox.get());
 
diff --git a/sd/source/ui/view/ViewClipboard.cxx b/sd/source/ui/view/ViewClipboard.cxx
index a48d30d9a72d..8c1cf4e6bfc9 100644
--- a/sd/source/ui/view/ViewClipboard.cxx
+++ b/sd/source/ui/view/ViewClipboard.cxx
@@ -28,7 +28,7 @@
 #include "sdpage.hxx"
 #include "sdxfer.hxx"
 #include "sdresid.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "strings.hxx"
 
 #include <svx/svdpagv.hxx>
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 6e98bf784369..9481668f9e7e 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -26,7 +26,7 @@
 #include "sdresid.hxx"
 #include "app.hrc"
 #include "strings.hrc"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "slideshow.hxx"
 #include "unokywds.hxx"
 #include <svx/svxids.hrc>
diff --git a/sd/source/ui/view/ViewShellImplementation.cxx b/sd/source/ui/view/ViewShellImplementation.cxx
index 9f210c1ce7d2..a59b1d8021a2 100644
--- a/sd/source/ui/view/ViewShellImplementation.cxx
+++ b/sd/source/ui/view/ViewShellImplementation.cxx
@@ -24,7 +24,7 @@
 #include "sdpage.hxx"
 #include "drawdoc.hxx"
 #include "sdresid.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "app.hrc"
 #include "strings.hrc"
 #include "helpids.h"
diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx
index 314e110b8b16..87957dde5256 100644
--- a/sd/source/ui/view/drawview.cxx
+++ b/sd/source/ui/view/drawview.cxx
@@ -41,10 +41,10 @@
 #include "stlsheet.hxx"
 
 #include <svx/svdoutl.hxx>
-#include <svx/svdstr.hrc>
+#include <svx/strings.hrc>
 #include <svx/dialmgr.hxx>
 
-#include "glob.hrc"
+#include "strings.hrc"
 #include "strings.hrc"
 #include "View.hxx"
 #include "sdattr.hxx"
diff --git a/sd/source/ui/view/drbezob.cxx b/sd/source/ui/view/drbezob.cxx
index bf52bffe3f0b..dac03c96d49e 100644
--- a/sd/source/ui/view/drbezob.cxx
+++ b/sd/source/ui/view/drbezob.cxx
@@ -33,8 +33,8 @@
 
 #include "sdresid.hxx"
 
-#include "res_bmp.hrc"
-#include "glob.hrc"
+
+#include "strings.hrc"
 #include "strings.hrc"
 
 #include "DrawDocShell.hxx"
diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx
index de7c1e9db631..26334b02f4b5 100644
--- a/sd/source/ui/view/drtxtob.cxx
+++ b/sd/source/ui/view/drtxtob.cxx
@@ -52,8 +52,8 @@
 #include <sfx2/objface.hxx>
 
 #include "app.hrc"
-#include "glob.hrc"
-#include "res_bmp.hrc"
+#include "strings.hrc"
+
 
 #include "drawdoc.hxx"
 #include "DrawViewShell.hxx"
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index d7b439d12169..f453acd062ed 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -57,7 +57,7 @@
 #include <editeng/cmapitem.hxx>
 
 #include "app.hrc"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "sdresid.hxx"
 #include "prlayout.hxx"
 #include "ViewShell.hxx"
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index 23e21891e2d2..2b6c952d2d2b 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -47,9 +47,9 @@
 
 #include "view/viewoverlaymanager.hxx"
 
-#include "glob.hrc"
+#include "strings.hrc"
 #include "app.hrc"
-#include "res_bmp.hrc"
+
 #include "strings.hrc"
 #include "helpids.h"
 
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 51bcc0a2388c..a4b00f47357a 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -112,7 +112,7 @@
 #include <svl/whiter.hxx>
 
 #include "app.hrc"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "strings.hrc"
 
 #include "framework/FrameworkHelper.hxx"
@@ -1358,14 +1358,12 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
 
             if( !bDone )
             {
+                ::sd::Window* pWindow = GetActiveWindow();
 #ifndef UNX
-                const sal_uInt16 nId = STR_TWAIN_NO_SOURCE;
+                ScopedVclPtrInstance<InfoBox>(pWindow, SdResId(STR_TWAIN_NO_SOURCE))->Execute();
 #else
-                const sal_uInt16 nId = STR_TWAIN_NO_SOURCE_UNX;
+                ScopedVclPtrInstance<InfoBox>(pWindow, SdResId(STR_TWAIN_NO_SOURCE_UNX))->Execute();
 #endif
-
-                ::sd::Window* pWindow = GetActiveWindow();
-                ScopedVclPtrInstance<InfoBox>(pWindow, SdResId(nId))->Execute();
             }
             else
             {
@@ -1821,6 +1819,20 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
 
         case SID_SHOW_NEXT_LEVEL:
         {
+            const char* STR_PRESOBJ_MPOUTLINE_ARY[] =
+            {
+                STR_PRESOBJ_MPOUTLINE,
+                STR_PRESOBJ_MPOUTLLAYER2,
+                STR_PRESOBJ_MPOUTLLAYER3,
+                STR_PRESOBJ_MPOUTLLAYER4,
+                STR_PRESOBJ_MPOUTLLAYER5,
+                STR_PRESOBJ_MPOUTLLAYER6,
+                STR_PRESOBJ_MPOUTLLAYER7,
+                STR_PRESOBJ_MPNOTESTITLE,
+                STR_PRESOBJ_MPNOTESTEXT,
+                STR_PRESOBJ_NOTESTEXT
+            };
+
             ESelection aSel;
             // fdo#78151 editing a PRESOBJ_OUTLINE in a master page ?
             ::Outliner* pOL = GetOutlinerForMasterPageOutlineTextObj(aSel);
@@ -1835,7 +1847,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
                     if (nDepth != sal_uInt16(-1) && nDepth < 8)
                     {
                         sal_uInt16 nNewDepth = nDepth+1;
-                        pOL->Insert(SdResId(STR_PRESOBJ_MPOUTLINE+nNewDepth), EE_PARA_APPEND, nNewDepth);
+                        pOL->Insert(SdResId(STR_PRESOBJ_MPOUTLINE_ARY[nNewDepth]), EE_PARA_APPEND, nNewDepth);
                     }
                 }
             }
diff --git a/sd/source/ui/view/drviews3.cxx b/sd/source/ui/view/drviews3.cxx
index 73ccbfd99004..ba75f71d124d 100644
--- a/sd/source/ui/view/drviews3.cxx
+++ b/sd/source/ui/view/drviews3.cxx
@@ -52,9 +52,9 @@
 #include "optsitem.hxx"
 
 #include "app.hrc"
-#include "glob.hrc"
 #include "strings.hrc"
-#include "res_bmp.hrc"
+#include "strings.hrc"
+
 
 #include "sdundogr.hxx"
 #include "undopage.hxx"
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index 32439b7abca9..3e9134efcef9 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -40,9 +40,9 @@
 #include <vcl/cursor.hxx>
 
 #include "app.hrc"
-#include "glob.hrc"
 #include "strings.hrc"
-#include "res_bmp.hrc"
+#include "strings.hrc"
+
 #include "DrawDocShell.hxx"
 #include "drawdoc.hxx"
 #include "Window.hxx"
diff --git a/sd/source/ui/view/drviews5.cxx b/sd/source/ui/view/drviews5.cxx
index 9ba7f6bb4dce..b433d25e924e 100644
--- a/sd/source/ui/view/drviews5.cxx
+++ b/sd/source/ui/view/drviews5.cxx
@@ -37,8 +37,8 @@
 #include "LayerTabBar.hxx"
 
 #include "strings.hrc"
-#include "res_bmp.hrc"
-#include "glob.hrc"
+
+#include "strings.hrc"
 #include "app.hrc"
 #include "helpids.h"
 #include "optsitem.hxx"
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index 97a595cc1abc..99f5bd398c48 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -72,8 +72,8 @@
 #include <sfx2/viewfrm.hxx>
 
 #include "app.hrc"
-#include "glob.hrc"
-#include "res_bmp.hrc"
+#include "strings.hrc"
+
 #include "PresentationViewShell.hxx"
 
 #include "Outliner.hxx"
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 80cd59e7107d..74d6e39bafb3 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -50,7 +50,7 @@
 #include "view/viewoverlaymanager.hxx"
 #include "app.hrc"
 #include "strings.hrc"
-#include "res_bmp.hrc"
+
 #include "sdpage.hxx"
 #include "FrameView.hxx"
 #include "drawdoc.hxx"
diff --git a/sd/source/ui/view/drviewsb.cxx b/sd/source/ui/view/drviewsb.cxx
index c22a012ae94e..403e67b330d7 100644
--- a/sd/source/ui/view/drviewsb.cxx
+++ b/sd/source/ui/view/drviewsb.cxx
@@ -41,8 +41,8 @@
 
 #include "app.hrc"
 #include "strings.hrc"
-#include "res_bmp.hrc"
-#include "glob.hrc"
+
+#include "strings.hrc"
 #include "Outliner.hxx"
 #include "Window.hxx"
 #include "sdmod.hxx"
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index 70fc761fdd0e..9699b1c343eb 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -67,9 +67,9 @@
 #include "ViewShellHint.hxx"
 #include "framework/FrameworkHelper.hxx"
 #include "app.hrc"
-#include "glob.hrc"
 #include "strings.hrc"
-#include "res_bmp.hrc"
+#include "strings.hrc"
+
 #include "drawdoc.hxx"
 #include "fusel.hxx"
 #include "futext.hxx"
diff --git a/sd/source/ui/view/drvwshrg.cxx b/sd/source/ui/view/drvwshrg.cxx
index 7b16b72e9ba5..d31bfdbd48d1 100644
--- a/sd/source/ui/view/drvwshrg.cxx
+++ b/sd/source/ui/view/drvwshrg.cxx
@@ -36,8 +36,8 @@
 
 #include "app.hrc"
 #include "strings.hrc"
-#include "res_bmp.hrc"
-#include "glob.hrc"
+
+#include "strings.hrc"
 #include "SpellDialogChildWindow.hxx"
 #include "sdresid.hxx"
 #include "DrawDocShell.hxx"
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index d4e7ccdea3aa..8db33b353ae2 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -37,7 +37,7 @@
 #include "sdmod.hxx"
 #include "sdresid.hxx"
 #include "pres.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "sdiocmpt.hxx"
 #include "framework/FrameworkHelper.hxx"
 #include <comphelper/processfactory.hxx>
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 14b9022abc1c..1d71af0e9539 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -63,8 +63,8 @@
 #include "optsitem.hxx"
 
 #include "strings.hrc"
-#include "glob.hrc"
-#include "res_bmp.hrc"
+#include "strings.hrc"
+
 #include "Outliner.hxx"
 #include "Window.hxx"
 #include "TextObjectBar.hxx"
diff --git a/sd/source/ui/view/outlview.cxx b/sd/source/ui/view/outlview.cxx
index e17bf1877ba8..024a88a16e22 100644
--- a/sd/source/ui/view/outlview.cxx
+++ b/sd/source/ui/view/outlview.cxx
@@ -58,7 +58,7 @@
 #include "pres.hxx"
 #include "OutlineViewShell.hxx"
 #include "app.hrc"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "sdresid.hxx"
 #include "Outliner.hxx"
 #include "strings.hrc"
diff --git a/sd/source/ui/view/presvish.cxx b/sd/source/ui/view/presvish.cxx
index 392ec7619ef5..67b3348226e1 100644
--- a/sd/source/ui/view/presvish.cxx
+++ b/sd/source/ui/view/presvish.cxx
@@ -39,7 +39,7 @@
 #include "drawview.hxx"
 #include "app.hrc"
 #include "strings.hrc"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "ViewShellBase.hxx"
 #include "FactoryIds.hxx"
 
diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx
index d634fa8d4d80..500f183b6a0a 100644
--- a/sd/source/ui/view/sdview.cxx
+++ b/sd/source/ui/view/sdview.cxx
@@ -63,7 +63,7 @@
 #include "DrawDocShell.hxx"
 #include "sdmod.hxx"
 #include "sdpage.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "sdresid.hxx"
 #include "DrawViewShell.hxx"
 #include "futext.hxx"
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index 852208426834..189a76e83314 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -49,7 +49,7 @@
 #include "navigatr.hxx"
 #include "anminfo.hxx"
 #include "strings.hrc"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "sdxfer.hxx"
 #include "sdresid.hxx"
 #include "sdmod.hxx"
diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index 4f8b8be7fec2..4ddb23e17747 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -61,7 +61,7 @@
 #include <svtools/soerr.hxx>
 #include <sfx2/ipclient.hxx>
 #include <svx/svdoashp.hxx>
-#include "glob.hrc"
+#include "strings.hrc"
 
 #include <config_features.h>
 
@@ -391,7 +391,7 @@ IMPL_LINK_NOARG(View, DropInsertFileHdl, Timer *, void)
     if( !mpViewSh )
         return;
 
-    SfxErrorContext aEc( ERRCTX_ERROR, mpViewSh->GetActiveWindow(), RID_SO_ERRCTX );
+    SfxErrorContext aEc( ERRCTX_ERROR, mpViewSh->GetActiveWindow(), getRID_SO_ERRCTX() );
     ErrCode nError = ERRCODE_NONE;
 
     ::std::vector< OUString >::const_iterator aIter( maDropFileVector.begin() );
diff --git a/sd/source/ui/view/tabcontr.cxx b/sd/source/ui/view/tabcontr.cxx
index 7b60cc3796d5..8db35425a4fe 100644
--- a/sd/source/ui/view/tabcontr.cxx
+++ b/sd/source/ui/view/tabcontr.cxx
@@ -27,8 +27,8 @@
 #include "sdattr.hxx"
 #include "sdmod.hxx"
 #include "app.hrc"
-#include "glob.hrc"
-#include "res_bmp.hrc"
+#include "strings.hrc"
+
 #include "DrawViewShell.hxx"
 #include "GraphicViewShell.hxx"
 #include "helpids.h"
diff --git a/sd/source/ui/view/unmodpg.cxx b/sd/source/ui/view/unmodpg.cxx
index f0445646fff0..c0343a70b548 100644
--- a/sd/source/ui/view/unmodpg.cxx
+++ b/sd/source/ui/view/unmodpg.cxx
@@ -26,7 +26,7 @@
 #include "strings.hrc"
 #include "strings.hxx"
 #include "glob.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "app.hrc"
 
 #include "unmodpg.hxx"
diff --git a/sd/source/ui/view/viewoverlaymanager.cxx b/sd/source/ui/view/viewoverlaymanager.cxx
index 7e28f6723cf5..f6ef6ba44904 100644
--- a/sd/source/ui/view/viewoverlaymanager.cxx
+++ b/sd/source/ui/view/viewoverlaymanager.cxx
@@ -25,8 +25,6 @@
 #include <sfx2/request.hxx>
 #include <sfx2/dispatch.hxx>
 
-#include <tools/rcid.h>
-
 #include <vcl/help.hxx>
 #include <vcl/lazydelete.hxx>
 
@@ -39,11 +37,11 @@
 
 #include "view/viewoverlaymanager.hxx"
 
-#include "res_bmp.hrc"
+
 #include "DrawDocShell.hxx"
 #include "DrawViewShell.hxx"
 #include "DrawController.hxx"
-#include "glob.hrc"
+#include "strings.hrc"
 #include "strings.hrc"
 #include "bitmaps.hlst"
 #include "sdresid.hxx"
@@ -61,7 +59,7 @@ namespace sd {
 class ImageButtonHdl;
 
 static const sal_uInt16 gButtonSlots[] = { SID_INSERT_TABLE, SID_INSERT_DIAGRAM, SID_INSERT_GRAPHIC, SID_INSERT_AVMEDIA };
-static const sal_uInt16 gButtonToolTips[] = { STR_INSERT_TABLE, STR_INSERT_CHART, STR_INSERT_PICTURE, STR_INSERT_MOVIE };
+static const char* gButtonToolTips[] = { STR_INSERT_TABLE, STR_INSERT_CHART, STR_INSERT_PICTURE, STR_INSERT_MOVIE };
 
 static const OUStringLiteral aSmallPlaceHolders[] =
 {
diff --git a/sd/source/ui/view/viewshe2.cxx b/sd/source/ui/view/viewshe2.cxx
index e0b40d1d1515..4e06cd625566 100644
--- a/sd/source/ui/view/viewshe2.cxx
+++ b/sd/source/ui/view/viewshe2.cxx
@@ -718,7 +718,7 @@ bool ViewShell::ActivateObject(SdrOle2Obj* pObj, long nVerb)
 {
     ErrCode aErrCode = ERRCODE_NONE;
 
-    SfxErrorContext aEC(ERRCTX_SO_DOVERB, GetActiveWindow(), RID_SO_ERRCTX);
+    SfxErrorContext aEC(ERRCTX_SO_DOVERB, GetActiveWindow(), getRID_SO_ERRCTX());
     bool bAbort = false;
     GetDocSh()->SetWaitCursor( true );
     SfxViewShell* pViewShell = GetViewShell();
diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx
index 5f342906d994..f346ab12529b 100644
--- a/sd/source/ui/view/viewshe3.cxx
+++ b/sd/source/ui/view/viewshe3.cxx
@@ -24,7 +24,7 @@
 #include "GraphicViewShellBase.hxx"
 
 #include <sfx2/viewfrm.hxx>
-#include <svtools/svtools.hrc>
+#include <svtools/strings.hrc>
 #include <com/sun/star/lang/Locale.hpp>
 #include <svtools/svtresid.hxx>
 #include <utility>
@@ -32,8 +32,8 @@
 
 #include "app.hrc"
 #include "strings.hrc"
-#include "res_bmp.hrc"
-#include "glob.hrc"
+
+#include "strings.hrc"
 #include "sdabstdlg.hxx"
 
 #include "fupoor.hxx"
diff --git a/sd/source/ui/view/viewshel.cxx b/sd/source/ui/view/viewshel.cxx
index ef5e71171ad6..b1f7ce840bcc 100644
--- a/sd/source/ui/view/viewshel.cxx
+++ b/sd/source/ui/view/viewshel.cxx
@@ -44,7 +44,7 @@
 #include "app.hrc"
 #include "helpids.h"
 #include "strings.hrc"
-#include "res_bmp.hrc"
+
 #include "OutlineView.hxx"
 #include "Client.hxx"
 #include "sdresid.hxx"
@@ -89,7 +89,7 @@
 #include <editeng/editview.hxx>
 #include <editeng/editeng.hxx>
 #include <svl/poolitem.hxx>
-#include <glob.hrc>
+#include <strings.hrc>
 #include "strings.hxx"
 #include "AccessibleDocumentViewBase.hxx"