From 735c902c49ff973f7d44c12dc683d2e8c4ed1e90 Mon Sep 17 00:00:00 2001
From: Andre Fischer <Andre.W.Fischer <Andre Fischer<Andre.W.Fischer@Sun.COM>
Date: Thu, 29 Apr 2010 10:38:29 +0200
Subject: [PATCH] renaissance1: #i107215# Fixed problem with loading of icons.

---
 .../ui/slidesorter/shell/SlsDebugDialog.cxx   | 22 ++++++++-----------
 .../ui/slidesorter/view/SlsButtonBar.cxx      |  2 +-
 .../ui/slidesorter/view/SlsLayeredDevice.cxx  |  8 +++----
 sd/source/ui/slidesorter/view/SlsTheme.cxx    | 10 ++++-----
 4 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/sd/source/ui/slidesorter/shell/SlsDebugDialog.cxx b/sd/source/ui/slidesorter/shell/SlsDebugDialog.cxx
index 8a45a54567e9..f503727c31e8 100644
--- a/sd/source/ui/slidesorter/shell/SlsDebugDialog.cxx
+++ b/sd/source/ui/slidesorter/shell/SlsDebugDialog.cxx
@@ -265,9 +265,11 @@ public:
         const char* pTitle,
         const Theme::GradientColorType eType,
         const Rectangle& rBoundingBox,
-        SlideSorter& rSlideSorter)
+        SlideSorter& rSlideSorter,
+        const Updater& rUpdater = Updater())
         : mpTheme(rSlideSorter.GetTheme()),
           mrSlideSorter(rSlideSorter),
+          maUpdater(rUpdater),
           meType(eType),
           mpContainer(new ::Window(pParent, WB_BORDER)),
           mpColorControl(new ColorControl(mpContainer, pTitle,
@@ -411,6 +413,7 @@ public:
 private:
     ::boost::shared_ptr<view::Theme> mpTheme;
     SlideSorter& mrSlideSorter;
+    Updater maUpdater;
     Theme::GradientColorType meType;
     ::Window* mpContainer;
     ColorControl* mpColorControl;
@@ -500,6 +503,8 @@ IMPL_LINK(GradientControl, Update, void*, EMPTYARG)
         mpFillOffset2Slider->GetThumbPos(),
         mpBorderOffset1Slider->GetThumbPos(),
         mpBorderOffset2Slider->GetThumbPos());
+    if (maUpdater)
+        maUpdater();
     UpdateDisplay();
 
     return 0;
@@ -840,7 +845,9 @@ SlideSorterDebugDialog::SlideSorterDebugDialog (SlideSorter& rSlideSorter)
         "Button Background",
         Theme::Gradient_ButtonBackground,
         Rectangle(10,nY,285,nY+220),
-        rSlideSorter));
+        rSlideSorter,
+        ::boost::bind(&view::ButtonBar::RequestLayout,
+            ::boost::ref(rSlideSorter.GetView().GetButtonBar()))));
     nY += maControls.back()->GetHeight() + nGap;
 
     maControls.push_back(new SliderControl(
@@ -876,17 +883,6 @@ SlideSorterDebugDialog::SlideSorterDebugDialog (SlideSorter& rSlideSorter)
         ::boost::bind(&GradientControl::SetType, pControl, _1)));
     nY += maControls.back()->GetHeight() + nGap;
 
