diff options
author | Noel Grandin <noel@peralex.com> | 2015-04-29 09:55:11 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-05-05 09:30:40 +0200 |
commit | 6ca16a4cad999dbb0296ea64db2263a26e52f36c (patch) | |
tree | 3a7cae9635647f616df0d5ff024901331aa571fb /sd/source/ui/slidesorter | |
parent | cc7af44abd5999cf8af69dd8e5e8f86908a3fcb6 (diff) |
loplugin:staticmethods
Change-Id: Ie7a1a5bc61d19aebd11a00c63c1f4104d893efbe
Diffstat (limited to 'sd/source/ui/slidesorter')
6 files changed, 15 insertions, 15 deletions
diff --git a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx index 1ee52e80f1d6..a163f2cb6e4d 100644 --- a/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx +++ b/sd/source/ui/slidesorter/controller/SlsDragAndDropContext.cxx @@ -57,7 +57,7 @@ DragAndDropContext::DragAndDropContext (SlideSorter& rSlideSorter) if (pTreeListBoxTransferable!=NULL && !TransferableData::GetFromTransferable(pTransferable)) { pTransferable->AddUserData( - rSlideSorter.GetController().GetClipboard().CreateTransferableUserData(pTransferable)); + sd::slidesorter::controller::Clipboard::CreateTransferableUserData(pTransferable)); } rSlideSorter.GetController().GetInsertionIndicatorHandler()->UpdateIndicatorIcon(pTransferable); diff --git a/sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx b/sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx index dfeb851664ba..2ac9ec9568b5 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsAnimationFunction.hxx @@ -51,7 +51,7 @@ private: const double mnX2; const double mnY2; - double EvaluateComponent ( + static double EvaluateComponent ( const double nT, const double nV1, const double nV2); diff --git a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx index 76bc0ec9ace4..2805d874be8a 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlsClipboard.hxx @@ -66,7 +66,7 @@ public: transferable. The returned transferable is set up with all information necessary so that it can be dropped on a slide sorter. */ - ::boost::shared_ptr<SdTransferable::UserData> CreateTransferableUserData (SdTransferable* pTransferable); + static ::boost::shared_ptr<SdTransferable::UserData> CreateTransferableUserData (SdTransferable* pTransferable); void HandleSlotCall (SfxRequest& rRequest); diff --git a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx index ecda1a7bb951..c47a1eb88c33 100644 --- a/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx +++ b/sd/source/ui/slidesorter/inc/view/SlsPageObjectPainter.hxx @@ -97,14 +97,14 @@ private: PageObjectLayouter *pPageObjectLayouter, OutputDevice& rDevice, const model::SharedPageDescriptor& rpDescriptor) const; - void PaintTransitionEffect ( + static void PaintTransitionEffect ( PageObjectLayouter *pPageObjectLayouter, OutputDevice& rDevice, - const model::SharedPageDescriptor& rpDescriptor) const; - void PaintCustomAnimationEffect ( + const model::SharedPageDescriptor& rpDescriptor); + static void PaintCustomAnimationEffect ( PageObjectLayouter *pPageObjectLayouter, OutputDevice& rDevice, - const model::SharedPageDescriptor& rpDescriptor) const; + const model::SharedPageDescriptor& rpDescriptor); void PaintBorder ( OutputDevice& rDevice, const Theme::GradientColorType eColorType, @@ -114,11 +114,11 @@ private: OutputDevice& rDevice, const model::SharedPageDescriptor& rpDescriptor) const; - Bitmap CreateMarkedPreview( + static Bitmap CreateMarkedPreview( const Size& rSize, const Bitmap& rPreview, const BitmapEx& rOverlay, - const OutputDevice* pReferenceDevice) const; + const OutputDevice* pReferenceDevice); /** Update the local pointer to the page object layouter to the one owned by the general layouter. diff --git a/sd/source/ui/slidesorter/view/SlsLayouter.cxx b/sd/source/ui/slidesorter/view/SlsLayouter.cxx index 3d68dec61e4e..cb571c41dfcf 100644 --- a/sd/source/ui/slidesorter/view/SlsLayouter.cxx +++ b/sd/source/ui/slidesorter/view/SlsLayouter.cxx @@ -141,11 +141,11 @@ public: index of the lower row (nRow+1) or -1 to indicate that the position belongs to no row. */ - sal_Int32 ResolvePositionInGap ( + static sal_Int32 ResolvePositionInGap ( sal_Int32 nDistanceIntoGap, GapMembership eGapMembership, sal_Int32 nIndex, - sal_Int32 nGap) const; + sal_Int32 nGap); /** Calculate the logical part of the insert position, i.e. the page after whicht to insert. @@ -628,7 +628,7 @@ sal_Int32 Layouter::Implementation::ResolvePositionInGap ( sal_Int32 nDistanceIntoGap, GapMembership eGapMembership, sal_Int32 nIndex, - sal_Int32 nGap) const + sal_Int32 nGap) { switch (eGapMembership) { diff --git a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx index d7f9393d467f..4aebbbef8a9a 100644 --- a/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx +++ b/sd/source/ui/slidesorter/view/SlsPageObjectPainter.cxx @@ -158,7 +158,7 @@ Bitmap PageObjectPainter::CreateMarkedPreview ( const Size& rSize, const Bitmap& rPreview, const BitmapEx& rOverlay, - const OutputDevice* pReferenceDevice) const + const OutputDevice* pReferenceDevice) { ScopedVclPtr<VirtualDevice> pDevice; if (pReferenceDevice != NULL) @@ -270,7 +270,7 @@ void PageObjectPainter::PaintPageNumber ( void PageObjectPainter::PaintTransitionEffect ( PageObjectLayouter *pPageObjectLayouter, OutputDevice& rDevice, - const model::SharedPageDescriptor& rpDescriptor) const + const model::SharedPageDescriptor& rpDescriptor) { const SdPage* pPage = rpDescriptor->GetPage(); if (pPage!=NULL && pPage->getTransitionType() > 0) @@ -289,7 +289,7 @@ void PageObjectPainter::PaintTransitionEffect ( void PageObjectPainter::PaintCustomAnimationEffect ( PageObjectLayouter *pPageObjectLayouter, OutputDevice& rDevice, - const model::SharedPageDescriptor& rpDescriptor) const + const model::SharedPageDescriptor& rpDescriptor) { SdPage* pPage = rpDescriptor->GetPage(); boost::shared_ptr< MainSequence > aMainSequence = pPage->getMainSequence(); |