summaryrefslogtreecommitdiff
path: root/sd/source/ui
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2015-03-05 09:27:29 +0000
committerCaolán McNamara <caolanm@redhat.com>2015-03-05 10:57:33 +0000
commit07d62eb38e591c89e71043f842c92186e33ae14a (patch)
treef64401bc89c13f12737c3baedc67be53a4e7f804 /sd/source/ui
parent967f609cb7bcfd42ccae3d6c8ea75ef9e40910be (diff)
V801: Decreased performance
Change-Id: I5e7b5327b542f610efb0960b8bcfad10e04025b5
Diffstat (limited to 'sd/source/ui')
-rw-r--r--sd/source/ui/dlg/PaneDockingWindow.cxx6
-rw-r--r--sd/source/ui/inc/PaneDockingWindow.hxx2
-rw-r--r--sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx4
-rw-r--r--sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx2
-rw-r--r--sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx14
-rw-r--r--sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx12
-rw-r--r--sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx28
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx2
-rw-r--r--sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx4
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx6
-rw-r--r--sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx6
-rw-r--r--sd/source/ui/slidesorter/view/SlideSorterView.cxx4
-rw-r--r--sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx28
-rw-r--r--sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx24
-rw-r--r--sd/source/ui/slidesorter/view/SlsLayouter.cxx12
15 files changed, 77 insertions, 77 deletions
diff --git a/sd/source/ui/dlg/PaneDockingWindow.cxx b/sd/source/ui/dlg/PaneDockingWindow.cxx
index 5363051f0b3e..9461c9326546 100644
--- a/sd/source/ui/dlg/PaneDockingWindow.cxx
+++ b/sd/source/ui/dlg/PaneDockingWindow.cxx
@@ -95,7 +95,7 @@ void PaneDockingWindow::MouseButtonDown (const MouseEvent& rEvent)
SfxDockingWindow::MouseButtonDown(rEvent);
}
-void PaneDockingWindow::SetValidSizeRange (const Range aValidSizeRange)
+void PaneDockingWindow::SetValidSizeRange (const Range& rValidSizeRange)
{
SplitWindow* pSplitWindow = dynamic_cast<SplitWindow*>(GetParent());
if (pSplitWindow != NULL)
@@ -111,8 +111,8 @@ void PaneDockingWindow::SetValidSizeRange (const Range aValidSizeRange)
pSplitWindow->SetItemSizeRange(
nSetId,
Range(
- aValidSizeRange.Min() + nCompensation,
- aValidSizeRange.Max() + nCompensation));
+ rValidSizeRange.Min() + nCompensation,
+ rValidSizeRange.Max() + nCompensation));
}
}
diff --git a/sd/source/ui/inc/PaneDockingWindow.hxx b/sd/source/ui/inc/PaneDockingWindow.hxx
index 54d6bf43a2b3..fd908f7f033a 100644
--- a/sd/source/ui/inc/PaneDockingWindow.hxx
+++ b/sd/source/ui/inc/PaneDockingWindow.hxx
@@ -56,7 +56,7 @@ public:
virtual void MouseButtonDown (const MouseEvent& rEvent) SAL_OVERRIDE;
/** When docked the given range is passed to the parent SplitWindow.
*/
- void SetValidSizeRange (const Range aValidSizeRange);
+ void SetValidSizeRange (const Range& rValidSizeRange);
enum Orientation { HorizontalOrientation, VerticalOrientation, UnknownOrientation };
/** When the PaneDockingWindow is docked and managed by a split window
diff --git a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
index 43eb665d2b04..3338bfeac24e 100644
--- a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx
@@ -111,7 +111,7 @@ void DragAndDropContext::UpdatePosition (
void DragAndDropContext::SetTargetSlideSorter (
SlideSorter* pSlideSorter,
- const Point aMousePosition,
+ const Point& rMousePosition,
const InsertionIndicatorHandler::Mode eMode,
const bool bIsOverSourceView)
{
@@ -129,7 +129,7 @@ void DragAndDropContext::SetTargetSlideSorter (
mpTargetSlideSorter->GetController().GetInsertionIndicatorHandler()->Start(
bIsOverSourceView);
mpTargetSlideSorter->GetController().GetInsertionIndicatorHandler()->UpdatePosition(
- aMousePosition,
+ rMousePosition,
eMode);
}
diff --git a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx
index 6887e7b53e4e..9af4797e3478 100644
--- a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx
+++ b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.hxx
@@ -62,7 +62,7 @@ public:
void SetTargetSlideSorter (
SlideSorter* pSlideSorter = NULL,
- const Point aMousePosition = Point(0,0),
+ const Point& rMousePosition = Point(0,0),
const InsertionIndicatorHandler::Mode eMode = InsertionIndicatorHandler::UnknownMode,
const bool bIsOverSourceView = false);
diff --git a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
index 34305272a043..d82a0e004bd7 100644
--- a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx
@@ -407,12 +407,12 @@ bool ScrollBarManager::TestScrollBarVisibilities (
return false;
}
-void ScrollBarManager::SetTopLeft (const Point aNewTopLeft)
+void ScrollBarManager::SetTopLeft(const Point& rNewTopLeft)
{
if (( ! mpVerticalScrollBar
- || mpVerticalScrollBar->GetThumbPos() == aNewTopLeft.Y())
+ || mpVerticalScrollBar->GetThumbPos() == rNewTopLeft.Y())
&& ( ! mpHorizontalScrollBar
- || mpHorizontalScrollBar->GetThumbPos() == aNewTopLeft.X()))
+ || mpHorizontalScrollBar->GetThumbPos() == rNewTopLeft.X()))
return;
// Flush pending repaints before scrolling to avoid temporary artifacts.
@@ -420,13 +420,13 @@ void ScrollBarManager::SetTopLeft (const Point aNewTopLeft)
if (mpVerticalScrollBar)
{
- mpVerticalScrollBar->SetThumbPos(aNewTopLeft.Y());
- mnVerticalPosition = aNewTopLeft.Y() / double(mpVerticalScrollBar->GetRange().Len());
+ mpVerticalScrollBar->SetThumbPos(rNewTopLeft.Y());
+ mnVerticalPosition = rNewTopLeft.Y() / double(mpVerticalScrollBar->GetRange().Len());
}
if (mpHorizontalScrollBar)
{
- mpHorizontalScrollBar->SetThumbPos(aNewTopLeft.X());
- mnHorizontalPosition = aNewTopLeft.X() / double(mpHorizontalScrollBar->GetRange().Len());
+ mpHorizontalScrollBar->SetThumbPos(rNewTopLeft.X());
+ mnHorizontalPosition = rNewTopLeft.X() / double(mpHorizontalScrollBar->GetRange().Len());
}
mrSlideSorter.GetContentWindow()->SetVisibleXY(mnHorizontalPosition, mnVerticalPosition);
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
index 071f2819af94..64ee5effc7e8 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
@@ -701,7 +701,7 @@ void SelectionFunction::SwitchToNormalMode (void)
new NormalModeHandler(mrSlideSorter, *this)));
}
-void SelectionFunction::SwitchToDragAndDropMode (const Point aMousePosition)
+void SelectionFunction::SwitchToDragAndDropMode (const Point& rMousePosition)
{
if (mpModeHandler->GetMode() != DragAndDropMode)
{
@@ -712,23 +712,23 @@ void SelectionFunction::SwitchToDragAndDropMode (const Point aMousePosition)
// Delayed initialization, only after mpModeHanler is set, otherwise DND initialization
// could already trigger DND events, which would recursively trigger this code again,
// and without mpModeHandler set it would again try to set a new handler.
- handler->Initialize(aMousePosition, mpWindow);
+ handler->Initialize(rMousePosition, mpWindow);
#else
SwitchMode(::boost::shared_ptr<ModeHandler>(
- new DragAndDropModeHandler(mrSlideSorter, *this, aMousePosition, mpWindow)));
+ new DragAndDropModeHandler(mrSlideSorter, *this, rMousePosition, mpWindow)));
#endif
}
}
void SelectionFunction::SwitchToMultiSelectionMode (
- const Point aMousePosition,
+ const Point& rMousePosition,
const sal_uInt32 nEventCode)
{
if (mpModeHandler->GetMode() != MultiSelectionMode)
#ifndef MACOSX
{
::boost::shared_ptr<MultiSelectionModeHandler> handler(
- new MultiSelectionModeHandler(mrSlideSorter, *this, aMousePosition));
+ new MultiSelectionModeHandler(mrSlideSorter, *this, rMousePosition));
SwitchMode(handler);
// Delayed initialization, only after mpModeHanler is set, the handle ctor
// is non-trivial, so it could possibly recurse just like the DND handler above.
@@ -736,7 +736,7 @@ void SelectionFunction::SwitchToMultiSelectionMode (
}
#else
SwitchMode(::boost::shared_ptr<ModeHandler>(
- new MultiSelectionModeHandler(mrSlideSorter, *this, aMousePosition, nEventCode)));
+ new MultiSelectionModeHandler(mrSlideSorter, *this, rMousePosition, nEventCode)));
#endif
}
diff --git a/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx b/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx
index a008fa1b91ab..8ccb1106c5e6 100644
--- a/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsVisibleAreaManager.cxx
@@ -36,8 +36,8 @@ namespace {
public:
VisibleAreaScroller (
SlideSorter& rSlideSorter,
- const Point aStart,
- const Point aEnd);
+ const Point& rStart,
+ const Point& rEnd);
void operator() (const double nValue);
private:
SlideSorter& mrSlideSorter;
@@ -221,11 +221,11 @@ const static sal_Int32 gnMaxScrollDistance = 300;
VisibleAreaScroller::VisibleAreaScroller (
SlideSorter& rSlideSorter,
- const Point aStart,
- const Point aEnd)
+ const Point& rStart,
+ const Point& rEnd)
: mrSlideSorter(rSlideSorter),
- maStart(aStart),
- maEnd(aEnd),
+ maStart(rStart),
+ maEnd(rEnd),
maAccelerationFunction(
controller::AnimationParametricFunction(
controller::AnimationBezierFunction (0.1,0.6)))
@@ -233,19 +233,19 @@ VisibleAreaScroller::VisibleAreaScroller (
// When the distance to scroll is larger than a threshold then first
// jump to within this distance of the final value and start the
// animation from there.
- if (std::abs(aStart.X()-aEnd.X()) > gnMaxScrollDistance)
+ if (std::abs(rStart.X()-rEnd.X()) > gnMaxScrollDistance)
{
- if (aStart.X() < aEnd.X())
- maStart.X() = aEnd.X()-gnMaxScrollDistance;
+ if (rStart.X() < rEnd.X())
+ maStart.X() = rEnd.X()-gnMaxScrollDistance;
else
- maStart.X() = aEnd.X()+gnMaxScrollDistance;
+ maStart.X() = rEnd.X()+gnMaxScrollDistance;
}
- if (std::abs(aStart.Y()-aEnd.Y()) > gnMaxScrollDistance)
+ if (std::abs(rStart.Y()-rEnd.Y()) > gnMaxScrollDistance)
{
- if (aStart.Y() < aEnd.Y())
- maStart.Y() = aEnd.Y()-gnMaxScrollDistance;
+ if (rStart.Y() < rEnd.Y())
+ maStart.Y() = rEnd.Y()-gnMaxScrollDistance;
else
- maStart.Y() = aEnd.Y()+gnMaxScrollDistance;
+ maStart.Y() = rEnd.Y()+gnMaxScrollDistance;
}
}
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx
index 8a7fe7c93d57..5e70abfdfeba 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsScrollBarManager.hxx
@@ -125,7 +125,7 @@ public:
/** Update the vertical and horizontal scroll bars so that the visible
area has the given top and left values.
*/
- void SetTopLeft (const Point aNewTopLeft);
+ void SetTopLeft (const Point& rNewTopLeft);
/** Return the width of the vertical scroll bar, which--when
shown--should be fixed in contrast to its height.
diff --git a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx
index 8128b6b14301..6142fdf7f587 100644
--- a/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx
+++ b/sd/source/ui/slidesorter/inc/controller/SlsSelectionFunction.hxx
@@ -96,8 +96,8 @@ public:
ButtonMode
};
void SwitchToNormalMode (void);
- void SwitchToDragAndDropMode(const Point aMousePosition);
- void SwitchToMultiSelectionMode (const Point aMousePosition, const sal_uInt32 nEventCode);
+ void SwitchToDragAndDropMode(const Point& rMousePosition);
+ void SwitchToMultiSelectionMode (const Point& rMousePosition, const sal_uInt32 nEventCode);
void ResetShiftKeySelectionAnchor (void);
/** Special case handling for when the context menu is hidden. This
diff --git a/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx b/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx
index 4479aaa2fd3c..6424c027232c 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsInsertionIndicatorOverlay.hxx
@@ -92,14 +92,14 @@ private:
void SetPositionAndSize (const Rectangle& rBoundingBox);
Point PaintRepresentatives (
OutputDevice& rContent,
- const Size aPreviewSize,
+ const Size& rPreviewSize,
const sal_Int32 nOffset,
const ::std::vector<controller::TransferableData::Representative>& rPages) const;
void PaintPageCount (
OutputDevice& rDevice,
const sal_Int32 nSelectionCount,
- const Size aPreviewSize,
- const Point aFirstPageOffset) const;
+ const Size& rPreviewSize,
+ const Point& rFirstPageOffset) const;
/** Setup the insertion indicator by creating the icon. It consists of
scaled down previews of some of the selected pages.
*/
diff --git a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx
index a04d5fba8733..4402129fc36f 100644
--- a/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx
+++ b/sd/source/ui/slidesorter/inc/view/SlsLayouter.hxx
@@ -214,9 +214,9 @@ public:
const bool bIsAtRunEnd,
const bool bIsExtraSpaceNeeded);
void SetGeometricalPosition(
- const Point aLocation,
- const Point aLeadingOffset,
- const Point aTrailingOffset);
+ const Point& rLocation,
+ const Point& rLeadingOffset,
+ const Point& rTrailingOffset);
sal_Int32 GetRow (void) const { return mnRow; }
sal_Int32 GetColumn (void) const { return mnColumn; }
diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
index 4d34b14cae8e..7b60a294f2a6 100644
--- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx
+++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx
@@ -108,7 +108,7 @@ class BackgroundPainter
public ::boost::noncopyable
{
public:
- BackgroundPainter (const Color aBackgroundColor) : maBackgroundColor(aBackgroundColor) {}
+ BackgroundPainter (const Color& rBackgroundColor) : maBackgroundColor(rBackgroundColor) {}
virtual ~BackgroundPainter (void) {}
virtual void Paint (OutputDevice& rDevice, const Rectangle& rRepaintArea) SAL_OVERRIDE
@@ -120,7 +120,7 @@ public:
virtual void SetLayerInvalidator (const SharedILayerInvalidator&) SAL_OVERRIDE {}
- void SetColor (const Color aColor) { maBackgroundColor = aColor; }
+ void SetColor (const Color& rColor) { maBackgroundColor = rColor; }
private:
Color maBackgroundColor;
diff --git a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
index a873e4e1399e..8fb9eba6deab 100644
--- a/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
+++ b/sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx
@@ -38,8 +38,8 @@ class PageObjectRun;
class AnimatorAccess
{
public:
- virtual void AddRun (const ::boost::shared_ptr<PageObjectRun> pRun) = 0;
- virtual void RemoveRun (const ::boost::shared_ptr<PageObjectRun> pRun) = 0;
+ virtual void AddRun (const ::boost::shared_ptr<PageObjectRun>& rRun) = 0;
+ virtual void RemoveRun (const ::boost::shared_ptr<PageObjectRun>& rRun) = 0;
virtual model::SlideSorterModel& GetModel (void) const = 0;
virtual view::SlideSorterView& GetView (void) const = 0;
virtual ::boost::shared_ptr<controller::Animator> GetAnimator (void) = 0;
@@ -122,8 +122,8 @@ public:
const InsertPosition& rInsertPosition,
const controller::Animator::AnimationMode eAnimationMode);
- virtual void AddRun (const ::boost::shared_ptr<PageObjectRun> pRun) SAL_OVERRIDE;
- virtual void RemoveRun (const ::boost::shared_ptr<PageObjectRun> pRun) SAL_OVERRIDE;
+ virtual void AddRun (const ::boost::shared_ptr<PageObjectRun>& rRun) SAL_OVERRIDE;
+ virtual void RemoveRun (const ::boost::shared_ptr<PageObjectRun>& rRun) SAL_OVERRIDE;
virtual model::SlideSorterModel& GetModel (void) const SAL_OVERRIDE { return mrModel; }
virtual view::SlideSorterView& GetView (void) const SAL_OVERRIDE { return mrView; }
@@ -264,36 +264,36 @@ InsertAnimator::Implementation::RunContainer::const_iterator
nRunIndex));
}
-void InsertAnimator::Implementation::AddRun (const ::boost::shared_ptr<PageObjectRun> pRun)
+void InsertAnimator::Implementation::AddRun (const ::boost::shared_ptr<PageObjectRun>& rRun)
{
- if (pRun)
+ if (rRun)
{
- maRuns.insert(pRun);
+ maRuns.insert(rRun);
}
else
{
- OSL_ASSERT(pRun);
+ OSL_ASSERT(rRun);
}
}
-void InsertAnimator::Implementation::RemoveRun (const ::boost::shared_ptr<PageObjectRun> pRun)
+void InsertAnimator::Implementation::RemoveRun (const ::boost::shared_ptr<PageObjectRun>& rRun)
{
- if (pRun)
+ if (rRun)
{
// Do not remove runs that show the space for the insertion indicator.
- if (pRun->mnLocalInsertIndex == -1)
+ if (rRun->mnLocalInsertIndex == -1)
{
- InsertAnimator::Implementation::RunContainer::const_iterator iRun (FindRun(pRun->mnRunIndex));
+ InsertAnimator::Implementation::RunContainer::const_iterator iRun (FindRun(rRun->mnRunIndex));
if (iRun != maRuns.end())
{
- OSL_ASSERT(*iRun == pRun);
+ OSL_ASSERT(*iRun == rRun);
maRuns.erase(iRun);
}
}
}
else
{
- OSL_ASSERT(pRun);
+ OSL_ASSERT(rRun);
}
}
diff --git a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
index a916b40580c0..6862a69dccd1 100644
--- a/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
+++ b/sd/source/ui/slidesorter/view/SlsInsertionIndicatorOverlay.cxx
@@ -152,7 +152,7 @@ void InsertionIndicatorOverlay::Create (
Point InsertionIndicatorOverlay::PaintRepresentatives (
OutputDevice& rContent,
- const Size aPreviewSize,
+ const Size& rPreviewSize,
const sal_Int32 nOffset,
const ::std::vector<controller::TransferableData::Representative>& rRepresentatives) const
{
@@ -187,7 +187,7 @@ Point InsertionIndicatorOverlay::PaintRepresentatives (
// Paint the preview.
Bitmap aPreview (rRepresentatives[nIndex].maBitmap);
- aPreview.Scale(aPreviewSize, BMP_SCALE_BESTQUALITY);
+ aPreview.Scale(rPreviewSize, BMP_SCALE_BESTQUALITY);
rContent.DrawBitmapEx(aPageOffset, aPreview);
// When the page is marked as excluded from the slide show then
@@ -195,14 +195,14 @@ Point InsertionIndicatorOverlay::PaintRepresentatives (
if (rRepresentatives[nIndex].mbIsExcluded)
{
const vcl::Region aSavedClipRegion (rContent.GetClipRegion());
- rContent.IntersectClipRegion(Rectangle(aPageOffset, aPreviewSize));
+ rContent.IntersectClipRegion(Rectangle(aPageOffset, rPreviewSize));
// Paint bitmap tiled over the preview to mark it as excluded.
const sal_Int32 nIconWidth (aExclusionOverlay.GetSizePixel().Width());
const sal_Int32 nIconHeight (aExclusionOverlay.GetSizePixel().Height());
if (nIconWidth>0 && nIconHeight>0)
{
- for (sal_Int32 nX=0; nX<aPreviewSize.Width(); nX+=nIconWidth)
- for (sal_Int32 nY=0; nY<aPreviewSize.Height(); nY+=nIconHeight)
+ for (sal_Int32 nX=0; nX<rPreviewSize.Width(); nX+=nIconWidth)
+ for (sal_Int32 nY=0; nY<rPreviewSize.Height(); nY+=nIconHeight)
rContent.DrawBitmapEx(Point(nX,nY)+aPageOffset, aExclusionOverlay);
}
rContent.SetClipRegion(aSavedClipRegion);
@@ -212,8 +212,8 @@ Point InsertionIndicatorOverlay::PaintRepresentatives (
Rectangle aBox (
aPageOffset.X(),
aPageOffset.Y(),
- aPageOffset.X()+aPreviewSize.Width()-1,
- aPageOffset.Y()+aPreviewSize.Height()-1);
+ aPageOffset.X()+rPreviewSize.Width()-1,
+ aPageOffset.Y()+rPreviewSize.Height()-1);
rContent.SetFillColor(COL_BLACK);
rContent.SetLineColor();
rContent.DrawTransparent(
@@ -239,8 +239,8 @@ Point InsertionIndicatorOverlay::PaintRepresentatives (
void InsertionIndicatorOverlay::PaintPageCount (
OutputDevice& rDevice,
const sal_Int32 nSelectionCount,
- const Size aPreviewSize,
- const Point aFirstPageOffset) const
+ const Size& rPreviewSize,
+ const Point& rFirstPageOffset) const
{
// Paint the number of slides.
::boost::shared_ptr<view::Theme> pTheme (mrSlideSorter.GetTheme());
@@ -257,11 +257,11 @@ void InsertionIndicatorOverlay::PaintPageCount (
Point aTextOffset (aTextBox.TopLeft());
Size aTextSize (aTextBox.GetSize());
// Place text inside the first page preview.
- Point aTextLocation(aFirstPageOffset);
+ Point aTextLocation(rFirstPageOffset);
// Center the text.
aTextLocation += Point(
- (aPreviewSize.Width()-aTextBox.GetWidth())/2,
- (aPreviewSize.Height()-aTextBox.GetHeight())/2);
+ (rPreviewSize.Width()-aTextBox.GetWidth())/2,
+ (rPreviewSize.Height()-aTextBox.GetHeight())/2);
aTextBox = Rectangle(aTextLocation, aTextSize);
// Paint background, border and text.
diff --git a/sd/source/ui/slidesorter/view/SlsLayouter.cxx b/sd/source/ui/slidesorter/view/SlsLayouter.cxx
index bcffcab40632..155652f3d487 100644
--- a/sd/source/ui/slidesorter/view/SlsLayouter.cxx
+++ b/sd/source/ui/slidesorter/view/SlsLayouter.cxx
@@ -1249,13 +1249,13 @@ void InsertPosition::SetLogicalPosition (
}
void InsertPosition::SetGeometricalPosition(
- const Point aLocation,
- const Point aLeadingOffset,
- const Point aTrailingOffset)
+ const Point& rLocation,
+ const Point& rLeadingOffset,
+ const Point& rTrailingOffset)
{
- maLocation = aLocation;
- maLeadingOffset = aLeadingOffset;
- maTrailingOffset = aTrailingOffset;
+ maLocation = rLocation;
+ maLeadingOffset = rLeadingOffset;
+ maTrailingOffset = rTrailingOffset;
}
} } } // end of namespace ::sd::slidesorter::namespace