summaryrefslogtreecommitdiff
path: root/sd/source/ui/inc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-04-29 09:55:11 +0200
committerNoel Grandin <noel@peralex.com>2015-05-05 09:30:40 +0200
commit6ca16a4cad999dbb0296ea64db2263a26e52f36c (patch)
tree3a7cae9635647f616df0d5ff024901331aa571fb /sd/source/ui/inc
parentcc7af44abd5999cf8af69dd8e5e8f86908a3fcb6 (diff)
loplugin:staticmethods
Change-Id: Ie7a1a5bc61d19aebd11a00c63c1f4104d893efbe
Diffstat (limited to 'sd/source/ui/inc')
-rw-r--r--sd/source/ui/inc/DrawController.hxx2
-rw-r--r--sd/source/ui/inc/DrawDocShell.hxx2
-rw-r--r--sd/source/ui/inc/DrawViewShell.hxx4
-rw-r--r--sd/source/ui/inc/OutlineView.hxx8
-rw-r--r--sd/source/ui/inc/OutlineViewShell.hxx2
-rw-r--r--sd/source/ui/inc/SlideSorterViewShell.hxx2
-rw-r--r--sd/source/ui/inc/ViewClipboard.hxx2
-rw-r--r--sd/source/ui/inc/ViewTabBar.hxx2
-rw-r--r--sd/source/ui/inc/fumorph.hxx10
-rw-r--r--sd/source/ui/inc/fupoor.hxx2
-rw-r--r--sd/source/ui/inc/navigatr.hxx4
-rw-r--r--sd/source/ui/inc/smarttag.hxx2
-rw-r--r--sd/source/ui/inc/tbx_ww.hxx2
-rw-r--r--sd/source/ui/inc/tools/SlotStateListener.hxx2
-rw-r--r--sd/source/ui/inc/tpaction.hxx4
-rw-r--r--sd/source/ui/inc/tpoption.hxx6
-rw-r--r--sd/source/ui/inc/unosrch.hxx4
-rw-r--r--sd/source/ui/inc/vectdlg.hxx2
18 files changed, 31 insertions, 31 deletions
diff --git a/sd/source/ui/inc/DrawController.hxx b/sd/source/ui/inc/DrawController.hxx
index 8db4323178c3..6bdf397e5f7e 100644
--- a/sd/source/ui/inc/DrawController.hxx
+++ b/sd/source/ui/inc/DrawController.hxx
@@ -239,7 +239,7 @@ protected:
*/
virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper() SAL_OVERRIDE;
- void FillPropertyTable (
+ static void FillPropertyTable (
::std::vector< ::com::sun::star::beans::Property>& rProperties);
/**
diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx
index 3d15c4d5fd85..5b82479ebf28 100644
--- a/sd/source/ui/inc/DrawDocShell.hxx
+++ b/sd/source/ui/inc/DrawDocShell.hxx
@@ -229,7 +229,7 @@ protected:
void Construct(bool bClipboard);
virtual void InPlaceActivate( bool bActive ) SAL_OVERRIDE;
private:
- void setEditMode(DrawViewShell* pDrawViewShell, bool isMasterPage);
+ static void setEditMode(DrawViewShell* pDrawViewShell, bool isMasterPage);
};
#ifndef SV_DECL_DRAW_DOC_SHELL_DEFINED
diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx
index 120fbeb5aa93..73f17fb8577e 100644
--- a/sd/source/ui/inc/DrawViewShell.hxx
+++ b/sd/source/ui/inc/DrawViewShell.hxx
@@ -270,7 +270,7 @@ public:
void SetZoomOnPage( bool bZoom = true ) { mbZoomOnPage = bZoom; }
bool IsZoomOnPage() { return mbZoomOnPage; }
- void CheckLineTo (SfxRequest& rReq);
+ static void CheckLineTo (SfxRequest& rReq);
void SetChildWindowState( SfxItemSet& rSet );
void UpdateIMapDlg( SdrObject* pObj );
@@ -412,7 +412,7 @@ protected:
void SetupPage( Size &rSize, long nLeft, long nRight, long nUpper, long nLower,
bool bSize, bool bMargin, bool bScaleAll );
- sal_uInt16 GetIdBySubId( sal_uInt16 nSId );
+ static sal_uInt16 GetIdBySubId( sal_uInt16 nSId );
void MapSlot( sal_uInt16 nSId );
void UpdateToolboxImages( SfxItemSet &rSet, bool bPermanent = true );
sal_uInt16 GetMappedSlot( sal_uInt16 nSId );
diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx
index 779b07669180..cf81a0a94966 100644
--- a/sd/source/ui/inc/OutlineView.hxx
+++ b/sd/source/ui/inc/OutlineView.hxx
@@ -71,11 +71,11 @@ public:
TYPEINFO_OVERRIDE();
- SdrTextObj* GetTitleTextObject(SdrPage* pPage);
- SdrTextObj* GetOutlineTextObject(SdrPage* pPage);
+ static SdrTextObj* GetTitleTextObject(SdrPage* pPage);
+ static SdrTextObj* GetOutlineTextObject(SdrPage* pPage);
- SdrTextObj* CreateTitleTextObject(SdPage* pPage);
- SdrTextObj* CreateOutlineTextObject(SdPage* pPage);
+ static SdrTextObj* CreateTitleTextObject(SdPage* pPage);
+ static SdrTextObj* CreateOutlineTextObject(SdPage* pPage);
virtual void AddWindowToPaintView(OutputDevice* pWin) SAL_OVERRIDE;
virtual void DeleteWindowFromPaintView(OutputDevice* pWin) SAL_OVERRIDE;
diff --git a/sd/source/ui/inc/OutlineViewShell.hxx b/sd/source/ui/inc/OutlineViewShell.hxx
index 3a25cc58ff1b..08bbf1b9b897 100644
--- a/sd/source/ui/inc/OutlineViewShell.hxx
+++ b/sd/source/ui/inc/OutlineViewShell.hxx
@@ -92,7 +92,7 @@ public:
void GetAttrState(SfxItemSet &rSet);
void GetState (SfxItemSet& rSet);
- void ExecStatusBar(SfxRequest& rReq);
+ static void ExecStatusBar(SfxRequest& rReq);
void GetStatusBarState(SfxItemSet& rSet);
void FuTemporary(SfxRequest &rReq);
diff --git a/sd/source/ui/inc/SlideSorterViewShell.hxx b/sd/source/ui/inc/SlideSorterViewShell.hxx
index 52fd77e283ad..fe039105d026 100644
--- a/sd/source/ui/inc/SlideSorterViewShell.hxx
+++ b/sd/source/ui/inc/SlideSorterViewShell.hxx
@@ -84,7 +84,7 @@ public:
void GetStatusBarState (SfxItemSet& rSet);
void FuPermanent (SfxRequest& rRequest);
void GetAttrState (SfxItemSet& rSet);
- void ExecStatusBar (SfxRequest& rRequest);
+ static void ExecStatusBar (SfxRequest& rRequest);
virtual void Command (const CommandEvent& rEvent, ::sd::Window* pWindow) SAL_OVERRIDE;
void GetMenuState (SfxItemSet &rSet);
void GetClipboardState (SfxItemSet &rSet);
diff --git a/sd/source/ui/inc/ViewClipboard.hxx b/sd/source/ui/inc/ViewClipboard.hxx
index 6778d7dcf09d..0a33e16512b0 100644
--- a/sd/source/ui/inc/ViewClipboard.hxx
+++ b/sd/source/ui/inc/ViewClipboard.hxx
@@ -49,7 +49,7 @@ protected:
bookmark list of the transferable contains at least one non-master
page then NULL is returned.
*/
- SdPage* GetFirstMasterPage (const SdTransferable& rTransferable);
+ static SdPage* GetFirstMasterPage (const SdTransferable& rTransferable);
/** Assign the (first) master page of the given transferable to the
(...) slide.
diff --git a/sd/source/ui/inc/ViewTabBar.hxx b/sd/source/ui/inc/ViewTabBar.hxx
index c4db3e6536ae..c50ce4d8c1ba 100644
--- a/sd/source/ui/inc/ViewTabBar.hxx
+++ b/sd/source/ui/inc/ViewTabBar.hxx
@@ -177,7 +177,7 @@ private:
::com::sun::star::drawing::framework::XResourceId>& rxViewTabBarId,
const ::com::sun::star::uno::Reference<
::com::sun::star::frame::XController>& rxController);
- const ::com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId();
+ static const ::com::sun::star::uno::Sequence<sal_Int8>& getUnoTunnelId();
};
} // end of namespace sd
diff --git a/sd/source/ui/inc/fumorph.hxx b/sd/source/ui/inc/fumorph.hxx
index ce591a3bb404..7b5f77318a86 100644
--- a/sd/source/ui/inc/fumorph.hxx
+++ b/sd/source/ui/inc/fumorph.hxx
@@ -59,30 +59,30 @@ private:
const SdrObject* pObj2
);
- ::basegfx::B2DPolyPolygon* ImpCreateMorphedPolygon(
+ static ::basegfx::B2DPolyPolygon* ImpCreateMorphedPolygon(
const ::basegfx::B2DPolyPolygon& rPolyPolyStart,
const ::basegfx::B2DPolyPolygon& rPolyPolyEnd,
double fMorphingFactor
);
- bool ImpMorphPolygons(
+ static bool ImpMorphPolygons(
const ::basegfx::B2DPolyPolygon& rPolyPoly1,
const ::basegfx::B2DPolyPolygon& rPolyPoly2,
const sal_uInt16 nSteps,
B2DPolyPolygonList_impl& rPolyPolyList3D
);
- void ImpAddPolys(
+ static void ImpAddPolys(
::basegfx::B2DPolyPolygon& rSmaller,
const ::basegfx::B2DPolyPolygon& rBigger
);
- void ImpEqualizePolyPointCount(
+ static void ImpEqualizePolyPointCount(
::basegfx::B2DPolygon& rSmall,
const ::basegfx::B2DPolygon& rBig
);
- sal_uInt32 ImpGetNearestIndex(
+ static sal_uInt32 ImpGetNearestIndex(
const ::basegfx::B2DPolygon& rPoly,
const ::basegfx::B2DPoint& rPos
);
diff --git a/sd/source/ui/inc/fupoor.hxx b/sd/source/ui/inc/fupoor.hxx
index 3973b13acb22..e40c36cbd587 100644
--- a/sd/source/ui/inc/fupoor.hxx
+++ b/sd/source/ui/inc/fupoor.hxx
@@ -128,7 +128,7 @@ protected:
DECL_LINK( DelayHdl, void * );
- void ImpForceQuadratic(Rectangle& rRect);
+ static void ImpForceQuadratic(Rectangle& rRect);
/** Switch to another layer. The layer to switch to is specified by an
offset relative to the active layer. With respect to the layer bar
diff --git a/sd/source/ui/inc/navigatr.hxx b/sd/source/ui/inc/navigatr.hxx
index e6dff433bc22..aae2ba0fa7a7 100644
--- a/sd/source/ui/inc/navigatr.hxx
+++ b/sd/source/ui/inc/navigatr.hxx
@@ -141,7 +141,7 @@ private:
*/
// bool mbShowAllShapes;
- sal_uInt16 GetDragTypeSdResId( NavigatorDragType eDT, bool bImage = false );
+ static sal_uInt16 GetDragTypeSdResId( NavigatorDragType eDT, bool bImage = false );
NavDocInfo* GetDocInfo();
DECL_LINK( GetFocusObjectsHdl, void * );
@@ -159,7 +159,7 @@ private:
void ApplyImageList();
public:
//when object is marked , fresh the corresponding entry tree .
- sd::DrawDocShell* GetDrawDocShell(const SdDrawDocument*);
+ static sd::DrawDocShell* GetDrawDocShell(const SdDrawDocument*);
void FreshTree ( const SdDrawDocument* pDoc );
void FreshEntry( );
};
diff --git a/sd/source/ui/inc/smarttag.hxx b/sd/source/ui/inc/smarttag.hxx
index 0051ce18a33f..9aafedffc6ca 100644
--- a/sd/source/ui/inc/smarttag.hxx
+++ b/sd/source/ui/inc/smarttag.hxx
@@ -135,7 +135,7 @@ public:
sal_uLong GetMarkablePointCount() const;
bool HasMarkedPoints() const;
sal_uLong GetMarkedPointCount() const;
- bool IsPointMarkable(const SdrHdl& rHdl) const;
+ static bool IsPointMarkable(const SdrHdl& rHdl);
bool MarkPoint(SdrHdl& rHdl, bool bUnmark=false);
bool MarkPoints(const Rectangle* pRect, bool bUnmark);
diff --git a/sd/source/ui/inc/tbx_ww.hxx b/sd/source/ui/inc/tbx_ww.hxx
index 9754107f4ee1..4f038c999df8 100644
--- a/sd/source/ui/inc/tbx_ww.hxx
+++ b/sd/source/ui/inc/tbx_ww.hxx
@@ -26,7 +26,7 @@
class SdTbxControl : public SfxToolBoxControl
{
private:
- bool IsCheckable( sal_uInt16 nSId );
+ static bool IsCheckable( sal_uInt16 nSId );
public:
SFX_DECL_TOOLBOX_CONTROL();
diff --git a/sd/source/ui/inc/tools/SlotStateListener.hxx b/sd/source/ui/inc/tools/SlotStateListener.hxx
index 1837996cc4dd..37c78e703ec1 100644
--- a/sd/source/ui/inc/tools/SlotStateListener.hxx
+++ b/sd/source/ui/inc/tools/SlotStateListener.hxx
@@ -134,7 +134,7 @@ private:
/** Transform the given string into a URL object.
*/
- ::com::sun::star::util::URL MakeURL (const OUString& rSlotName) const;
+ static ::com::sun::star::util::URL MakeURL (const OUString& rSlotName);
/** Return an XDispatch object for the given URL.
*/
diff --git a/sd/source/ui/inc/tpaction.hxx b/sd/source/ui/inc/tpaction.hxx
index 8865c0579141..09ebf54a72e0 100644
--- a/sd/source/ui/inc/tpaction.hxx
+++ b/sd/source/ui/inc/tpaction.hxx
@@ -91,8 +91,8 @@ private:
void SetActualAnimationEffect( ::com::sun::star::presentation::AnimationEffect eAE );
void SetEditText( OUString const & rStr );
OUString GetEditText( bool bURL = false );
- sal_uInt16 GetClickActionSdResId( ::com::sun::star::presentation::ClickAction eCA );
- sal_uInt16 GetAnimationEffectSdResId( ::com::sun::star::presentation::AnimationEffect eAE );
+ static sal_uInt16 GetClickActionSdResId( ::com::sun::star::presentation::ClickAction eCA );
+ sal_uInt16 GetAnimationEffectSdResId( ::com::sun::star::presentation::AnimationEffect eAE );
public:
SdTPAction( vcl::Window* pParent, const SfxItemSet& rInAttrs );
diff --git a/sd/source/ui/inc/tpoption.hxx b/sd/source/ui/inc/tpoption.hxx
index ffb600ea8f3e..ed8c5e2beea1 100644
--- a/sd/source/ui/inc/tpoption.hxx
+++ b/sd/source/ui/inc/tpoption.hxx
@@ -114,8 +114,8 @@ private:
SfxMapUnit ePoolUnit;
- OUString GetScale( sal_Int32 nX, sal_Int32 nY );
- bool SetScale( const OUString& aScale, sal_Int32& rX, sal_Int32& rY );
+ static OUString GetScale( sal_Int32 nX, sal_Int32 nY );
+ static bool SetScale( const OUString& aScale, sal_Int32& rX, sal_Int32& rY );
DECL_LINK( SelectMetricHdl_Impl, void * );
@@ -148,7 +148,7 @@ public:
and arrange the visible controls. Do not call this method or the
<member>SetDrawMode()</member> method more than once.
*/
- void SetImpressMode();
+ static void SetImpressMode();
virtual void PageCreated(const SfxAllItemSet& aSet) SAL_OVERRIDE;
using TabPage::ActivatePage;
diff --git a/sd/source/ui/inc/unosrch.hxx b/sd/source/ui/inc/unosrch.hxx
index 6e644681577e..13b183ecd2d2 100644
--- a/sd/source/ui/inc/unosrch.hxx
+++ b/sd/source/ui/inc/unosrch.hxx
@@ -46,8 +46,8 @@ protected:
::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > Search( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > xText, SdUnoSearchReplaceDescriptor* pDescr ) throw();
bool Search( const OUString& rText, sal_Int32& nStartPos, sal_Int32& nEndPos, SdUnoSearchReplaceDescriptor* pDescr ) throw();
- ESelection GetSelection( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > xTextRange ) throw();
- ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > GetShape( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > xTextRange ) throw();
+ static ESelection GetSelection( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > xTextRange ) throw();
+ static ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > GetShape( ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > xTextRange ) throw();
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > GetNextShape( ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > xShapes, ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > xCurrentShape ) throw();
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > GetCurrentShape() const throw();
diff --git a/sd/source/ui/inc/vectdlg.hxx b/sd/source/ui/inc/vectdlg.hxx
index fefa8efe82ef..d76b66fa6588 100644
--- a/sd/source/ui/inc/vectdlg.hxx
+++ b/sd/source/ui/inc/vectdlg.hxx
@@ -66,7 +66,7 @@ class SdVectorizeDlg : public ModalDialog
void InitPreviewBmp();
void UpdatePreviewMtf();
- Rectangle GetRect( const Size& rDispSize, const Size& rBmpSize ) const;
+ static Rectangle GetRect( const Size& rDispSize, const Size& rBmpSize );
Bitmap GetPreparedBitmap( Bitmap& rBmp, Fraction& rScale );
void Calculate( Bitmap& rBmp, GDIMetaFile& rMtf );
void AddTile( BitmapReadAccess* pRAcc, GDIMetaFile& rMtf,