[Libreoffice-commits] core.git: Branch 'feature/slidehack2' - sd/Library_sd.mk sd/source

[Markus Mohrhard]

 sd/Library_sd.mk                                       |    5 +++++
 sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx |   17 ++++++-----------
 2 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 5cdf5b3f0e52397a6863c030b860abc0eb88a70e
Author: Markus Mohrhard <markus.mohrhard at collabora.co.uk>
Date:   Tue Jun 24 21:15:06 2014 +0200

    fix mis-merges
    
    Change-Id: I254a6153936c7b2d649cadabeaa4e4e60984b904

diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 580af5f..f1c7e7f 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -522,6 +522,11 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
 ))
 endif # ENABLE_AVAHI=TRUE
 
+$(eval $(call gb_Library_add_exception_objects,sd,\
+	sd/source/ui/remotecontrol/DiscoveryService \
+))
+
+
 ifeq ($(OS),WNT)
 
 $(eval $(call gb_Library_add_exception_objects,sd,\
diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
index 5ba0492..829cecc 100644
--- a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx
@@ -313,19 +313,20 @@ void PageObjectPainter::PaintCustomAnimationEffect (
     EffectSequence::iterator aEnd = aMainSequence->getEnd();
     if ( aIter != aEnd )
     {
-        const Rectangle aBox (mpPageObjectLayouter->GetBoundingBox(
+        const Rectangle aBox (pPageObjectLayouter->GetBoundingBox(
             rpDescriptor,
             PageObjectLayouter::CustomAnimationEffectIndicator,
             PageObjectLayouter::ModelCoordinateSystem));
         rDevice.DrawBitmapEx(
             aBox.TopCenter(),
-            mpPageObjectLayouter->GetCustomAnimationEffectIcon().GetBitmapEx());
+            pPageObjectLayouter->GetCustomAnimationEffectIcon().GetBitmapEx());
     }
 }
 
-Bitmap& PageObjectPainter::GetBackgroundForState (
-    const model::SharedPageDescriptor& rpDescriptor,
-    const OutputDevice& rReferenceDevice)
+void PageObjectPainter::PaintBackgroundDetail(
+        PageObjectLayouter *pPageObjectLayouter,
+        OutputDevice& rDevice,
+        const model::SharedPageDescriptor& rpDescriptor) const
 {
     enum State { None = 0x00, Selected = 0x01, MouseOver = 0x02, Focused = 0x04 };
     const int eState =
@@ -344,12 +345,6 @@ Bitmap& PageObjectPainter::GetBackgroundForState (
             break;
 
         case MouseOver | Selected:
-            return GetBackground(
-                maMouseOverSelectedBackground,
-                Theme::Gradient_MouseOverSelected,
-                rReferenceDevice,
-                false);
-
         case MouseOver:
             eColorType = Theme::Gradient_MouseOverPage;
             bHasFocusBorder = false;