summaryrefslogtreecommitdiff
path: root/include/svx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-04-14 14:00:46 +0200
committerNoel Grandin <noel@peralex.com>2015-04-23 13:08:48 +0200
commit79ed057b955a8d23e8289b9a5898c8bdaebabbfa (patch)
tree0b512b13f7b59e12a44395ea50814fda15902f04 /include/svx
parent12ba9e3cad05a665aee2150ef831f0dbc92d7e2d (diff)
loplugin:staticmethods
Change-Id: I6207b475127099872c6f3764331006688129b673
Diffstat (limited to 'include/svx')
-rw-r--r--include/svx/SvxColorValueSet.hxx6
-rw-r--r--include/svx/algitem.hxx2
-rw-r--r--include/svx/bmpmask.hxx6
-rw-r--r--include/svx/charmap.hxx4
-rw-r--r--include/svx/fmgridcl.hxx2
-rw-r--r--include/svx/fmpage.hxx2
-rw-r--r--include/svx/fmshell.hxx8
-rw-r--r--include/svx/fntctrl.hxx4
-rw-r--r--include/svx/galctrl.hxx2
-rw-r--r--include/svx/gallery1.hxx2
-rw-r--r--include/svx/galtheme.hxx2
-rw-r--r--include/svx/gridctrl.hxx2
-rw-r--r--include/svx/itemwin.hxx6
-rw-r--r--include/svx/nbdtmg.hxx6
-rw-r--r--include/svx/ruler.hxx2
-rw-r--r--include/svx/sdr/contact/objectcontact.hxx2
-rw-r--r--include/svx/sdr/overlay/overlayobject.hxx2
-rw-r--r--include/svx/svddrag.hxx2
-rw-r--r--include/svx/svdedtv.hxx18
-rw-r--r--include/svx/svdedxv.hxx4
-rw-r--r--include/svx/svdetc.hxx2
-rw-r--r--include/svx/svdglue.hxx4
-rw-r--r--include/svx/svdhdl.hxx2
-rw-r--r--include/svx/svdmodel.hxx4
-rw-r--r--include/svx/svdmrkv.hxx2
-rw-r--r--include/svx/svdobj.hxx4
-rw-r--r--include/svx/svdoedge.hxx4
-rw-r--r--include/svx/svdomeas.hxx2
-rw-r--r--include/svx/svdotable.hxx2
-rw-r--r--include/svx/svdotext.hxx4
-rw-r--r--include/svx/svdpage.hxx2
-rw-r--r--include/svx/svdpntv.hxx2
-rw-r--r--include/svx/svdundo.hxx6
-rw-r--r--include/svx/svdxcgv.hxx6
-rw-r--r--include/svx/unomod.hxx2
-rw-r--r--include/svx/unopage.hxx2
-rw-r--r--include/svx/unopool.hxx2
-rw-r--r--include/svx/view3d.hxx2
-rw-r--r--include/svx/xpoly.hxx2
-rw-r--r--include/svx/xtable.hxx2
40 files changed, 71 insertions, 71 deletions
diff --git a/include/svx/SvxColorValueSet.hxx b/include/svx/SvxColorValueSet.hxx
index 33409db00da3..6aad452e8919 100644
--- a/include/svx/SvxColorValueSet.hxx
+++ b/include/svx/SvxColorValueSet.hxx
@@ -32,9 +32,9 @@ public:
virtual void Resize() SAL_OVERRIDE;
- sal_uInt32 getMaxRowCount() const;
- sal_uInt32 getEntryEdgeLength() const;
- sal_uInt32 getColumnCount() const;
+ static sal_uInt32 getMaxRowCount();
+ static sal_uInt32 getEntryEdgeLength();
+ static sal_uInt32 getColumnCount();
void addEntriesForXColorList(const XColorList& rXColorList, sal_uInt32 nStartIndex = 1);
void addEntriesForColorSet(const std::set<Color>& rColorSet, const OUString& rNamePrefix, sal_uInt32 nStartIndex = 1);
diff --git a/include/svx/algitem.hxx b/include/svx/algitem.hxx
index aced5b059f19..054c28a023e2 100644
--- a/include/svx/algitem.hxx
+++ b/include/svx/algitem.hxx
@@ -49,7 +49,7 @@ public:
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
virtual sal_uInt16 GetValueCount() const SAL_OVERRIDE;
- OUString GetValueText( sal_uInt16 nVal ) const;
+ static OUString GetValueText( sal_uInt16 nVal );
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const SAL_OVERRIDE;
virtual SfxPoolItem* Create( SvStream& rStream, sal_uInt16 nVer ) const SAL_OVERRIDE;
diff --git a/include/svx/bmpmask.hxx b/include/svx/bmpmask.hxx
index 5efdd861b2ba..7be37ee40177 100644
--- a/include/svx/bmpmask.hxx
+++ b/include/svx/bmpmask.hxx
@@ -124,11 +124,11 @@ class SVX_DLLPUBLIC SAL_WARN_UNUSED SvxBmpMask : public SfxDockingWindow
BitmapEx ImpMaskTransparent( const BitmapEx& rBitmapEx,
const Color& rColor,
const long nTol );
- BitmapEx ImpReplaceTransparency( const BitmapEx& rBmpEx,
+ static BitmapEx ImpReplaceTransparency( const BitmapEx& rBmpEx,
const Color& rColor );
- Animation ImpReplaceTransparency( const Animation& rAnim,
+ static Animation ImpReplaceTransparency( const Animation& rAnim,
const Color& rColor );
- GDIMetaFile ImpReplaceTransparency( const GDIMetaFile& rMtf,
+ static GDIMetaFile ImpReplaceTransparency( const GDIMetaFile& rMtf,
const Color& rColor );
public:
diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx
index 825deea3cedc..fd9a1d00c15d 100644
--- a/include/svx/charmap.hxx
+++ b/include/svx/charmap.hxx
@@ -68,8 +68,8 @@ public:
void DeSelect();
inline bool IsSelected(sal_uInt16 _nPos) const { return _nPos == nSelectedIndex; }
inline sal_uInt16 GetSelectIndexId() const { return sal::static_int_cast<sal_uInt16>(nSelectedIndex); }
- sal_uInt16 GetRowPos(sal_uInt16 _nPos) const;
- sal_uInt16 GetColumnPos(sal_uInt16 _nPos) const;
+ static sal_uInt16 GetRowPos(sal_uInt16 _nPos);
+ static sal_uInt16 GetColumnPos(sal_uInt16 _nPos);
ScrollBar& getScrollBar() { return aVscrollSB;}
void ReleaseAccessible();
diff --git a/include/svx/fmgridcl.hxx b/include/svx/fmgridcl.hxx
index 934293e4e50a..0bcb6124e7ff 100644
--- a/include/svx/fmgridcl.hxx
+++ b/include/svx/fmgridcl.hxx
@@ -177,7 +177,7 @@ protected:
virtual void InitColumnsByFields(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& xFields) SAL_OVERRIDE;
// some kind of impl version (for one single column) of our version of InitColumnsByFields
- void InitColumnByField(
+ static void InitColumnByField(
DbGridColumn* _pColumn,
const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxColumnModel,
const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& _rxFieldsByNames,
diff --git a/include/svx/fmpage.hxx b/include/svx/fmpage.hxx
index 74d3ec11d5c6..49fb5643c34e 100644
--- a/include/svx/fmpage.hxx
+++ b/include/svx/fmpage.hxx
@@ -70,7 +70,7 @@ public:
public:
const OUString& GetName() const { return m_sPageName; }
void SetName( const OUString& rName ) { m_sPageName = rName; }
- bool RequestHelp(
+ static bool RequestHelp(
vcl::Window* pWin,
SdrView* pView,
const HelpEvent& rEvt );
diff --git a/include/svx/fmshell.hxx b/include/svx/fmshell.hxx
index 16dae1f78bf2..462c304590d1 100644
--- a/include/svx/fmshell.hxx
+++ b/include/svx/fmshell.hxx
@@ -143,11 +143,11 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::awt::XControl >& _out_rxControl
) const;
- ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > GetFormController(
+ static ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > GetFormController(
const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& _rxForm,
const SdrView& _rView,
const OutputDevice& _rDevice
- ) const;
+ );
/** puts the focus into the document window, if current a form control has the focus. Otherwise, moves the focus
to the control belonging to the given SdrUnoObj.
@@ -158,11 +158,11 @@ public:
OutputDevice& i_rDevice
) const;
- ::std::unique_ptr< ::svx::ISdrObjectFilter >
+ static ::std::unique_ptr< ::svx::ISdrObjectFilter >
CreateFocusableControlFilter(
const SdrView& i_rView,
const OutputDevice& i_rDevice
- ) const;
+ );
virtual bool IsDesignMode() const SAL_OVERRIDE { return m_bDesignMode; }
void SetDesignMode( bool _bDesignMode );
diff --git a/include/svx/fntctrl.hxx b/include/svx/fntctrl.hxx
index 7ba6e1ad9bde..a9ad36d99855 100644
--- a/include/svx/fntctrl.hxx
+++ b/include/svx/fntctrl.hxx
@@ -79,8 +79,8 @@ public:
void SetPreviewText( const OUString& rString );
void SetFontNameAsPreviewText();
- void SetFont( const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFont& rFont );
- void SetFontStyle( const SfxItemSet& rSet, sal_uInt16 nSlotPosture, sal_uInt16 nSlotWeight, SvxFont& rFont ); // posture/weight
+ static void SetFont( const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFont& rFont );
+ static void SetFontStyle( const SfxItemSet& rSet, sal_uInt16 nSlotPosture, sal_uInt16 nSlotWeight, SvxFont& rFont ); // posture/weight
void SetFontWidthScale( const SfxItemSet& rSet );
void SetFontEscapement( sal_uInt8 nProp, sal_uInt8 nEscProp, short nEsc );
diff --git a/include/svx/galctrl.hxx b/include/svx/galctrl.hxx
index d1b6a3939cfc..4508e283cc6f 100644
--- a/include/svx/galctrl.hxx
+++ b/include/svx/galctrl.hxx
@@ -77,7 +77,7 @@ public:
void SetGraphic( const Graphic& rGraphic ) { aGraphicObj.SetGraphic( rGraphic ); }
bool SetGraphic( const INetURLObject& );
- void PreviewMedia( const INetURLObject& rURL );
+ static void PreviewMedia( const INetURLObject& rURL );
};
class GalleryIconView : public ValueSet, public DropTargetHelper, public DragSourceHelper
diff --git a/include/svx/gallery1.hxx b/include/svx/gallery1.hxx
index f0330587a9f6..2a2680701fa4 100644
--- a/include/svx/gallery1.hxx
+++ b/include/svx/gallery1.hxx
@@ -49,7 +49,7 @@ private:
bool bThemeNameFromResource;
GalleryThemeEntry();
- INetURLObject ImplGetURLIgnoreCase( const INetURLObject& rURL ) const;
+ static INetURLObject ImplGetURLIgnoreCase( const INetURLObject& rURL );
public:
diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx
index 50f5d98416f9..bc06735e2802 100644
--- a/include/svx/galtheme.hxx
+++ b/include/svx/galtheme.hxx
@@ -138,7 +138,7 @@ public:
SAL_DLLPRIVATE size_t GetObjectCount() const { return aObjectList.size(); }
SgaObject* AcquireObject( size_t nPos );
- void ReleaseObject( SgaObject* pObj );
+ static void ReleaseObject( SgaObject* pObj );
bool InsertObject( const SgaObject& rObj, sal_uIntPtr nPos = CONTAINER_APPEND );
bool RemoveObject( size_t nPos );
diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx
index e50c6e5fe878..bf42c434ea13 100644
--- a/include/svx/gridctrl.hxx
+++ b/include/svx/gridctrl.hxx
@@ -559,7 +559,7 @@ protected:
OUString GetCurrentRowCellText(DbGridColumn* pCol,const DbGridRowRef& _rRow) const;
virtual void DeleteSelectedRows();
- bool IsValid(const DbGridRowRef& _xRow) const {return _xRow && _xRow->IsValid();}
+ static bool IsValid(const DbGridRowRef& _xRow) { return _xRow && _xRow->IsValid(); }
// row which is currently being appended
bool IsCurrentAppending() const;
diff --git a/include/svx/itemwin.hxx b/include/svx/itemwin.hxx
index 0df5118feda8..a71d9bcb0026 100644
--- a/include/svx/itemwin.hxx
+++ b/include/svx/itemwin.hxx
@@ -72,7 +72,7 @@ class SVX_DLLPUBLIC SvxMetricField : public MetricField
Size aLogicalSize;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame;
- void ReleaseFocus_Impl();
+ static void ReleaseFocus_Impl();
protected:
virtual void Modify() SAL_OVERRIDE;
@@ -114,7 +114,7 @@ private:
bool bSelect;
bool bRelease;
- void ReleaseFocus_Impl();
+ static void ReleaseFocus_Impl();
};
// class SvxFillAttrBox --------------------------------------------------
@@ -136,7 +136,7 @@ private:
sal_uInt16 nCurPos;
bool bRelease;
- void ReleaseFocus_Impl();
+ static void ReleaseFocus_Impl();
};
#endif // INCLUDED_SVX_ITEMWIN_HXX
diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx
index 41e679d8389c..7695e5cf0cf5 100644
--- a/include/svx/nbdtmg.hxx
+++ b/include/svx/nbdtmg.hxx
@@ -224,7 +224,7 @@ class SVX_DLLPUBLIC NBOTypeMgrBase
virtual bool ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF, bool isDefault=false,bool isResetSize=false)=0;
virtual OUString GetDescription(sal_uInt16 nIndex,bool isDefault=false)=0;
virtual bool IsCustomized(sal_uInt16 nIndex)=0;
- sal_uInt16 IsSingleLevel(sal_uInt16 nCurLevel);
+ static sal_uInt16 IsSingleLevel(sal_uInt16 nCurLevel);
const SfxItemSet* GetItems() { return pSet;}
// store the attributes passed from pSet
void SetItems(const SfxItemSet* pArg) { pSet = pArg;StoreBulCharFmtName_impl();StoreMapUnit_impl();}
@@ -257,8 +257,8 @@ class SVX_DLLPUBLIC BulletsTypeMgr: public NBOTypeMgrBase
virtual bool ApplyNumRule(SvxNumRule& aNum,sal_uInt16 nIndex,sal_uInt16 mLevel=(sal_uInt16)0xFFFF,bool isDefault=false,bool isResetSize=false) SAL_OVERRIDE;
virtual OUString GetDescription(sal_uInt16 nIndex,bool isDefault=false) SAL_OVERRIDE;
virtual bool IsCustomized(sal_uInt16 nIndex) SAL_OVERRIDE;
- sal_Unicode GetBulChar(sal_uInt16 nIndex);
- vcl::Font GetBulCharFont(sal_uInt16 nIndex);
+ static sal_Unicode GetBulChar(sal_uInt16 nIndex);
+ static vcl::Font GetBulCharFont(sal_uInt16 nIndex);
static BulletsTypeMgr& GetInstance();
};
diff --git a/include/svx/ruler.hxx b/include/svx/ruler.hxx
index ff44a6c45d64..2cef64f3691d 100644
--- a/include/svx/ruler.hxx
+++ b/include/svx/ruler.hxx
@@ -224,7 +224,7 @@ protected:
// calculation of boundary values for object borders
// values refer to the page
- bool CalcLimits(long &nMax1, long &nMax2, bool bFirst) const;
+ static bool CalcLimits(long &nMax1, long &nMax2, bool bFirst);
bool IsActLastColumn(
bool bForceDontConsiderHidden = false,
sal_uInt16 nAct=USHRT_MAX) const;
diff --git a/include/svx/sdr/contact/objectcontact.hxx b/include/svx/sdr/contact/objectcontact.hxx
index d49d19db48c0..61db82083a4a 100644
--- a/include/svx/sdr/contact/objectcontact.hxx
+++ b/include/svx/sdr/contact/objectcontact.hxx
@@ -81,7 +81,7 @@ private:
bool mbIsPreviewRenderer : 1;
// method to create a EventHandler. Needs to give a result.
- sdr::event::TimerEventHandler* CreateEventHandler();
+ static sdr::event::TimerEventHandler* CreateEventHandler();
protected:
// Interface to allow derivates to travel over the registered VOC's
diff --git a/include/svx/sdr/overlay/overlayobject.hxx b/include/svx/sdr/overlay/overlayobject.hxx
index 7e97abc34ad0..167114eb66be 100644
--- a/include/svx/sdr/overlay/overlayobject.hxx
+++ b/include/svx/sdr/overlay/overlayobject.hxx
@@ -86,7 +86,7 @@ namespace sdr
virtual drawinglayer::primitive2d::Primitive2DSequence createOverlayObjectPrimitive2DSequence();
// #i53216# check blink time value range (currently 25 < mnBlinkTime < 10000)
- sal_uInt32 impCheckBlinkTimeValueRange(sal_uInt64 nBlinkTime) const;
+ static sal_uInt32 impCheckBlinkTimeValueRange(sal_uInt64 nBlinkTime);
// region in logical coordinates
basegfx::B2DRange maBaseRange;
diff --git a/include/svx/svddrag.hxx b/include/svx/svddrag.hxx
index b622999d889f..3be0872f6a04 100644
--- a/include/svx/svddrag.hxx
+++ b/include/svx/svddrag.hxx
@@ -140,7 +140,7 @@ public:
bool IsMouseDown() const { return !bMouseIsUp; }
void SetMouseDown(bool bDown) { bMouseIsUp=!bDown; }
- Point KorregPos(const Point& rNow, const Point& rPrev) const;
+ static Point KorregPos(const Point& rNow, const Point& rPrev);
void Reset(const Point& rPnt);
void NextMove(const Point& rPnt);
void NextPoint(bool bSaveReal=false);
diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx
index ee0f1305a2b4..7f4451d4d242 100644
--- a/include/svx/svdedtv.hxx
+++ b/include/svx/svdedtv.hxx
@@ -134,19 +134,19 @@ protected:
void ImpCopyAttributes(const SdrObject* pSource, SdrObject* pDest) const;
// for CombineMarkedObjects
- bool ImpCanConvertForCombine1(const SdrObject* pObj) const;
- bool ImpCanConvertForCombine(const SdrObject* pObj) const;
- basegfx::B2DPolyPolygon ImpGetPolyPolygon1(const SdrObject* pObj, bool bCombine) const;
- basegfx::B2DPolyPolygon ImpGetPolyPolygon(const SdrObject* pObj, bool bCombine) const;
- basegfx::B2DPolygon ImpCombineToSinglePolygon(const basegfx::B2DPolyPolygon& rPolyPolygon) const;
+ static bool ImpCanConvertForCombine1(const SdrObject* pObj);
+ static bool ImpCanConvertForCombine(const SdrObject* pObj);
+ static basegfx::B2DPolyPolygon ImpGetPolyPolygon1(const SdrObject* pObj, bool bCombine);
+ static basegfx::B2DPolyPolygon ImpGetPolyPolygon(const SdrObject* pObj, bool bCombine);
+ static basegfx::B2DPolygon ImpCombineToSinglePolygon(const basegfx::B2DPolyPolygon& rPolyPolygon);
// for DismantleMarkedObjects
- bool ImpCanDismantle(const basegfx::B2DPolyPolygon& rPpolyPpolygon, bool bMakeLines) const;
- bool ImpCanDismantle(const SdrObject* pObj, bool bMakeLines) const;
+ static bool ImpCanDismantle(const basegfx::B2DPolyPolygon& rPpolyPpolygon, bool bMakeLines);
+ static bool ImpCanDismantle(const SdrObject* pObj, bool bMakeLines);
void ImpDismantleOneObject(const SdrObject* pObj, SdrObjList& rOL, size_t& rPos, SdrPageView* pPV, bool bMakeLines);
- void ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRad, SdrCrookMode eMode,
+ static void ImpCrookObj(SdrObject* pO, const Point& rRef, const Point& rRad, SdrCrookMode eMode,
bool bVertical, bool bNoContortion, bool bRotate, const Rectangle& rMarkRect);
- void ImpDistortObj(SdrObject* pO, const Rectangle& rRef, const XPolygon& rDistortedRect, bool bNoContortion);
+ static void ImpDistortObj(SdrObject* pO, const Rectangle& rRef, const XPolygon& rDistortedRect, bool bNoContortion);
bool ImpDelLayerCheck(SdrObjList* pOL, SdrLayerID nDelID) const;
void ImpDelLayerDelObjs(SdrObjList* pOL, SdrLayerID nDelID);
diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx
index 7d848ed55c8f..08231959c61f 100644
--- a/include/svx/svdedxv.hxx
+++ b/include/svx/svdedxv.hxx
@@ -255,7 +255,7 @@ public:
rtl::Reference< sdr::SelectionController > getSelectionController() const { return mxSelectionController; }
/** returns true if the shape identified by its inventor and identifier supports format paint brush operation */
- bool SupportsFormatPaintbrush( sal_uInt32 nObjectInventor, sal_uInt16 nObjectIdentifier ) const;
+ static bool SupportsFormatPaintbrush( sal_uInt32 nObjectInventor, sal_uInt16 nObjectIdentifier );
/** returns a format paint brush set from the current selection */
bool TakeFormatPaintBrush( std::shared_ptr< SfxItemSet >& rFormatSet );
@@ -267,7 +267,7 @@ public:
void ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNoCharacterFormats, bool bNoParagraphFormats );
/** helper function for selections with multiple SdrText for one SdrTextObj (f.e. tables ) */
- void ApplyFormatPaintBrushToText( SfxItemSet& rFormatSet, SdrTextObj& rTextObj, SdrText* pText, bool bNoCharacterFormats, bool bNoParagraphFormats );
+ static void ApplyFormatPaintBrushToText( SfxItemSet& rFormatSet, SdrTextObj& rTextObj, SdrText* pText, bool bNoCharacterFormats, bool bNoParagraphFormats );
protected:
virtual void OnBeginPasteOrDrop( PasteOrDropInfos* pInfos );
diff --git a/include/svx/svdetc.hxx b/include/svx/svdetc.hxx
index 27683824e12b..1e47e180a53d 100644
--- a/include/svx/svdetc.hxx
+++ b/include/svx/svdetc.hxx
@@ -204,7 +204,7 @@ class OLEObjCache
AutoTimer* pTimer;
void UnloadOnDemand();
- bool UnloadObj( SdrOle2Obj* pObj );
+ static bool UnloadObj( SdrOle2Obj* pObj );
DECL_LINK( UnloadCheckHdl, AutoTimer* );
public:
diff --git a/include/svx/svdglue.hxx b/include/svx/svdglue.hxx
index ca7a376ba34e..47debfd90582 100644
--- a/include/svx/svdglue.hxx
+++ b/include/svx/svdglue.hxx
@@ -97,8 +97,8 @@ public:
void SetAbsolutePos(const Point& rNewPos, const SdrObject& rObj);
long GetAlignAngle() const;
void SetAlignAngle(long nAngle);
- long EscDirToAngle(sal_uInt16 nEsc) const;
- sal_uInt16 EscAngleToDir(long nAngle) const;
+ static long EscDirToAngle(sal_uInt16 nEsc);
+ static sal_uInt16 EscAngleToDir(long nAngle);
void Rotate(const Point& rRef, long nAngle, double sn, double cs, const SdrObject* pObj);
void Mirror(const Point& rRef1, const Point& rRef2, long nAngle, const SdrObject* pObj);
void Shear (const Point& rRef, long nAngle, double tn, bool bVShear, const SdrObject* pObj);
diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx
index 9d839b7be0ce..e945f0b2bf26 100644
--- a/include/svx/svdhdl.hxx
+++ b/include/svx/svdhdl.hxx
@@ -183,7 +183,7 @@ protected:
const basegfx::B2DPoint& rPos,
BitmapColorIndex eColIndex, BitmapMarkerKind eKindOfMarker,
OutputDevice& rOutDev, Point aMoveOutsideOffset = Point());
- BitmapMarkerKind GetNextBigger(BitmapMarkerKind eKnd) const;
+ static BitmapMarkerKind GetNextBigger(BitmapMarkerKind eKnd);
public:
SdrHdl();
diff --git a/include/svx/svdmodel.hxx b/include/svx/svdmodel.hxx
index 4d238a246d0e..917182aface2 100644
--- a/include/svx/svdmodel.hxx
+++ b/include/svx/svdmodel.hxx
@@ -413,8 +413,8 @@ public:
static void TakeUnitStr(FieldUnit eUnit, OUString& rStr);
void TakeMetricStr(long nVal, OUString& rStr, bool bNoUnitChars = false, sal_Int32 nNumDigits = -1) const;
- void TakeAngleStr(long nAngle, OUString& rStr, bool bNoDegChar = false) const;
- void TakePercentStr(const Fraction& rVal, OUString& rStr, bool bNoPercentChar = false) const;
+ static void TakeAngleStr(long nAngle, OUString& rStr, bool bNoDegChar = false);
+ static void TakePercentStr(const Fraction& rVal, OUString& rStr, bool bNoPercentChar = false);
// RecalcPageNums is ordinarily only called by the Page.
bool IsPagNumsDirty() const { return bPagNumsDirty; };
diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx
index 427e76822f05..4388008da021 100644
--- a/include/svx/svdmrkv.hxx
+++ b/include/svx/svdmrkv.hxx
@@ -390,7 +390,7 @@ public:
// Get the Hdl (handle) of a marked GluePoint. Non-marked
// GluePoints don`t have handles
SdrHdl* GetGluePointHdl(const SdrObject* pObj, sal_uInt16 nId) const;
- bool IsGluePoint(const SdrHdl& rHdl) const { return rHdl.GetKind()==HDL_GLUE; }
+ static bool IsGluePoint(const SdrHdl& rHdl) { return rHdl.GetKind()==HDL_GLUE; }
// Mark all points within this rectangular (View coordinates)
bool MarkGluePoints(const Rectangle& rRect) { return MarkGluePoints(&rRect,false); }
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 6d0e2017771f..ffa7f29ea5fb 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -393,7 +393,7 @@ public:
protected:
// override if the class inherits from SdrObjPlusData:
- SdrObjPlusData* NewPlusData() const;
+ static SdrObjPlusData* NewPlusData();
protected:
/// A derived class must override these 3 methods if it has own geometric
@@ -839,7 +839,7 @@ public:
// when there is no filled new polygon created from line-to-polygon conversion,
// specially used for XLINE_DASH and 3D conversion
SdrObject* ConvertToContourObj(SdrObject* pRet, bool bForceLineDash = false) const;
- SdrObject* ImpConvertToContourObj(SdrObject* pRet, bool bForceLineDash = false) const;
+ static SdrObject* ImpConvertToContourObj(SdrObject* pRet, bool bForceLineDash = false);
// if true, reference onto an object
bool IsVirtualObj() const { return bVirtObj;}
diff --git a/include/svx/svdoedge.hxx b/include/svx/svdoedge.hxx
index 0b93fbc17c77..7abef6f9dc7e 100644
--- a/include/svx/svdoedge.hxx
+++ b/include/svx/svdoedge.hxx
@@ -198,14 +198,14 @@ public:
protected:
virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) SAL_OVERRIDE;
- XPolygon ImpCalcObjToCenter(const Point& rStPt, long nEscAngle, const Rectangle& rRect, const Point& rCenter) const;
+ static XPolygon ImpCalcObjToCenter(const Point& rStPt, long nEscAngle, const Rectangle& rRect, const Point& rCenter);
void ImpRecalcEdgeTrack(); // Neuberechnung des Verbindungsverlaufs
XPolygon ImpCalcEdgeTrack(const XPolygon& rTrack0, SdrObjConnection& rCon1, SdrObjConnection& rCon2, SdrEdgeInfoRec* pInfo) const;
XPolygon ImpCalcEdgeTrack(const Point& rPt1, long nAngle1, const Rectangle& rBoundRect1, const Rectangle& rBewareRect1,
const Point& rPt2, long nAngle2, const Rectangle& rBoundRect2, const Rectangle& rBewareRect2,
sal_uIntPtr* pnQuality, SdrEdgeInfoRec* pInfo) const;
static bool ImpFindConnector(const Point& rPt, const SdrPageView& rPV, SdrObjConnection& rCon, const SdrEdgeObj* pThis, OutputDevice* pOut=NULL);
- sal_uInt16 ImpCalcEscAngle(SdrObject* pObj, const Point& aPt2) const;
+ static sal_uInt16 ImpCalcEscAngle(SdrObject* pObj, const Point& aPt2);
void ImpSetTailPoint(bool bTail1, const Point& rPt);
void ImpUndirtyEdgeTrack(); // eventuelle Neuberechnung des Verbindungsverlaufs
void ImpDirtyEdgeTrack(); // invalidate connector path, so it will be recalculated next time
diff --git a/include/svx/svdomeas.hxx b/include/svx/svdomeas.hxx
index 16082753669b..81516e84a79a 100644
--- a/include/svx/svdomeas.hxx
+++ b/include/svx/svdomeas.hxx
@@ -75,7 +75,7 @@ protected:
void ImpTakeAttr(ImpMeasureRec& rRec) const;
OUString TakeRepresentation(SdrMeasureFieldKind eMeasureFieldKind) const;
void ImpCalcGeometrics(const ImpMeasureRec& rRec, ImpMeasurePoly& rPol) const;
- basegfx::B2DPolyPolygon ImpCalcXPoly(const ImpMeasurePoly& rPol) const;
+ static basegfx::B2DPolyPolygon ImpCalcXPoly(const ImpMeasurePoly& rPol);
void ImpEvalDrag(ImpMeasureRec& rRec, const SdrDragStat& rDrag) const;
void SetTextDirty() { bTextDirty=true; SetTextSizeDirty(); if (!aOutRect.IsEmpty()) { SetBoundRectDirty(); SetRectsDirty(true); } }
void UndirtyText() const;
diff --git a/include/svx/svdotable.hxx b/include/svx/svdotable.hxx
index e8e2a4f975fa..d2bfd39fd8da 100644
--- a/include/svx/svdotable.hxx
+++ b/include/svx/svdotable.hxx
@@ -120,7 +120,7 @@ public:
com::sun::star::uno::Reference< com::sun::star::table::XTable > getTable() const;
bool isValid( const sdr::table::CellPos& rPos ) const;
- CellPos getFirstCell() const;
+ static CellPos getFirstCell();
CellPos getLastCell() const;
CellPos getLeftCell( const CellPos& rPos, bool bEdgeTravel ) const;
CellPos getRightCell( const CellPos& rPos, bool bEdgeTravel ) const;
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index 864cc83c543e..e8f17c656ae8 100644
--- a/include/svx/svdotext.hxx
+++ b/include/svx/svdotext.hxx
@@ -283,8 +283,8 @@ protected:
SdrObject* ImpConvertMakeObj(const basegfx::B2DPolyPolygon& rPolyPolygon, bool bClosed, bool bBezier, bool bNoSetAttr = false) const;
SdrObject* ImpConvertAddText(SdrObject* pObj, bool bBezier) const;
void ImpSetTextStyleSheetListeners();
- void ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextSize, const Size& rShapeSize, Fraction& rFitXKorreg) const;
- void ImpJustifyRect(Rectangle& rRect) const;
+ static void ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextSize, const Size& rShapeSize, Fraction& rFitXKorreg);
+ static void ImpJustifyRect(Rectangle& rRect);
void ImpCheckShear();
Rectangle ImpDragCalcRect(const SdrDragStat& rDrag) const;
void ImpSetTextEditParams() const;
diff --git a/include/svx/svdpage.hxx b/include/svx/svdpage.hxx
index bdd0c981ab2a..f01675219564 100644
--- a/include/svx/svdpage.hxx
+++ b/include/svx/svdpage.hxx
@@ -106,7 +106,7 @@ protected:
private:
/// simple ActionChildInserted forwarder to have it on a central place
- void impChildInserted(SdrObject& rChild) const;
+ static void impChildInserted(SdrObject& rChild);
public:
TYPEINFO();
SdrObjList(SdrModel* pNewModel, SdrPage* pNewPage, SdrObjList* pNewUpList=NULL);
diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx
index 2540c44ff51f..f228a1c308f1 100644
--- a/include/svx/svdpntv.hxx
+++ b/include/svx/svdpntv.hxx
@@ -395,7 +395,7 @@ protected:
// used to paint the form layer after the PreRender device is flushed (painted) to the window.
void ImpFormLayerDrawing( SdrPaintWindow& rPaintWindow );
- vcl::Region OptimizeDrawLayersRegion(OutputDevice* pOut, const vcl::Region& rReg, bool bDisableIntersect);
+ static vcl::Region OptimizeDrawLayersRegion(OutputDevice* pOut, const vcl::Region& rReg, bool bDisableIntersect);
public:
bool IsPageVisible() const { return bPageVisible; } // Seite (weisse Flaeche) malen oder nicht
diff --git a/include/svx/svdundo.hxx b/include/svx/svdundo.hxx
index 9d3995ff8c9b..a6c9f2468c67 100644
--- a/include/svx/svdundo.hxx
+++ b/include/svx/svdundo.hxx
@@ -159,7 +159,7 @@ protected:
SdrUndoGroup* pUndoGroup;
// Helper to ensure StyleSheet is in pool (provided by SdrModel from SdrObject)
- void ensureStyleSheetInStyleSheetPool(SfxStyleSheetBasePool& rStyleSheetPool, SfxStyleSheet& rSheet);
+ static void ensureStyleSheetInStyleSheetPool(SfxStyleSheetBasePool& rStyleSheetPool, SfxStyleSheet& rSheet);
public:
SdrUndoAttrObj(SdrObject& rNewObj, bool bStyleSheet1 = false, bool bSaveText = false);
@@ -558,7 +558,7 @@ protected:
protected:
SdrUndoPage(SdrPage& rNewPg);
- void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, sal_uInt16 n=0, bool bRepeat = false) const;
+ static void ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, sal_uInt16 n=0, bool bRepeat = false);
};
/**
@@ -748,7 +748,7 @@ public:
virtual SdrUndoAction* CreateUndoObjectSetText( SdrObject& rNewObj, sal_Int32 nText );
// Implement Title/Description Elements UI for Writer text frames, graphics and embedded objects (#i73249#)
- SdrUndoAction* CreateUndoObjectStrAttr( SdrObject& rObject,
+ static SdrUndoAction* CreateUndoObjectStrAttr( SdrObject& rObject,
SdrUndoObjStrAttr::ObjStrAttrType eObjStrAttrType,
const OUString& sOldStr,
const OUString& sNewStr );
diff --git a/include/svx/svdxcgv.hxx b/include/svx/svdxcgv.hxx
index 2f7bd106c273..afa84e7a3f4b 100644
--- a/include/svx/svdxcgv.hxx
+++ b/include/svx/svdxcgv.hxx
@@ -110,11 +110,11 @@ public:
bool Paste(const OUString& rStr, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0);
bool Paste(SvStream& rInput, const OUString& rBaseURL, sal_uInt16 eFormat, const Point& rPos, SdrObjList* pLst=NULL, sal_uInt32 nOptions=0);
- bool Cut( sal_uIntPtr nFormat = SDR_ANYFORMAT );
+ static bool Cut( sal_uIntPtr nFormat = SDR_ANYFORMAT );
- bool Yank( sal_uIntPtr nFormat = SDR_ANYFORMAT );
+ static bool Yank( sal_uIntPtr nFormat = SDR_ANYFORMAT );
- bool Paste( vcl::Window* pWin = NULL, sal_uIntPtr nFormat = SDR_ANYFORMAT );
+ static bool Paste( vcl::Window* pWin = NULL, sal_uIntPtr nFormat = SDR_ANYFORMAT );
bool PasteClipboard( OutputDevice* pOut = NULL, sal_uIntPtr nFormat = SDR_ANYFORMAT, sal_uInt32 nOptions = 0 );
};
diff --git a/include/svx/unomod.hxx b/include/svx/unomod.hxx
index 967ee1c3d011..1ca002ac889e 100644
--- a/include/svx/unomod.hxx
+++ b/include/svx/unomod.hxx
@@ -42,7 +42,7 @@ public:
static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createTextField( const OUString& aServiceSpecifier ) throw(::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
// internal
- ::com::sun::star::uno::Sequence< OUString >
+ static ::com::sun::star::uno::Sequence< OUString >
concatServiceNames( ::com::sun::star::uno::Sequence< OUString >& rServices1,
::com::sun::star::uno::Sequence< OUString >& rServices2 ) throw();
diff --git a/include/svx/unopage.hxx b/include/svx/unopage.hxx
index beba5e1c275f..5800e560da3a 100644
--- a/include/svx/unopage.hxx
+++ b/include/svx/unopage.hxx
@@ -89,7 +89,7 @@ class SVX_DLLPUBLIC SvxDrawPage : public ::cppu::WeakAggImplHelper6< ::com::sun:
SdrObject *CreateSdrObject( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape >& xShape, bool bBeginning = false ) throw();
// Determine Type and Inventor
- void GetTypeAndInventor( sal_uInt16& rType, sal_uInt32& rInventor, const OUString& aName ) const throw();
+ static void GetTypeAndInventor( sal_uInt16& rType, sal_uInt32& rInventor, const OUString& aName ) throw();
// Creating a SdrObject using it's Description.
// Can be used by derived classes to support their owen Shapes (e.g. Controls).
diff --git a/include/svx/unopool.hxx b/include/svx/unopool.hxx
index 13391990d1be..37a3ab154cb1 100644
--- a/include/svx/unopool.hxx
+++ b/include/svx/unopool.hxx
@@ -77,7 +77,7 @@ public:
protected:
void init();
- void getAny( SfxItemPool* pPool, const comphelper::PropertyMapEntry* pEntry, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException);
+ static void getAny( SfxItemPool* pPool, const comphelper::PropertyMapEntry* pEntry, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException);
virtual void putAny( SfxItemPool* pPool, const comphelper::PropertyMapEntry* pEntry, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::IllegalArgumentException, css::uno::RuntimeException);
protected:
diff --git a/include/svx/view3d.hxx b/include/svx/view3d.hxx
index 3cbec6289432..37c08de09e63 100644
--- a/include/svx/view3d.hxx
+++ b/include/svx/view3d.hxx
@@ -109,7 +109,7 @@ public:
void ConvertMarkedObjTo3D(bool bExtrude=true, const basegfx::B2DPoint& rPnt1 = basegfx::B2DPoint(0.0, 0.0), const basegfx::B2DPoint& rPnt2 = basegfx::B2DPoint(0.0, 1.0));
// Means to create all Extrudes in a certain depth order.
- void DoDepthArrange(E3dScene* pScene, double fDepth);
+ static void DoDepthArrange(E3dScene* pScene, double fDepth);
void ConvertMarkedToPolyObj(bool bLineToArea);
E3dScene* SetCurrent3DObj(E3dObject* p3DObj);
void Start3DCreation();
diff --git a/include/svx/xpoly.hxx b/include/svx/xpoly.hxx
index 3432165c52ee..67c19a9c9dc1 100644
--- a/include/svx/xpoly.hxx
+++ b/include/svx/xpoly.hxx
@@ -58,7 +58,7 @@ protected:
void GenBezArc(const Point& rCenter, long nRx, long nRy,
long nXHdl, long nYHdl, sal_uInt16 nStart, sal_uInt16 nEnd,
sal_uInt16 nQuad, sal_uInt16 nFirst);
- bool CheckAngles(sal_uInt16& nStart, sal_uInt16 nEnd, sal_uInt16& nA1, sal_uInt16& nA2);
+ static bool CheckAngles(sal_uInt16& nStart, sal_uInt16 nEnd, sal_uInt16& nA1, sal_uInt16& nA2);
public:
XPolygon( sal_uInt16 nSize=16, sal_uInt16 nResize=16 );
diff --git a/include/svx/xtable.hxx b/include/svx/xtable.hxx
index 13183415c79c..6ffe737535db 100644
--- a/include/svx/xtable.hxx
+++ b/include/svx/xtable.hxx
@@ -340,7 +340,7 @@ private:
OUString maStringNoLine;
protected:
- Bitmap ImpCreateBitmapForXDash(const XDash* pDash);
+ static Bitmap ImpCreateBitmapForXDash(const XDash* pDash);
virtual Bitmap CreateBitmapForUI(long nIndex) SAL_OVERRIDE;
public: