diff options
author | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-06-24 21:15:06 +0200 |
---|---|---|
committer | Markus Mohrhard <markus.mohrhard@collabora.co.uk> | 2014-06-24 21:15:06 +0200 |
commit | 5cdf5b3f0e52397a6863c030b860abc0eb88a70e (patch) | |
tree | d17559332a86894ccccf7037bc4dfa808af24cf3 | |
parent | 773401ce68387574039f3935b84317128bcef09b (diff) |
fix mis-mergesfeature/slidehack2
Change-Id: I254a6153936c7b2d649cadabeaa4e4e60984b904
-rw-r--r-- | sd/Library_sd.mk | 5 | ||||
-rw-r--r-- | sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx | 17 |
2 files changed, 11 insertions, 11 deletions
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index 580af5f7db83..f1c7e7fd2c6d 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 5ba049287e70..829ceccb36b7 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; |