Slidesorter: Kill more useless cruft.

sd/source/ui/slidesorter/controller/SlsClipboard.cxx

@@ -35,6 +35,7 @@
 #include "model/SlsPageDescriptor.hxx"
 #include "model/SlsPageEnumerationProvider.hxx"
 #include "view/SlideSorterView.hxx"
+#include "view/SlsResource.hrc"
 #include "view/SlsTheme.hxx"
 #include "controller/SlideSorterController.hxx"
 #include "controller/SlsInsertionIndicatorHandler.hxx"
@@ -120,17 +121,16 @@ class Clipboard::UndoContext
 public:
     UndoContext (
         SdDrawDocument* pDocument,
-        const ::boost::shared_ptr<ViewShell>& rpMainViewShell,
-        const ::boost::shared_ptr<view::Theme>& rpTheme)
+        const ::boost::shared_ptr<ViewShell>& rpMainViewShell)
         : mpDocument(pDocument),
           mpMainViewShell(rpMainViewShell)
     {
         if (mpDocument!=NULL && mpDocument->IsUndoEnabled())
         {
             if (mpMainViewShell && mpMainViewShell->GetShellType() == ViewShell::ST_DRAW)
-                mpDocument->BegUndo(rpTheme->GetString(view::Theme::String_DragAndDropPages));
+                mpDocument->BegUndo(String(SdResId(STRING_DRAG_AND_DROP_PAGES)));
             else
-                mpDocument->BegUndo(rpTheme->GetString(view::Theme::String_DragAndDropSlides));
+                mpDocument->BegUndo(String(SdResId(STRING_DRAG_AND_DROP_SLIDES)));
         }
     }
 
@@ -714,8 +714,7 @@ sal_Int8 Clipboard::ExecuteDrop (
                 // Handle a general drop operation.
                 mpUndoContext.reset(new UndoContext (
                     mrSlideSorter.GetModel().GetDocument(),
-                    mrSlideSorter.GetViewShell()->GetViewShellBase().GetMainViewShell(),
-                    mrSlideSorter.GetTheme()));
+                    mrSlideSorter.GetViewShell()->GetViewShellBase().GetMainViewShell()));
                 mpSelectionObserverContext.reset(new SelectionObserver::Context(mrSlideSorter));
 
                 HandlePageDrop(*pDragTransferable);

sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx

@@ -96,7 +96,6 @@ private:
     Bitmap maMouseOverBackground;
     Bitmap maMouseOverFocusedBackground;
     Bitmap maMouseOverSelectedAndFocusedBackground;
-    ::rtl::OUString msUnhideString;
     ButtonBar& mrButtonBar;
     Size maSize;
 

sd/source/ui/slidesorter/inc/view/SlsTheme.hxx

@@ -164,19 +164,6 @@ public:
     };
     const BitmapEx& GetIcon (const IconType eType);
 
-    enum StringType
-    {
-        String_Unhide,
-        String_DragAndDropPages,
-        String_DragAndDropSlides,
-        String_Command1,
-        String_Command2,
-        String_Command2B,
-        String_Command3,
-        _StringType_Size_
-    };
-    ::rtl::OUString GetString (const StringType eType) const;
-
 private:
     bool mbIsHighContrastMode;
     class GradientDescriptor
@@ -202,7 +189,6 @@ private:
     ::std::vector<GradientDescriptor> maGradients;
     ::std::vector<BitmapEx> maIcons;
     ::std::vector<ColorData> maColor;
