diff options
author | Hans-Joachim Lankenau <hjs@openoffice.org> | 2010-09-17 14:17:32 +0200 |
---|---|---|
committer | Hans-Joachim Lankenau <hjs@openoffice.org> | 2010-09-17 14:17:32 +0200 |
commit | 79b72d3c2982de79ce3828fd0a499a9ca2a661d2 (patch) | |
tree | c4dd57fe37d332329fa617d72c0ddb3e1ec2572a | |
parent | 5d6a46caf0e9e9d5dbe866638c1551c7f5d3648e (diff) | |
parent | 9447a98d97cbf5550b56047f26f47ef066609291 (diff) |
CWS-TOOLING: integrate CWS cmcfixes78
Notes
split repo tag: impress_ooo/DEV300_m88
-rwxr-xr-x[-rw-r--r--] | sd/source/ui/animations/CustomAnimationList.hxx | 1 | ||||
-rw-r--r-- | sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx | 4 | ||||
-rw-r--r-- | sd/source/ui/slidesorter/model/SlideSorterModel.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx | 2 | ||||
-rw-r--r-- | sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx | 8 |
5 files changed, 15 insertions, 2 deletions
diff --git a/sd/source/ui/animations/CustomAnimationList.hxx b/sd/source/ui/animations/CustomAnimationList.hxx index 2fe96440030e..66b1e2c6a436 100644..100755 --- a/sd/source/ui/animations/CustomAnimationList.hxx +++ b/sd/source/ui/animations/CustomAnimationList.hxx @@ -47,6 +47,7 @@ public: virtual void onSelect() = 0; virtual void onDoubleClick() = 0; virtual void onContextMenu( USHORT nSelectedPopupEntry ) = 0; + virtual ~ICustomAnimationListController() {} }; class CustomAnimationList : public SvTreeListBox, public ISequenceListener diff --git a/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx b/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx index 6a85192f8418..76e9e411e81e 100644 --- a/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx @@ -273,15 +273,19 @@ VisibleAreaScroller::VisibleAreaScroller ( // jump to within this distance of the final value and start the // animation from there. if (abs(aStart.X()-aEnd.X()) > gnMaxScrollDistance) + { if (aStart.X() < aEnd.X()) maStart.X() = aEnd.X()-gnMaxScrollDistance; else maStart.X() = aEnd.X()+gnMaxScrollDistance; + } if (abs(aStart.Y()-aEnd.Y()) > gnMaxScrollDistance) + { if (aStart.Y() < aEnd.Y()) maStart.Y() = aEnd.Y()-gnMaxScrollDistance; else maStart.Y() = aEnd.Y()+gnMaxScrollDistance; + } } diff --git a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx index 5eaf64db7bf8..be964715f1a6 100644 --- a/sd/source/ui/slidesorter/model/SlideSorterModel.cxx +++ b/sd/source/ui/slidesorter/model/SlideSorterModel.cxx @@ -700,6 +700,7 @@ void SlideSorterModel::UpdateIndices (const sal_Int32 nFirstIndex) { SharedPageDescriptor& rpDescriptor (maPageDescriptors[nDescriptorIndex]); if (rpDescriptor) + { if (nDescriptorIndex < nFirstIndex) { if (rpDescriptor->GetPageIndex()!=nDescriptorIndex) @@ -711,6 +712,7 @@ void SlideSorterModel::UpdateIndices (const sal_Int32 nFirstIndex) { rpDescriptor->SetPageIndex(nDescriptorIndex); } + } } } diff --git a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx index 1d98a217ff90..5f322e65141d 100644 --- a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx +++ b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx @@ -450,6 +450,7 @@ void PageObjectRun::ResetOffsets (const controller::Animator::AnimationMode eMod { model::SharedPageDescriptor pDescriptor(rModel.GetPageDescriptor(nIndex+mnStartIndex)); if (pDescriptor) + { if (eMode == controller::Animator::AM_Animated) maStartOffset[nIndex] = pDescriptor->GetVisualState().GetLocationOffset(); else @@ -459,6 +460,7 @@ void PageObjectRun::ResetOffsets (const controller::Animator::AnimationMode eMod rView.RequestRepaint(aOldBoundingBox); rView.RequestRepaint(pDescriptor); } + } maEndOffset[nIndex] = Point(0,0); } if (eMode == controller::Animator::AM_Animated) diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx index 8d5b1cfbcdc8..a0bc19edb470 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx @@ -234,10 +234,12 @@ void PageObjectPainter::PaintPreview ( const Bitmap aPreview (GetPreviewBitmap(rpDescriptor, &rDevice)); if ( ! aPreview.IsEmpty()) + { if (aPreview.GetSizePixel() != aBox.GetSize()) rDevice.DrawBitmap(aBox.TopLeft(), aBox.GetSize(), aPreview); else rDevice.DrawBitmap(aBox.TopLeft(), aPreview); + } } } @@ -342,10 +344,12 @@ void PageObjectPainter::PaintPageNumber ( // (preferred) or brighter font color. const sal_Int32 nFontLuminance (aPageNumberColor.GetLuminance()); if (abs(nBackgroundLuminance - nFontLuminance) < 60) + { if (nBackgroundLuminance > nFontLuminance-30) aPageNumberColor = Color(mpTheme->GetColor(Theme::Color_PageNumberBrightBackground)); else aPageNumberColor = Color(mpTheme->GetColor(Theme::Color_PageNumberDarkBackground)); + } } } @@ -387,10 +391,10 @@ Bitmap& PageObjectPainter::GetBackgroundForState ( const OutputDevice& rReferenceDevice) { enum State { None = 0x00, Selected = 0x01, MouseOver = 0x02, Focused = 0x04 }; - const State eState (State( + const int eState = (rpDescriptor->HasState(model::PageDescriptor::ST_Selected) ? Selected : None) | (rpDescriptor->HasState(model::PageDescriptor::ST_MouseOver) ? MouseOver : None) - | (rpDescriptor->HasState(model::PageDescriptor::ST_Focused) ? Focused : None))); + | (rpDescriptor->HasState(model::PageDescriptor::ST_Focused) ? Focused : None); switch (eState) { |