-    maControls.push_back(new BoolControl(
-        mpTopLevelWindow,
-        "Alternative Button Paint Style",
-        Rectangle(10,nY,290,nY+20),
-        1,0,
-        ::boost::bind(&view::Theme::GetIntegerValue, pTheme, view::Theme::Integer_ButtonPaintType),
-        ::boost::bind(&view::Theme::SetIntegerValue, pTheme, view::Theme::Integer_ButtonPaintType, _1),
-        ::boost::bind(&view::SlideSorterView::RequestRepaint,
-            ::boost::ref(rSlideSorter.GetView()))));
-    nY += maControls.back()->GetHeight() + nGap;
-
     maControls.push_back(new TextButton(
         mpTopLevelWindow,
         "Close",
diff --git a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
index f6f1f1e016bc..57cba55f71eb 100644
--- a/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
+++ b/sd/source/ui/slidesorter/view/SlsButtonBar.cxx
@@ -255,7 +255,7 @@ sal_Int32 ButtonBar::GetButtonCount (const bool bIsExcluded) const
 
     if (nIndex<0 || sal_uInt32(nIndex)>=rButtons.size())
     {
-        OSL_ASSERT(nIndex<0 || nIndex>=rButtons.size());
+        OSL_ASSERT(nIndex<0 || sal_uInt32(nIndex)>=rButtons.size());
         return ::boost::shared_ptr<Button>();
     }
     else
diff --git a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
index ad1282624572..c3b6b5fac8ce 100644
--- a/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
+++ b/sd/source/ui/slidesorter/view/SlsLayeredDevice.cxx
@@ -170,9 +170,9 @@ void LayeredDevice::Invalidate (
     const Rectangle& rInvalidationArea,
     const sal_Int32 nLayer)
 {
-    if (nLayer<0 || sal_uInt32(nLayer)>=mpLayers->size())
+    if (nLayer<0 || size_t(nLayer)>=mpLayers->size())
     {
-        OSL_ASSERT(nLayer>=0 && nLayer<mpLayers->size());
+        OSL_ASSERT(nLayer>=0 && size_t(nLayer)<mpLayers->size());
         return;
     }
 
@@ -250,9 +250,9 @@ void LayeredDevice::RemovePainter (
         OSL_ASSERT(rpPainter);
         return;
     }
-    if (nLayer<0 || sal_uInt32(nLayer)>=mpLayers->size())
+    if (nLayer<0 || size_t(nLayer)>=mpLayers->size())
     {
-        OSL_ASSERT(nLayer>=0 && nLayer<mpLayers->size());
+        OSL_ASSERT(nLayer>=0 && size_t(nLayer)<mpLayers->size());
         return;
     }
 
diff --git a/sd/source/ui/slidesorter/view/SlsTheme.cxx b/sd/source/ui/slidesorter/view/SlsTheme.cxx
index 3f11070098c4..73a57e37bba7 100644
--- a/sd/source/ui/slidesorter/view/SlsTheme.cxx
+++ b/sd/source/ui/slidesorter/view/SlsTheme.cxx
@@ -189,7 +189,7 @@ void Theme::Update (const ::boost::shared_ptr<controller::Properties>& rpPropert
 
     const bool bSavedHighContrastMode (mbIsHighContrastMode);
     mbIsHighContrastMode = rpProperties->IsHighContrastModeActive();
-    if (bSavedHighContrastMode != mbIsHighContrastMode)
+    if (bSavedHighContrastMode != mbIsHighContrastMode || maIcons.empty())
     {
         LocalResource aResource (RID_SLIDESORTER_ICONS);
 
@@ -436,7 +436,7 @@ BitmapEx Theme::GetIcon (const IconType eType)
         return maIcons[eType];
     else
     {
-        OSL_ASSERT(eType>=0 && eType<maIcons.size());
+        OSL_ASSERT(eType>=0 && size_t(eType)<maIcons.size());
         return BitmapEx();
     }
 }
@@ -509,7 +509,7 @@ void Theme::SetIntegerValue (const IntegerValueType eType, const sal_Int32 nValu
         return maStrings[eType];
     else
     {
-        OSL_ASSERT(eType>=0 && eType<maStrings.size());
+        OSL_ASSERT(eType>=0 && size_t(eType)<maStrings.size());
         return ::rtl::OUString();
     }
 }
@@ -523,7 +523,7 @@ Theme::GradientDescriptor& Theme::GetGradient (const GradientColorType eType)
         return maGradients[eType];
     else
     {
-        OSL_ASSERT(eType>=0 && eType<maGradients.size());
+        OSL_ASSERT(eType>=0 && size_t(eType)<maGradients.size());
         return maGradients[0];
     }
 }
@@ -537,7 +537,7 @@ void Theme::InitializeIcon (const IconType eType, USHORT nResourceId)
         maIcons[eType] = Image(SdResId(nResourceId)).GetBitmapEx();
     else
     {
-        OSL_ASSERT(eType>=0 && eType<maIcons.size());
+        OSL_ASSERT(eType>=0 && size_t(eType)<maIcons.size());
     }
 }