diff options
Diffstat (limited to 'sd/source/ui/slidesorter/view')
4 files changed, 34 insertions, 34 deletions
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 |