diff options
Diffstat (limited to 'sd/source/ui/slidesorter/view/SlsViewOverlay.cxx')
| -rw-r--r-- | sd/source/ui/slidesorter/view/SlsViewOverlay.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sd/source/ui/slidesorter/view/SlsViewOverlay.cxx b/sd/source/ui/slidesorter/view/SlsViewOverlay.cxx index 32576240036c..dbd6640455f4 100644 --- a/sd/source/ui/slidesorter/view/SlsViewOverlay.cxx +++ b/sd/source/ui/slidesorter/view/SlsViewOverlay.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -134,7 +134,7 @@ SlideSorter& ViewOverlay::GetSlideSorter (void) const OverlayManager* ViewOverlay::GetOverlayManager (void) const { OverlayManager* pOverlayManager = NULL; - + SlideSorterView& rView (mrSlideSorter.GetView()); SdrPageView* pPageView = rView.GetSdrPageView(); if (pPageView != NULL && pPageView->PageWindowCount()>0) @@ -220,7 +220,7 @@ void SubstitutionOverlay::Create ( EnsureRegistration(); maPosition = rPosition; - + maShapes.clear(); while (rSelection.HasMoreElements()) { @@ -257,7 +257,7 @@ void SubstitutionOverlay::Move (const Point& rOffset) maShapes.transform(aTranslation); maPosition += rOffset; - + objectChange(); } @@ -430,10 +430,10 @@ void InsertionIndicatorOverlay::SetPosition (const Point& rPoint) { static const bool bAllowHorizontalInsertMarker = true; Layouter& rLayouter (mrViewOverlay.GetSlideSorter().GetView().GetLayouter()); - USHORT nPageCount + USHORT nPageCount = (USHORT)mrViewOverlay.GetSlideSorter().GetModel().GetPageCount(); - sal_Int32 nInsertionIndex = rLayouter.GetInsertionIndex (rPoint, + sal_Int32 nInsertionIndex = rLayouter.GetInsertionIndex (rPoint, bAllowHorizontalInsertMarker); if (nInsertionIndex >= nPageCount) nInsertionIndex = nPageCount-1; @@ -450,13 +450,13 @@ void InsertionIndicatorOverlay::SetPosition (const Point& rPoint) // column. // 2. The vertical (standard) insert marker may be painted left to // the insert page or right of the previous one. When both pages - // are in the same row this makes no difference. Otherwise the + // are in the same row this makes no difference. Otherwise the // posiotions are at the left and right ends of two rows. Point aPageCenter (rLayouter.GetPageObjectBox ( nInsertionIndex).Center()); - if (bAllowHorizontalInsertMarker + if (bAllowHorizontalInsertMarker && rLayouter.GetColumnCount() == 1) { bVertical = false; @@ -479,7 +479,7 @@ void InsertionIndicatorOverlay::SetPosition (const Point& rPoint) Rectangle aBox; if (mnInsertionIndex >= 0) aBox = rLayouter.GetInsertionMarkerBox ( - nDrawIndex, + nDrawIndex, bVertical, bLeftOrTop); SetPositionAndSize (aBox); @@ -554,7 +554,7 @@ void MouseOverIndicatorOverlay::SetSlideUnderMouse ( { } } - + if (pDescriptor != rpDescriptor) { // Switch to the new (possibly empty) descriptor. |