-    ::std::vector<rtl::OUString> maStrings;
 
     GradientDescriptor& GetGradient (const GradientColorType eType);
     /** Guarded initialization of the specified icon in the maIcons

sd/source/ui/slidesorter/view/SlsButtonBar.cxx

@@ -30,6 +30,7 @@
 #include "view/SlsButtonBar.hxx"
 
 #include "SlideSorter.hxx"
+#include "SlsResource.hxx"
 #include "model/SlsPageDescriptor.hxx"
 #include "model/SlideSorterModel.hxx"
 #include "view/SlsTheme.hxx"
@@ -1070,7 +1071,7 @@ UnhideButton::UnhideButton (SlideSorter& rSlideSorter)
         rSlideSorter.GetTheme()->GetIcon(Theme::Icon_Command2BMediumHover),
         rSlideSorter.GetTheme()->GetIcon(Theme::Icon_Command2BSmall),
         rSlideSorter.GetTheme()->GetIcon(Theme::Icon_Command2BSmallHover),
-        rSlideSorter.GetTheme()->GetString(Theme::String_Command2B))
+        String(SdResId(STRING_COMMAND2_B)))
 {
 }
 
@@ -1102,7 +1103,7 @@ StartShowButton::StartShowButton (SlideSorter& rSlideSorter)
         rSlideSorter.GetTheme()->GetIcon(Theme::Icon_Command1MediumHover),
         rSlideSorter.GetTheme()->GetIcon(Theme::Icon_Command1Small),
         rSlideSorter.GetTheme()->GetIcon(Theme::Icon_Command1SmallHover),
-        rSlideSorter.GetTheme()->GetString(Theme::String_Command1))
+        String(SdResId(STRING_COMMAND1)))
 {
 }
 
@@ -1168,7 +1169,7 @@ HideButton::HideButton (SlideSorter& rSlideSorter)
         rSlideSorter.GetTheme()->GetIcon(Theme::Icon_Command2MediumHover),
         rSlideSorter.GetTheme()->GetIcon(Theme::Icon_Command2Small),
         rSlideSorter.GetTheme()->GetIcon(Theme::Icon_Command2SmallHover),
-        rSlideSorter.GetTheme()->GetString(Theme::String_Command2))
+        String(SdResId(STRING_COMMAND2_A)))
 {
 }
 
@@ -1200,7 +1201,7 @@ DuplicateButton::DuplicateButton (SlideSorter& rSlideSorter)
         rSlideSorter.GetTheme()->GetIcon(Theme::Icon_Command3MediumHover),
         rSlideSorter.GetTheme()->GetIcon(Theme::Icon_Command3Small),
         rSlideSorter.GetTheme()->GetIcon(Theme::Icon_Command3SmallHover),
-        rSlideSorter.GetTheme()->GetString(Theme::String_Command3))
+        String(SdResId(STRING_COMMAND3)))
 {
 }
 

sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx

@@ -67,7 +67,6 @@ PageObjectPainter::PageObjectPainter (
       maFocusedSelectionBackground(),
       maMouseOverBackground(),
       maMouseOverFocusedBackground(),
-      msUnhideString(mpTheme->GetString(Theme::String_Unhide)),
       mrButtonBar(rSlideSorter.GetView().GetButtonBar()),
       maSize()
 {

sd/source/ui/slidesorter/view/SlsTheme.cxx

@@ -83,14 +83,6 @@ Theme::Theme (const ::boost::shared_ptr<controller::Properties>& rpProperties)
     {
         LocalResource aResource (RID_SLIDESORTER_ICONS);
 
-        maStrings.resize(_StringType_Size_);
-        maStrings[String_DragAndDropPages] = String(SdResId(STRING_DRAG_AND_DROP_PAGES));
-        maStrings[String_DragAndDropSlides] = String(SdResId(STRING_DRAG_AND_DROP_SLIDES));
-        maStrings[String_Command1] = String(SdResId(STRING_COMMAND1));
-        maStrings[String_Command2] = String(SdResId(STRING_COMMAND2_A));
-        maStrings[String_Command2B] = String(SdResId(STRING_COMMAND2_B));
-        maStrings[String_Command3] = String(SdResId(STRING_COMMAND3));
-
         maColor.resize(_ColorType_Size_);
         maColor[Color_Background] = maBackgroundColor;
         maColor[Color_PageNumberDefault] = 0x0808080;
@@ -352,20 +344,6 @@ const BitmapEx& Theme::GetIcon (const IconType eType)
 
 
 
-::rtl::OUString Theme::GetString (const StringType eType) const
-{
-    if (eType>=0 && size_t(eType)<maStrings.size())
-        return maStrings[eType];
-    else
-    {
-        OSL_ASSERT(eType>=0 && size_t(eType)<maStrings.size());
-        return ::rtl::OUString();
-    }
-}
-
-
-
-
 Theme::GradientDescriptor& Theme::GetGradient (const GradientColorType eType)
 {
     if (eType>=0 && size_t(eType)<maGradients.size())