CWS-TOOLING: integrate CWS cmcfixes78ooo/DEV300_m88

5 files changed, 15 insertions, 2 deletions

diff --git a/sd/source/ui/animations/CustomAnimationList.hxx b/sd/source/ui/animations/CustomAnimationList.hxx
index e3fe431b8..48c3c9549 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 08c7c3b49..f2cdd8831 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 7698888b8..e602eb402 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 a99fbe033..4a8f7b489 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 4e10929cb..ef5ca7849 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)
     {