diff options
134 files changed, 287 insertions, 304 deletions
diff --git a/compilerplugins/clang/staticmethods.cxx b/compilerplugins/clang/staticmethods.cxx index e076e6a9f417..47363ba891e4 100644 --- a/compilerplugins/clang/staticmethods.cxx +++ b/compilerplugins/clang/staticmethods.cxx @@ -147,7 +147,8 @@ bool StaticMethods::TraverseCXXMethodDecl(const CXXMethodDecl * pCXXMethodDecl) || aParentName == "SvtAccessibilityOptions" || aParentName == "svtools::ColorConfig" || aParentName == "SvtOptionsDrawinglayer" || aParentName == "SvtMenuOptions" || aParentName == "SvtToolPanelOptions" || aParentName == "SvtSlideSorterBarOptions" - || aParentName == "connectivity::SharedResources" ) + || aParentName == "connectivity::SharedResources" + || aParentName == "svxform::OParseContextClient" ) { return true; } diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx index 795b8b9cb3f9..09cb920fc7f6 100644 --- a/cui/source/tabpages/backgrnd.cxx +++ b/cui/source/tabpages/backgrnd.cxx @@ -1144,7 +1144,7 @@ void SvxBackgroundTabPage::FillColorValueSets_Impl() const WinBits nBits(m_pBackgroundColorSet->GetStyle() | WB_ITEMBORDER | WB_NAMEFIELD | WB_NONEFIELD); m_pBackgroundColorSet->SetStyle(nBits); - m_pBackgroundColorSet->SetColCount(m_pBackgroundColorSet->getColumnCount()); + m_pBackgroundColorSet->SetColCount(SvxColorValueSet::getColumnCount()); } diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx index 8bc12c7aaf80..571861856343 100644 --- a/cui/source/tabpages/tpcolor.cxx +++ b/cui/source/tabpages/tpcolor.cxx @@ -406,7 +406,7 @@ void SvxColorTabPage::ImpColorCountChanged() { if (!pColorList.is()) return; - m_pValSetColorList->SetColCount(m_pValSetColorList->getColumnCount()); + m_pValSetColorList->SetColCount(SvxColorValueSet::getColumnCount()); } diff --git a/dbaccess/source/sdbtools/connection/objectnames.cxx b/dbaccess/source/sdbtools/connection/objectnames.cxx index 3b4ace8fbf78..500a6037a717 100644 --- a/dbaccess/source/sdbtools/connection/objectnames.cxx +++ b/dbaccess/source/sdbtools/connection/objectnames.cxx @@ -169,7 +169,7 @@ namespace sdbtools { } - inline ::connectivity::ErrorCondition validateName_getErrorCondition( const OUString& _rName ) + static inline ::connectivity::ErrorCondition validateName_getErrorCondition( const OUString& _rName ) { if ( ( _rName.indexOf( (sal_Unicode)34 ) >= 0 ) // " || ( _rName.indexOf( (sal_Unicode)39 ) >= 0 ) // ' diff --git a/filter/source/graphicfilter/epict/epict.cxx b/filter/source/graphicfilter/epict/epict.cxx index e9a7568a9bbd..93d7e290af6c 100644 --- a/filter/source/graphicfilter/epict/epict.cxx +++ b/filter/source/graphicfilter/epict/epict.cxx @@ -111,7 +111,7 @@ private: // counts the bitmaps and actions (nNumberOfActions and nNumberOfBitmaps // have to be set to 0 at the beginning, since this method is recursive) - Polygon PolyPolygonToPolygon(const tools::PolyPolygon & rPoly); + static Polygon PolyPolygonToPolygon(const tools::PolyPolygon & rPoly); // generates a relatively sane polygon on the basis of a PolyPolygon Rectangle MapRectangle( const Rectangle& rRect ); @@ -123,8 +123,8 @@ private: void WritePolygon(const Polygon & rPoly); void WriteArcAngles(const Rectangle & rRect, const Point & rStartPt, const Point & rEndPt); - void ConvertLinePattern(PictPattern & rPat, bool bVisible) const; - void ConvertFillPattern(PictPattern & rPat, bool bVisible) const; + static void ConvertLinePattern(PictPattern & rPat, bool bVisible); + static void ConvertFillPattern(PictPattern & rPat, bool bVisible); void WriteOpcode_TxFace(const vcl::Font & rFont); void WriteOpcode_TxMode(RasterOp eMode); @@ -415,7 +415,7 @@ void PictWriter::WriteArcAngles(const Rectangle & rRect, const Point & rStartPt, } -void PictWriter::ConvertLinePattern(PictPattern & rPat, bool bVisible) const +void PictWriter::ConvertLinePattern(PictPattern & rPat, bool bVisible) { if( bVisible ) { @@ -429,7 +429,7 @@ void PictWriter::ConvertLinePattern(PictPattern & rPat, bool bVisible) const } } -void PictWriter::ConvertFillPattern(PictPattern & rPat, bool bVisible) const +void PictWriter::ConvertFillPattern(PictPattern & rPat, bool bVisible) { if( bVisible ) { diff --git a/filter/source/graphicfilter/eps/eps.cxx b/filter/source/graphicfilter/eps/eps.cxx index edd7061a13d0..cfe790a290f3 100644 --- a/filter/source/graphicfilter/eps/eps.cxx +++ b/filter/source/graphicfilter/eps/eps.cxx @@ -224,10 +224,10 @@ private: inline void ImplWriteTextColor( sal_uLong nMode = PS_RET ); void ImplWriteColor( sal_uLong nMode ); - double ImplGetScaling( const MapMode& ); + static double ImplGetScaling( const MapMode& ); void ImplGetMapMode( const MapMode& ); - bool ImplGetBoundingBox( double* nNumb, sal_uInt8* pSource, sal_uLong nSize ); - sal_uInt8* ImplSearchEntry( sal_uInt8* pSource, sal_uInt8 const * pDest, sal_uLong nComp, sal_uLong nSize ); + static bool ImplGetBoundingBox( double* nNumb, sal_uInt8* pSource, sal_uLong nSize ); + static sal_uInt8* ImplSearchEntry( sal_uInt8* pSource, sal_uInt8 const * pDest, sal_uLong nComp, sal_uLong nSize ); // LZW methods void StartCompression(); void Compress( sal_uInt8 nSrc ); diff --git a/filter/source/graphicfilter/icgm/cgm.hxx b/filter/source/graphicfilter/icgm/cgm.hxx index c03b8910cfa3..1ee13eaf9a6b 100644 --- a/filter/source/graphicfilter/icgm/cgm.hxx +++ b/filter/source/graphicfilter/icgm/cgm.hxx @@ -94,11 +94,11 @@ class CGM sal_uInt32 mnElementSize; // full parameter size for the latest action sal_uInt32 ImplGetUI16( sal_uInt32 nAlign = 0 ); - sal_uInt8 ImplGetByte( sal_uInt32 nSource, sal_uInt32 nPrecision ); + static sal_uInt8 ImplGetByte( sal_uInt32 nSource, sal_uInt32 nPrecision ); sal_Int32 ImplGetI( sal_uInt32 nPrecision ); sal_uInt32 ImplGetUI( sal_uInt32 nPrecision ); - void ImplGetSwitch4( sal_uInt8* pSource, sal_uInt8* pDest ); - void ImplGetSwitch8( sal_uInt8* pSource, sal_uInt8* pDest ); + static void ImplGetSwitch4( sal_uInt8* pSource, sal_uInt8* pDest ); + static void ImplGetSwitch8( sal_uInt8* pSource, sal_uInt8* pDest ); double ImplGetFloat( RealPrecision, sal_uInt32 nRealSize ); sal_uInt32 ImplGetBitmapColor( bool bDirectColor = false ); void ImplSetMapMode(); @@ -115,8 +115,8 @@ class CGM void ImplGetRectangle( FloatRect&, bool bMap = false ); void ImplGetRectangleNS( FloatRect& ); void ImplGetVector( double* ); - double ImplGetOrientation( FloatPoint& rCenter, FloatPoint& rPoint ); - void ImplSwitchStartEndAngle( double& rStartAngle, double& rEndAngle ); + static double ImplGetOrientation( FloatPoint& rCenter, FloatPoint& rPoint ); + static void ImplSwitchStartEndAngle( double& rStartAngle, double& rEndAngle ); bool ImplGetEllipse( FloatPoint& rCenter, FloatPoint& rRadius, double& rOrientation ); void ImplDefaultReplacement(); 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: diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx index 985821eb0bff..4b30c539971b 100644 --- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx +++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx @@ -47,7 +47,7 @@ ScTabBgColorDlg::ScTabBgColorDlg(vcl::Window* pParent, const OUString& rTitle, { get(m_pTabBgColorSet, "colorset"); m_pTabBgColorSet->SetDialog(this); - m_pTabBgColorSet->SetColCount(m_pTabBgColorSet->getColumnCount()); + m_pTabBgColorSet->SetColCount(SvxColorValueSet::getColumnCount()); get(m_pBtnOk, "ok"); SetHelpId( sHelpId ); @@ -95,9 +95,9 @@ void ScTabBgColorDlg::FillColorValueSets_Impl() } //lock down a preferred size - const sal_uInt32 nColCount = m_pTabBgColorSet->getColumnCount(); + const sal_uInt32 nColCount = SvxColorValueSet::getColumnCount(); const sal_uInt32 nRowCount(ceil(double(nColorCount)/nColCount)); - const sal_uInt32 nLength = m_pTabBgColorSet->getEntryEdgeLength(); + const sal_uInt32 nLength = SvxColorValueSet::getEntryEdgeLength(); Size aSize(m_pTabBgColorSet->CalcWindowSizePixel(Size(nLength, nLength), nColCount, nRowCount)); m_pTabBgColorSet->set_width_request(aSize.Width()+8); m_pTabBgColorSet->set_height_request(aSize.Height()+8); diff --git a/sc/source/ui/unoobj/viewuno.cxx b/sc/source/ui/unoobj/viewuno.cxx index 1d5647143def..45e062197488 100644 --- a/sc/source/ui/unoobj/viewuno.cxx +++ b/sc/source/ui/unoobj/viewuno.cxx @@ -328,7 +328,7 @@ uno::Reference< form::runtime::XFormController > SAL_CALL ScViewPaneBase::getFor SdrView* pSdrView( NULL ); FmFormShell* pFormShell( NULL ); if ( lcl_prepareFormShellCall( pViewShell, nPane, pFormShell, pWindow, pSdrView ) ) - xController = pFormShell->GetFormController( _Form, *pSdrView, *pWindow ); + xController = FmFormShell::GetFormController( _Form, *pSdrView, *pWindow ); return xController; } diff --git a/sc/source/ui/view/gridwin5.cxx b/sc/source/ui/view/gridwin5.cxx index 4640370f06b9..5fa3255a534c 100644 --- a/sc/source/ui/view/gridwin5.cxx +++ b/sc/source/ui/view/gridwin5.cxx @@ -426,7 +426,7 @@ void ScGridWindow::RequestHelp(const HelpEvent& rHEvt) SdrPageView* pPV = pDrView->GetSdrPageView(); OSL_ENSURE( pPV, "SdrPageView* ist NULL" ); if (pPV) - bDone = static_cast<ScDrawPage*>(pPV->GetPage())->RequestHelp( this, pDrView, rHEvt ); + bDone = FmFormPage::RequestHelp( this, pDrView, rHEvt ); } // Wenn QuickHelp fuer AutoFill angezeigt wird, nicht wieder wegnehmen lassen diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx index bd2757718b39..d743aeb854f2 100644 --- a/sd/source/filter/html/htmlex.cxx +++ b/sd/source/filter/html/htmlex.cxx @@ -1267,7 +1267,7 @@ void HtmlExport::WriteTable(OUStringBuffer& aStr, SdrTableObj* pTableObject, Sdr { CellPos aStart, aEnd; - aStart = pTableObject->getFirstCell(); + aStart = SdrTableObj::getFirstCell(); aEnd = pTableObject->getLastCell(); sal_Int32 nColCount = pTableObject->getColumnCount(); diff --git a/sd/source/ui/func/fuformatpaintbrush.cxx b/sd/source/ui/func/fuformatpaintbrush.cxx index cc25b13160c0..1f7966419bc7 100644 --- a/sd/source/ui/func/fuformatpaintbrush.cxx +++ b/sd/source/ui/func/fuformatpaintbrush.cxx @@ -235,7 +235,7 @@ bool FuFormatPaintBrush::HasContentForThisType( sal_uInt32 nObjectInventor, sal_ { if( mxItemSet.get() == 0 ) return false; - if( !mpView || (!mpView->SupportsFormatPaintbrush( nObjectInventor, nObjectIdentifier) ) ) + if( !mpView || (!SdrObjEditView::SupportsFormatPaintbrush( nObjectInventor, nObjectIdentifier) ) ) return false; return true; } @@ -276,7 +276,7 @@ void FuFormatPaintBrush::Paste( bool bNoCharacterFormats, bool bNoParagraphForma if( rMarkList.GetMarkCount() == 1 ) { SdrObject* pObj = rMarkList.GetMark(0)->GetMarkedSdrObj(); - if( pObj && rDrawViewShell.GetDrawView()->SupportsFormatPaintbrush(pObj->GetObjInventor(),pObj->GetObjIdentifier()) ) + if( pObj && SdrObjEditView::SupportsFormatPaintbrush(pObj->GetObjInventor(),pObj->GetObjIdentifier()) ) return; } rSet.DisableItem( SID_FORMATPAINTBRUSH ); diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx index f1db1952db29..f522f6eba3f2 100644 --- a/sd/source/ui/func/fupoor.cxx +++ b/sd/source/ui/func/fupoor.cxx @@ -1031,7 +1031,7 @@ bool FuPoor::RequestHelp(const HelpEvent& rHEvt) if (pPage) { - bReturn = pPage->RequestHelp(mpWindow, mpView, rHEvt); + bReturn = FmFormPage::RequestHelp(mpWindow, mpView, rHEvt); } } diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx index f38f68e7ff48..e12a15bc75c6 100644 --- a/sd/source/ui/unoidl/DrawController.cxx +++ b/sd/source/ui/unoidl/DrawController.cxx @@ -712,7 +712,7 @@ uno::Reference< form::runtime::XFormController > SAL_CALL DrawController::getFor uno::Reference< form::runtime::XFormController > xController( NULL ); if ( pFormShell && pSdrView && pWindow ) - xController = pFormShell->GetFormController( Form, *pSdrView, *pWindow ); + xController = FmFormShell::GetFormController( Form, *pSdrView, *pWindow ); return xController; } diff --git a/sd/source/ui/view/sdview.cxx b/sd/source/ui/view/sdview.cxx index 96d63bc6cb2a..35c8f3549358 100644 --- a/sd/source/ui/view/sdview.cxx +++ b/sd/source/ui/view/sdview.cxx @@ -1290,7 +1290,7 @@ bool View::ShouldToggleOn( } else { - aStart = pTableObj->getFirstCell(); + aStart = SdrTableObj::getFirstCell(); aEnd = pTableObj->getLastCell(); } sal_Int32 nColCount = pTableObj->getColumnCount(); @@ -1364,7 +1364,7 @@ void View::ChangeMarkedObjectsBulletsNumbering( } else { - aStart = pTableObj->getFirstCell(); + aStart = SdrTableObj::getFirstCell(); aEnd = pTableObj->getLastCell(); } sal_Int32 nColCount = pTableObj->getColumnCount(); diff --git a/sdext/source/presenter/PresenterAccessibility.cxx b/sdext/source/presenter/PresenterAccessibility.cxx index 0a22ca345896..beb609a83ede 100644 --- a/sdext/source/presenter/PresenterAccessibility.cxx +++ b/sdext/source/presenter/PresenterAccessibility.cxx @@ -1632,15 +1632,11 @@ sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getCharacterCount() } sal_Int32 SAL_CALL PresenterAccessible::AccessibleParagraph::getIndexAtPoint ( - const css::awt::Point& rPoint) + const css::awt::Point& ) throw (css::uno::RuntimeException, std::exception) { ThrowIfDisposed(); - sal_Int32 nIndex (-1); - if (mpParagraph) - nIndex = mpParagraph->GetIndexAtPoint(rPoint); - return nIndex; } diff --git a/sdext/source/presenter/PresenterTextView.cxx b/sdext/source/presenter/PresenterTextView.cxx index 6ce7e3235ae6..e0b3838ef660 100644 --- a/sdext/source/presenter/PresenterTextView.cxx +++ b/sdext/source/presenter/PresenterTextView.cxx @@ -992,12 +992,6 @@ awt::Rectangle PresenterTextParagraph::GetCharacterBounds ( return awt::Rectangle(sal_Int32(nX+0.5), sal_Int32(nY+0.5), 0, 0); } -sal_Int32 PresenterTextParagraph::GetIndexAtPoint (const awt::Point& rPoint) const -{ - (void)rPoint; - return -1; -} - sal_Int8 PresenterTextParagraph::GetTextDirection() const { // Find first portion that has a non-neutral text direction. diff --git a/sdext/source/presenter/PresenterTextView.hxx b/sdext/source/presenter/PresenterTextView.hxx index 349e9df6902b..0229d79fac1c 100644 --- a/sdext/source/presenter/PresenterTextView.hxx +++ b/sdext/source/presenter/PresenterTextView.hxx @@ -123,7 +123,6 @@ public: css::awt::Rectangle GetCharacterBounds ( sal_Int32 nGlobalCharacterIndex, const bool bCaretBox); - sal_Int32 GetIndexAtPoint (const css::awt::Point& rPoint) const; void SetupCellArray ( const PresenterTheme::SharedFontDescriptor& rpFont); void Format ( diff --git a/sdext/source/presenter/PresenterTheme.cxx b/sdext/source/presenter/PresenterTheme.cxx index 36387a2861b1..0e8af211d1da 100644 --- a/sdext/source/presenter/PresenterTheme.cxx +++ b/sdext/source/presenter/PresenterTheme.cxx @@ -113,12 +113,12 @@ public: PresenterConfigurationAccess& rConfiguration, const OUString& rsThemeName); - BorderSize ReadBorderSize (const Reference<container::XNameAccess>& rxNode); + static BorderSize ReadBorderSize (const Reference<container::XNameAccess>& rxNode); private: - Any GetByName ( + static Any GetByName ( const Reference<container::XNameAccess>& rxNode, - const OUString& rsName) const; + const OUString& rsName); }; /** A PaneStyle describes how a pane is rendered. @@ -766,7 +766,7 @@ PresenterTheme::SharedFontDescriptor ReadContext::ReadFont ( Any ReadContext::GetByName ( const Reference<container::XNameAccess>& rxNode, - const OUString& rsName) const + const OUString& rsName) { OSL_ASSERT(rxNode.is()); if (rxNode->hasByName(rsName)) @@ -903,9 +903,9 @@ void PaneStyleContainer::ProcessPaneStyle( xFontNode, "", PresenterTheme::SharedFontDescriptor()); Reference<container::XNameAccess> xInnerBorderSizeNode (rValues[3], UNO_QUERY); - pStyle->maInnerBorderSize = rReadContext.ReadBorderSize(xInnerBorderSizeNode); + pStyle->maInnerBorderSize = ReadContext::ReadBorderSize(xInnerBorderSizeNode); Reference<container::XNameAccess> xOuterBorderSizeNode (rValues[4], UNO_QUERY); - pStyle->maOuterBorderSize = rReadContext.ReadBorderSize(xOuterBorderSizeNode); + pStyle->maOuterBorderSize = ReadContext::ReadBorderSize(xOuterBorderSizeNode); if (pStyle->mpParentStyle.get() != NULL) { diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index b335dbf45d0e..ef848e02896d 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -317,7 +317,7 @@ public: bool ShowDocumentInfoDialog(); - OUString GetRecommendedExtension( const OUString& aTypeName ); + static OUString GetRecommendedExtension( const OUString& aTypeName ); OUString GetRecommendedDir( const OUString& aSuggestedDir ); OUString GetRecommendedName( const OUString& aSuggestedName, const OUString& aTypeName ); diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx index 4a7760392f64..f65943b0316d 100644 --- a/svx/inc/galbrws2.hxx +++ b/svx/inc/galbrws2.hxx @@ -175,7 +175,7 @@ public: void ShowContextMenu( vcl::Window* pWindow, const Point* pContextPoint = NULL ); bool KeyInput( const KeyEvent& rEvt, vcl::Window* pWindow ); - com::sun::star::uno::Reference< com::sun::star::frame::XFrame > GetFrame() const; + static com::sun::star::uno::Reference< com::sun::star::frame::XFrame > GetFrame(); com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > GetUNOContext() const { return m_xContext; } com::sun::star::uno::Reference< com::sun::star::util::XURLTransformer > GetURLTransformer() const { return m_xTransformer; } diff --git a/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx index 6f401aa7213b..d01859481917 100644 --- a/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx +++ b/svx/inc/sdr/primitive2d/sdrtextprimitive2d.hxx @@ -78,7 +78,7 @@ namespace drawinglayer protected: // support for XTEXT_PAINTSHAPE_BEGIN/XTEXT_PAINTSHAPE_END Metafile comments - Primitive2DSequence encapsulateWithTextHierarchyBlockPrimitive2D(const Primitive2DSequence& rCandidate) const; + static Primitive2DSequence encapsulateWithTextHierarchyBlockPrimitive2D(const Primitive2DSequence& rCandidate); public: SdrTextPrimitive2D( diff --git a/svx/source/accessibility/charmapacc.cxx b/svx/source/accessibility/charmapacc.cxx index b52d8d8051f4..e3466fc11580 100644 --- a/svx/source/accessibility/charmapacc.cxx +++ b/svx/source/accessibility/charmapacc.cxx @@ -526,7 +526,7 @@ Sequence< sal_Int32 > SAL_CALL SvxShowCharSetAcc::getSelectedAccessibleRows( ) OExternalLockGuard aGuard( this ); ensureAlive(); Sequence< sal_Int32 > aSel(1); - aSel[0] = m_pParent->getCharSetControl()->GetRowPos(m_pParent->getCharSetControl()->GetSelectIndexId()); + aSel[0] = SvxShowCharSet::GetRowPos(m_pParent->getCharSetControl()->GetSelectIndexId()); return aSel; } @@ -535,7 +535,7 @@ Sequence< sal_Int32 > SAL_CALL SvxShowCharSetAcc::getSelectedAccessibleColumns( OExternalLockGuard aGuard( this ); ensureAlive(); Sequence< sal_Int32 > aSel(1); - aSel[0] = m_pParent->getCharSetControl()->GetColumnPos(m_pParent->getCharSetControl()->GetSelectIndexId()); + aSel[0] = SvxShowCharSet::GetColumnPos(m_pParent->getCharSetControl()->GetSelectIndexId()); return aSel; } @@ -543,14 +543,14 @@ sal_Bool SAL_CALL SvxShowCharSetAcc::isAccessibleRowSelected( sal_Int32 nRow ) t { OExternalLockGuard aGuard( this ); ensureAlive(); - return m_pParent->getCharSetControl()->GetRowPos(m_pParent->getCharSetControl()->GetSelectIndexId()) == nRow; + return SvxShowCharSet::GetRowPos(m_pParent->getCharSetControl()->GetSelectIndexId()) == nRow; } sal_Bool SAL_CALL SvxShowCharSetAcc::isAccessibleColumnSelected( sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); ensureAlive(); - return m_pParent->getCharSetControl()->GetColumnPos(m_pParent->getCharSetControl()->GetSelectIndexId()) == nColumn; + return SvxShowCharSet::GetColumnPos(m_pParent->getCharSetControl()->GetSelectIndexId()) == nColumn; } Reference< XAccessible > SAL_CALL SvxShowCharSetAcc::getAccessibleCellAt( sal_Int32 nRow, sal_Int32 nColumn ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) @@ -590,14 +590,14 @@ sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleRow( sal_Int32 nChildIndex ) { OExternalLockGuard aGuard( this ); ensureAlive(); - return m_pParent->getCharSetControl()->GetRowPos(sal::static_int_cast<sal_uInt16>(nChildIndex)); + return SvxShowCharSet::GetRowPos(sal::static_int_cast<sal_uInt16>(nChildIndex)); } sal_Int32 SAL_CALL SvxShowCharSetAcc::getAccessibleColumn( sal_Int32 nChildIndex ) throw (IndexOutOfBoundsException, RuntimeException, std::exception) { OExternalLockGuard aGuard( this ); ensureAlive(); - return m_pParent->getCharSetControl()->GetColumnPos(sal::static_int_cast<sal_uInt16>(nChildIndex)); + return SvxShowCharSet::GetColumnPos(sal::static_int_cast<sal_uInt16>(nChildIndex)); } diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx index 28519890f12c..3cbd7eda07c3 100644 --- a/svx/source/dialog/charmap.cxx +++ b/svx/source/dialog/charmap.cxx @@ -196,14 +196,14 @@ void SvxShowCharSet::Command( const CommandEvent& rCEvt ) -sal_uInt16 SvxShowCharSet::GetRowPos(sal_uInt16 _nPos) const +sal_uInt16 SvxShowCharSet::GetRowPos(sal_uInt16 _nPos) { return _nPos / COLUMN_COUNT ; } -sal_uInt16 SvxShowCharSet::GetColumnPos(sal_uInt16 _nPos) const +sal_uInt16 SvxShowCharSet::GetColumnPos(sal_uInt16 _nPos) { return _nPos % COLUMN_COUNT ; } diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx index 536750d1b763..941519e30853 100644 --- a/svx/source/dialog/imapwnd.cxx +++ b/svx/source/dialog/imapwnd.cxx @@ -449,7 +449,7 @@ SdrObject* IMapWindow::GetHitSdrObj( const Point& rPosPixel ) const return pObj; } -IMapObject* IMapWindow::GetIMapObj( const SdrObject* pSdrObj ) const +IMapObject* IMapWindow::GetIMapObj( const SdrObject* pSdrObj ) { IMapObject* pIMapObj = NULL; diff --git a/svx/source/dialog/imapwnd.hxx b/svx/source/dialog/imapwnd.hxx index 3d889247857e..26b266de8998 100644 --- a/svx/source/dialog/imapwnd.hxx +++ b/svx/source/dialog/imapwnd.hxx @@ -125,7 +125,7 @@ protected: void ClearTargetList(); SdrObject* CreateObj( const IMapObject* pIMapObj ); - IMapObject* GetIMapObj( const SdrObject* pSdrObj ) const; + static IMapObject* GetIMapObj( const SdrObject* pSdrObj ); SdrObject* GetHitSdrObj( const Point& rPosPixel ) const; void UpdateInfo( bool bNewObj ); diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index 45a6ed4c7415..1804086c1134 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -2626,7 +2626,7 @@ void SvxRuler::Click() bool SvxRuler::CalcLimits ( long& nMax1, // minimum value to be set long& nMax2, // minimum value to be set - bool ) const + bool ) { /* Default implementation of the virtual function; the application can be diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index 55b03309ed2c..a295ea9094fa 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -542,7 +542,7 @@ IMPL_LINK( FmGridHeader, OnAsyncExecuteDrop, void*, /*NOTINTERESTEDIN*/ ) FormControlFactory aControlFactory; aControlFactory.initializeControlModel( DocumentClassification::classifyHostDocument( xCols ), xCol ); - aControlFactory.initializeFieldDependentProperties( xField, xCol, xNumberFormats ); + FormControlFactory::initializeFieldDependentProperties( xField, xCol, xNumberFormats ); xCol->setPropertyValue(FM_PROP_CONTROLSOURCE, makeAny(sFieldName)); if ( xSecondCol.is() ) diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index a3955d0d52bd..8bb336fa22cf 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -1788,7 +1788,7 @@ void FmXGridPeer::elementReplaced(const ContainerEvent& evt) throw( RuntimeExcep Reference< XIndexAccess > xColumnsByIndex( xColumnsByName, UNO_QUERY ); if ( xColumnsByIndex.is() ) - pGrid->InitColumnByField( pCol, xNewColumn, xColumnsByName, xColumnsByIndex ); + FmGridControl::InitColumnByField( pCol, xNewColumn, xColumnsByName, xColumnsByIndex ); else // the simple version, applies when the grid is not yet connected to a data source pCol->setModel(xNewColumn); diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 0956934e8344..381fc843cb9d 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -766,7 +766,7 @@ namespace svxform m_pNaviWin->DisableNotify( false ); EnableMenuItems( NULL ); if ( bIsDocModified ) - m_pNaviWin->SetDocModified(); + svxform::DataNavigatorWindow::SetDocModified(); return bHandled; } diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index bc19f378f9bc..2a39c1e54fba 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -302,7 +302,7 @@ public: void AddOrRemoveListener( const Reference< XIndexAccess >& _rxControllers, const bool _bAdd ); - void setText(sal_Int32 nPos, + static void setText(sal_Int32 nPos, const FmFilterItem* pFilterItem, const OUString& rText); }; @@ -807,7 +807,7 @@ void FmFilterModel::Remove(FmFilterData* pData) { ::std::vector< FmFilterData* >::iterator removePos = rChildren.end() - 1; FmFilterItem* pFilterItem = PTR_CAST( FmFilterItem, *removePos ); - m_pAdapter->setText( nPos, pFilterItem, OUString() ); + FmFilterAdapter::setText( nPos, pFilterItem, OUString() ); Remove( removePos ); } } @@ -837,7 +837,7 @@ void FmFilterModel::Remove(FmFilterData* pData) sal_Int32 nParentPos = j - rParentParentItems.begin(); // EmptyText removes the filter - m_pAdapter->setText(nParentPos, pFilterItem, OUString()); + FmFilterAdapter::setText(nParentPos, pFilterItem, OUString()); Remove( i ); } } @@ -914,7 +914,7 @@ void FmFilterModel::SetTextForItem(FmFilterItem* pItem, const OUString& rText) ::std::vector<FmFilterData*>::iterator i = ::std::find(rItems.begin(), rItems.end(), pItem->GetParent()); sal_Int32 nParentPos = i - rItems.begin(); - m_pAdapter->setText(nParentPos, pItem, rText); + FmFilterAdapter::setText(nParentPos, pItem, rText); if (rText.isEmpty()) Remove(pItem); diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx index f70af85136de..043c84eec0c9 100644 --- a/svx/source/form/fmobj.cxx +++ b/svx/source/form/fmobj.cxx @@ -653,7 +653,7 @@ bool FmFormObj::EndCreate( SdrDragStat& rStat, SdrCreateCmd eCmd ) xFormToInsertInto.set( xParentForm, UNO_QUERY_THROW ); } - rPage.GetImpl().setUniqueName( xContent, xParentForm ); + FmFormPageImpl::setUniqueName( xContent, xParentForm ); if ( xFormToInsertInto.is() ) xFormToInsertInto->insertByIndex( xFormToInsertInto->getCount(), makeAny( xContent ) ); diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx index 71c246ca35c4..463ad07e6b09 100644 --- a/svx/source/form/fmpgeimp.cxx +++ b/svx/source/form/fmpgeimp.cxx @@ -80,7 +80,7 @@ namespace class FormComponentInfo { public: - size_t childCount( const Reference< XInterface >& _component ) const + static size_t childCount( const Reference< XInterface >& _component ) { Reference< XIndexAccess > xContainer( _component, UNO_QUERY ); if ( xContainer.is() ) @@ -88,7 +88,7 @@ namespace return 0; } - Reference< XInterface > getChild( const Reference< XInterface >& _component, size_t _index ) const + static Reference< XInterface > getChild( const Reference< XInterface >& _component, size_t _index ) { Reference< XIndexAccess > xContainer( _component, UNO_QUERY_THROW ); return Reference< XInterface >( xContainer->getByIndex( _index ), UNO_QUERY ); @@ -104,24 +104,22 @@ namespace { } - size_t childCount( const FormComponentPair& _components ) const + static size_t childCount( const FormComponentPair& _components ) { - size_t lhsCount = m_aComponentInfo.childCount( _components.first ); - size_t rhsCount = m_aComponentInfo.childCount( _components.second ); + size_t lhsCount = FormComponentInfo::childCount( _components.first ); + size_t rhsCount = FormComponentInfo::childCount( _components.second ); if ( lhsCount != rhsCount ) throw RuntimeException( "Found inconsistent form component hierarchies (1)!" ); return lhsCount; } - FormComponentPair getChild( const FormComponentPair& _components, size_t _index ) const + static FormComponentPair getChild( const FormComponentPair& _components, size_t _index ) { return FormComponentPair( - m_aComponentInfo.getChild( _components.first, _index ), - m_aComponentInfo.getChild( _components.second, _index ) + FormComponentInfo::getChild( _components.first, _index ), + FormComponentInfo::getChild( _components.second, _index ) ); } - private: - FormComponentInfo m_aComponentInfo; }; typedef ::std::map< Reference< XControlModel >, Reference< XControlModel >, ::comphelper::OInterfaceCompare< XControlModel > > MapControlModels; diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx index cc4f9154d2d7..0d27ca92e242 100644 --- a/svx/source/form/fmscriptingenv.cxx +++ b/svx/source/form/fmscriptingenv.cxx @@ -112,7 +112,7 @@ namespace svxform @return <TRUE/> if and only if the method is declared <code>oneway</code>, i.e. can be called asynchronously */ - bool impl_allowAsynchronousCall_nothrow( const OUString& _rListenerType, const OUString& _rMethodName ) const; + static bool impl_allowAsynchronousCall_nothrow( const OUString& _rListenerType, const OUString& _rMethodName ); /** determines whether the instance is already disposed */ @@ -178,7 +178,7 @@ namespace svxform } - bool FormScriptListener::impl_allowAsynchronousCall_nothrow( const OUString& _rListenerType, const OUString& _rMethodName ) const + bool FormScriptListener::impl_allowAsynchronousCall_nothrow( const OUString& _rListenerType, const OUString& _rMethodName ) { // This used to be implemented as: // is (_rListenerType + "::" + _rMethodName) a oneway function? diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index fa95fc6e0061..9d2d260a0362 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -1377,7 +1377,7 @@ namespace } -::std::unique_ptr< ::svx::ISdrObjectFilter > FmFormShell::CreateFocusableControlFilter( const SdrView& i_rView, const OutputDevice& i_rDevice ) const +::std::unique_ptr< ::svx::ISdrObjectFilter > FmFormShell::CreateFocusableControlFilter( const SdrView& i_rView, const OutputDevice& i_rDevice ) { ::std::unique_ptr< ::svx::ISdrObjectFilter > pFilter; @@ -1431,7 +1431,7 @@ SdrUnoObj* FmFormShell::GetFormControl( const Reference< XControlModel >& _rxMod } -Reference< runtime::XFormController > FmFormShell::GetFormController( const Reference< XForm >& _rxForm, const SdrView& _rView, const OutputDevice& _rDevice ) const +Reference< runtime::XFormController > FmFormShell::GetFormController( const Reference< XForm >& _rxForm, const SdrView& _rView, const OutputDevice& _rDevice ) { const FmFormView* pFormView = dynamic_cast< const FmFormView* >( &_rView ); if ( !pFormView ) diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index f692c5038652..cbd32ba352a5 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -428,7 +428,7 @@ void FmXUndoEnvironment::Inserted(FmFormObj* pObj) nPos = xNewParent->getCount(); } - rPage.GetImpl().setUniqueName( xContent, xForm ); + FmFormPageImpl::setUniqueName( xContent, xForm ); xNewParent->insertByIndex( nPos, makeAny( xContent ) ); Reference< XEventAttacherManager > xManager( xNewParent, UNO_QUERY_THROW ); diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index 52e48aa1c5b5..2b0b410d21fb 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -1103,7 +1103,7 @@ namespace rPage.GetImpl().findPlaceInFormComponentHierarchy( xFormComponent, _rxDataSource, _rDataSourceName, _rCommand, _nCommandType ), UNO_SET_THROW ); - rPage.GetImpl().setUniqueName( xFormComponent, xTargetForm ); + FmFormPageImpl::setUniqueName( xFormComponent, xTargetForm ); Reference< XIndexContainer > xFormAsContainer( xTargetForm, UNO_QUERY_THROW ); xFormAsContainer->insertByIndex( xFormAsContainer->getCount(), makeAny( xFormComponent ) ); @@ -1647,8 +1647,7 @@ bool FmXFormView::createControlLabelPair( OutputDevice& _rOutDev, sal_Int32 _nXO if ( _rxField.is() ) { - FormControlFactory aControlFactory; - aControlFactory.initializeFieldDependentProperties( _rxField, xControlSet, _rxNumberFormats ); + FormControlFactory::initializeFieldDependentProperties( _rxField, xControlSet, _rxNumberFormats ); } _rpLabel = pLabel.release(); diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index 4b4a7972bf9b..4bbda320c8e7 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -1398,11 +1398,7 @@ namespace svxform // set name - FmFormView* pFormView = GetNavModel()->GetFormShell()->GetFormView(); - SdrPageView* pPageView = pFormView->GetSdrPageView(); - FmFormPage* pPage = static_cast<FmFormPage*>(pPageView->GetPage()); - - OUString sName = pPage->GetImpl().setUniqueName( xNewComponent, xParentForm ); + OUString sName = FmFormPageImpl::setUniqueName( xNewComponent, xParentForm ); pNewFormControlData->SetText( sName ); @@ -1465,7 +1461,7 @@ namespace svxform GrabFocus(); FmEntryData* pEntryData = static_cast<FmEntryData*>(pEntry->GetUserData()); - bool bRes = GetNavModel()->Rename( pEntryData, rNewText); + bool bRes = NavigatorTreeModel::Rename( pEntryData, rNewText); if( !bRes ) { m_pEditEntry = pEntry; diff --git a/svx/source/gallery2/galbrws1.hxx b/svx/source/gallery2/galbrws1.hxx index a10df2ec3e7d..33fd25eb3b35 100644 --- a/svx/source/gallery2/galbrws1.hxx +++ b/svx/source/gallery2/galbrws1.hxx @@ -97,8 +97,8 @@ private: ::boost::function<void()> maThemeSlectionHandler; void ImplAdjustControls(); - sal_uIntPtr ImplInsertThemeEntry( const GalleryThemeEntry* pEntry ); - void ImplFillExchangeData( const GalleryTheme* pThm, ExchangeData& rData ); + sal_uIntPtr ImplInsertThemeEntry( const GalleryThemeEntry* pEntry ); + static void ImplFillExchangeData( const GalleryTheme* pThm, ExchangeData& rData ); void ImplGetExecuteVector(::std::vector< sal_uInt16 >& o_aExec); void ImplExecute( sal_uInt16 nId ); void ImplGalleryThemeProperties( const OUString & rThemeName, bool bCreateNew ); diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index e23ab737acf3..71bf2ec14aa9 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -118,7 +118,7 @@ private: typedef std::map< int, CommandInfo > CommandInfoMap; CommandInfoMap m_aCommandInfo; - void Execute( const CommandInfo &rCmdInfo, + static void Execute( const CommandInfo &rCmdInfo, const css::uno::Sequence< css::beans::PropertyValue > &rArguments ); DECL_LINK( MenuSelectHdl, Menu* pMenu ); @@ -295,7 +295,7 @@ void GalleryThemePopup::ExecutePopup( vcl::Window *pWindow, const ::Point &aPos // update status css::uno::Reference< css::frame::XDispatchProvider> xDispatchProvider( - mpBrowser->GetFrame(), css::uno::UNO_QUERY ); + GalleryBrowser2::GetFrame(), css::uno::UNO_QUERY ); css::uno::Reference< css::util::XURLTransformer > xTransformer( mpBrowser->GetURLTransformer() ); for ( CommandInfoMap::iterator it = m_aCommandInfo.begin(); @@ -789,7 +789,7 @@ void GalleryBrowser2::SetMode( GalleryBrowserMode eMode ) mpPreview->Hide(); mpPreview->SetGraphic( Graphic() ); - mpPreview->PreviewMedia( INetURLObject() ); + GalleryPreview::PreviewMedia( INetURLObject() ); mpIconView->Show(); @@ -807,7 +807,7 @@ void GalleryBrowser2::SetMode( GalleryBrowserMode eMode ) mpPreview->Hide(); mpPreview->SetGraphic( Graphic() ); - mpPreview->PreviewMedia( INetURLObject() ); + GalleryPreview::PreviewMedia( INetURLObject() ); mpListView->Show(); @@ -839,7 +839,7 @@ void GalleryBrowser2::SetMode( GalleryBrowserMode eMode ) mpPreview->Show(); if( mpCurTheme && mpCurTheme->GetObjectKind( nPos ) == SGA_OBJ_SOUND ) - mpPreview->PreviewMedia( mpCurTheme->GetObjectURL( nPos ) ); + GalleryPreview::PreviewMedia( mpCurTheme->GetObjectURL( nPos ) ); maViewBox.EnableItem( TBX_ID_ICON, false ); maViewBox.EnableItem( TBX_ID_LIST, false ); @@ -912,7 +912,7 @@ void GalleryBrowser2::Travel( GalleryBrowserTravel eTravel ) mpPreview->SetGraphic( aGraphic ); if( SGA_OBJ_SOUND == mpCurTheme->GetObjectKind( nPos ) ) - mpPreview->PreviewMedia( mpCurTheme->GetObjectURL( nPos ) ); + GalleryPreview::PreviewMedia( mpCurTheme->GetObjectURL( nPos ) ); mpPreview->Invalidate(); } @@ -1023,7 +1023,7 @@ void GalleryBrowser2::ImplSelectItemId( sal_uIntPtr nItemId ) } css::uno::Reference< css::frame::XFrame > -GalleryBrowser2::GetFrame() const +GalleryBrowser2::GetFrame() { css::uno::Reference< css::frame::XFrame > xFrame; SfxViewFrame* pCurrentViewFrame = SfxViewFrame::Current(); @@ -1191,7 +1191,7 @@ void GalleryBrowser2::Execute( sal_uInt16 nId ) } } - mpCurTheme->ReleaseObject( pObj ); + GalleryTheme::ReleaseObject( pObj ); } } } diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx index e0517d50f7a7..f2ead34d10fd 100644 --- a/svx/source/gallery2/galctrl.cxx +++ b/svx/source/gallery2/galctrl.cxx @@ -345,7 +345,7 @@ void GalleryIconView::UserDraw( const UserDrawEvent& rUDEvt ) aItemTextTitle = GalleryBrowser2::GetItemText(*mpTheme, *pObj, GALLERY_ITEM_TITLE); mpTheme->SetPreviewBitmapExAndStrings(nId - 1, aBitmapEx, aSize, aItemTextTitle, aItemTextPath); - mpTheme->ReleaseObject(pObj); + GalleryTheme::ReleaseObject(pObj); } } @@ -466,7 +466,7 @@ OUString GalleryListView::GetCellText(long _nRow, sal_uInt16 /*nColumnId*/) cons if( pObj ) { sRet = GalleryBrowser2::GetItemText( *mpTheme, *pObj, GALLERY_ITEM_TITLE ); - mpTheme->ReleaseObject( pObj ); + GalleryTheme::ReleaseObject( pObj ); } } @@ -534,7 +534,7 @@ void GalleryListView::PaintField( OutputDevice& rDev, const Rectangle& rRect, sa aItemTextPath = GalleryBrowser2::GetItemText(*mpTheme, *pObj, GALLERY_ITEM_PATH); mpTheme->SetPreviewBitmapExAndStrings(mnCurRow, aBitmapEx, aSize, aItemTextTitle, aItemTextPath); - mpTheme->ReleaseObject(pObj); + GalleryTheme::ReleaseObject(pObj); } } diff --git a/svx/source/gallery2/galexpl.cxx b/svx/source/gallery2/galexpl.cxx index 7ff42eeca8c6..7b9058a85835 100644 --- a/svx/source/gallery2/galexpl.cxx +++ b/svx/source/gallery2/galexpl.cxx @@ -99,7 +99,7 @@ bool GalleryExplorer::FillObjListTitle( const sal_uInt32 nThemeId, std::vector< { OUString aTitle( pObj->GetTitle() ); rList.push_back( aTitle ); - pTheme->ReleaseObject( pObj ); + GalleryTheme::ReleaseObject( pObj ); } } pGal->ReleaseTheme( pTheme, aListener ); diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index 55801bfebacd..c9bdb8aebaf8 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -107,7 +107,7 @@ GalleryThemeEntry::GalleryThemeEntry( bool bCreateUniqueURL, aName = rName; } -INetURLObject GalleryThemeEntry::ImplGetURLIgnoreCase( const INetURLObject& rURL ) const +INetURLObject GalleryThemeEntry::ImplGetURLIgnoreCase( const INetURLObject& rURL ) { INetURLObject aURL( rURL ); diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index 68df2a58396a..12f26b28d610 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -373,7 +373,7 @@ namespace svxform DataNavigatorWindow( vcl::Window* pParent, SfxBindings* pBindings ); virtual ~DataNavigatorWindow(); - void SetDocModified(); + static void SetDocModified(); void NotifyChanges( bool _bLoadAll = false ); void AddContainerBroadcaster( const XContainer_ref& xContainer ); void AddEventBroadcaster( const XEventTarget_ref& xTarget ); diff --git a/svx/source/inc/filtnav.hxx b/svx/source/inc/filtnav.hxx index 2ae3ff311f68..4778c79991d0 100644 --- a/svx/source/inc/filtnav.hxx +++ b/svx/source/inc/filtnav.hxx @@ -185,7 +185,7 @@ public: void SetCurrentController(const ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > & xController); void Remove(FmFilterData* pFilterItem); - void AppendFilterItems( FmFormItem& _rItem ); + static void AppendFilterItems( FmFormItem& _rItem ); void EnsureEmptyFilterRows( FmParentData& _rItem ); protected: diff --git a/svx/source/inc/fmexpl.hxx b/svx/source/inc/fmexpl.hxx index 4c527052d62c..e24df64a3c50 100644 --- a/svx/source/inc/fmexpl.hxx +++ b/svx/source/inc/fmexpl.hxx @@ -381,7 +381,7 @@ namespace svxform bool bAlterModel = false ); void Remove( FmEntryData* pEntryData, bool bAlterModel = false ); - bool Rename( FmEntryData* pEntryData, const OUString& rNewText ); + static bool Rename( FmEntryData* pEntryData, const OUString& rNewText ); void Clear(); void SetModified( bool bMod=true ); @@ -392,7 +392,7 @@ namespace svxform FmEntryData* FindData( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& xElement, FmEntryDataList* pDataList, bool bRecurs=true ); FmEntryData* FindData( const OUString& rText, FmFormData* pParentData, bool bRecurs=true ); FmEntryDataList* GetRootList() const { return m_pRootList; } - ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > GetFormComponents( FmFormData* pParentFormData ); + static ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > GetFormComponents( FmFormData* pParentFormData ); SdrObject* Search(SdrObjListIter& rIter, const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent >& xComp); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; @@ -481,7 +481,7 @@ namespace svxform void UnlockSelectionHandling() { --m_nSelectLock; } bool IsSelectionHandlingLocked() const { return m_nSelectLock>0; } - bool IsHiddenControl(FmEntryData* pEntryData); + static bool IsHiddenControl(FmEntryData* pEntryData); DECL_LINK( OnEdit, void* ); DECL_LINK( OnDropActionTimer, void* ); @@ -508,8 +508,8 @@ namespace svxform void MarkViewObj( FmControlData* pControlData, bool bMarkHandles, bool bMark ); void UnmarkAllViewObj(); - bool IsFormEntry( SvTreeListEntry* pEntry ); - bool IsFormComponentEntry( SvTreeListEntry* pEntry ); + static bool IsFormEntry( SvTreeListEntry* pEntry ); + static bool IsFormComponentEntry( SvTreeListEntry* pEntry ); OUString GenerateName( FmEntryData* pEntryData ); diff --git a/svx/source/inc/fmpgeimp.hxx b/svx/source/inc/fmpgeimp.hxx index 17b5644ee484..a3d52c147b8b 100644 --- a/svx/source/inc/fmpgeimp.hxx +++ b/svx/source/inc/fmpgeimp.hxx @@ -116,7 +116,7 @@ protected: ); public: - OUString setUniqueName(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent>& xFormComponent, const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm>& xControls); + static OUString setUniqueName(const ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormComponent>& xFormComponent, const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm>& xControls); void formObjectInserted( const FmFormObj& _object ); void formObjectRemoved( const FmFormObj& _object ); diff --git a/svx/source/inc/fmtextcontrolshell.hxx b/svx/source/inc/fmtextcontrolshell.hxx index 241ecaf380ce..e00e532a5f91 100644 --- a/svx/source/inc/fmtextcontrolshell.hxx +++ b/svx/source/inc/fmtextcontrolshell.hxx @@ -171,7 +171,7 @@ namespace svx ); /// creates SfxPoolItes for all features in the given set, and puts them into the given SfxAllItemSet - void transferFeatureStatesToItemSet( + static void transferFeatureStatesToItemSet( ControlFeatures& _rDispatchers, SfxAllItemSet& _rSet, bool _bTranslateLatin = false diff --git a/svx/source/inc/fmundo.hxx b/svx/source/inc/fmundo.hxx index 2e390aec2a3a..7c6e1af05e5c 100644 --- a/svx/source/inc/fmundo.hxx +++ b/svx/source/inc/fmundo.hxx @@ -197,8 +197,8 @@ public: void Inserted(SdrObject* pObj); void Removed(SdrObject* pObj); - void Inserted(FmFormObj* pObj); - void Removed(FmFormObj* pObj); + static void Inserted(FmFormObj* pObj); + static void Removed(FmFormObj* pObj); }; diff --git a/svx/source/inc/formcontrolfactory.hxx b/svx/source/inc/formcontrolfactory.hxx index 470a4ef8700e..0952008b2464 100644 --- a/svx/source/inc/formcontrolfactory.hxx +++ b/svx/source/inc/formcontrolfactory.hxx @@ -76,7 +76,7 @@ namespace svxform const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxModel ); - void initializeFieldDependentProperties( + static void initializeFieldDependentProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxDatabaseField, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxControlModel, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormats >& _rxNumberFormats diff --git a/svx/source/items/algitem.cxx b/svx/source/items/algitem.cxx index ed3e67748d4a..0a1577d1fbe7 100644 --- a/svx/source/items/algitem.cxx +++ b/svx/source/items/algitem.cxx @@ -109,7 +109,7 @@ bool SvxOrientationItem::PutValue( const uno::Any& rVal, sal_uInt8 /*nMemberId*/ -OUString SvxOrientationItem::GetValueText( sal_uInt16 nVal ) const +OUString SvxOrientationItem::GetValueText( sal_uInt16 nVal ) { DBG_ASSERT( nVal <= SVX_ORIENTATION_STACKED, "enum overflow!" ); return SVX_RESSTR(RID_SVXITEMS_ORI_STANDARD + nVal); diff --git a/svx/source/sdr/contact/objectcontact.cxx b/svx/source/sdr/contact/objectcontact.cxx index 77ed1cc8a23d..1fd832f7f2e6 100644 --- a/svx/source/sdr/contact/objectcontact.cxx +++ b/svx/source/sdr/contact/objectcontact.cxx @@ -153,7 +153,7 @@ sdr::event::TimerEventHandler& ObjectContact::GetEventHandler() const { if(!HasEventHandler()) { - const_cast< ObjectContact* >(this)->mpEventHandler = const_cast< ObjectContact* >(this)->CreateEventHandler(); + const_cast< ObjectContact* >(this)->mpEventHandler = sdr::contact::ObjectContact::CreateEventHandler(); DBG_ASSERT(mpEventHandler, "ObjectContact::GetEventHandler(): Got no EventHandler (!)"); } diff --git a/svx/source/sdr/overlay/overlayobject.cxx b/svx/source/sdr/overlay/overlayobject.cxx index 1a8eeb0d42b9..00499829e0fb 100644 --- a/svx/source/sdr/overlay/overlayobject.cxx +++ b/svx/source/sdr/overlay/overlayobject.cxx @@ -63,7 +63,7 @@ namespace sdr return drawinglayer::primitive2d::Primitive2DSequence(); } - sal_uInt32 OverlayObject::impCheckBlinkTimeValueRange(sal_uInt64 nBlinkTime) const + sal_uInt32 OverlayObject::impCheckBlinkTimeValueRange(sal_uInt64 nBlinkTime) { if(nBlinkTime < 25) { diff --git a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx index ec40017226b0..385de990fca4 100644 --- a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx @@ -93,7 +93,7 @@ namespace drawinglayer // support for XTEXT_PAINTSHAPE_BEGIN/XTEXT_PAINTSHAPE_END Metafile comments // for slideshow. This uses TextHierarchyBlockPrimitive2D to mark a text block. // ATM there is only one text block per SdrObject, this may get more in the future - Primitive2DSequence SdrTextPrimitive2D::encapsulateWithTextHierarchyBlockPrimitive2D(const Primitive2DSequence& rCandidate) const + Primitive2DSequence SdrTextPrimitive2D::encapsulateWithTextHierarchyBlockPrimitive2D(const Primitive2DSequence& rCandidate) { Primitive2DReference xReference(new TextHierarchyBlockPrimitive2D(rCandidate)); Primitive2DSequence xRetval(&xReference, 1); diff --git a/svx/source/sidebar/area/AreaPropertyPanel.hxx b/svx/source/sidebar/area/AreaPropertyPanel.hxx index 39a491d34080..544b91b7b7cf 100644 --- a/svx/source/sidebar/area/AreaPropertyPanel.hxx +++ b/svx/source/sidebar/area/AreaPropertyPanel.hxx @@ -153,7 +153,7 @@ private: SfxBindings* pBindings); virtual ~AreaPropertyPanel(); - void SetupIcons(); + static void SetupIcons(); void Initialize(); void Update(); void ImpUpdateTransparencies(); diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx index a44f357674d5..33e0010b46f1 100644 --- a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx +++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx @@ -100,7 +100,7 @@ private: SfxBindings* pBindings); virtual ~GraphicPropertyPanel(); - void SetupIcons(); + static void SetupIcons(); void Initialize(); }; diff --git a/svx/source/sidebar/line/LinePropertyPanel.hxx b/svx/source/sidebar/line/LinePropertyPanel.hxx index bfa573a81ce8..2d6a2898b7aa 100644 --- a/svx/source/sidebar/line/LinePropertyPanel.hxx +++ b/svx/source/sidebar/line/LinePropertyPanel.hxx @@ -136,7 +136,7 @@ private: /// bitfield bool mbWidthValuable : 1; - void SetupIcons(); + static void SetupIcons(); void Initialize(); void FillLineEndList(); void FillLineStyleList(); diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx index 7b807bdf8ff4..838e1c749114 100644 --- a/svx/source/sidebar/nbdtmg.cxx +++ b/svx/source/sidebar/nbdtmg.cxx @@ -830,8 +830,8 @@ void MixBulletsTypeMgr::Init() pActualBullets[0]->nIndex = 0+1; //index in the tab page display,decrease 1 to the index within arr pActualBullets[0]->nIndexDefault = 2; //index in the tab page display,decrease 1 to the index within arr pActualBullets[0]->pBullets = new BulletsSettings_Impl(eNBType::BULLETS) ; - static_cast<BulletsSettings_Impl*>(pActualBullets[0]->pBullets)->cBulletChar = rBTMgr.GetBulChar(pActualBullets[0]->nIndexDefault-1); - static_cast<BulletsSettings_Impl*>(pActualBullets[0]->pBullets)->aFont = rBTMgr.GetBulCharFont(pActualBullets[0]->nIndexDefault-1); + static_cast<BulletsSettings_Impl*>(pActualBullets[0]->pBullets)->cBulletChar = BulletsTypeMgr::GetBulChar(pActualBullets[0]->nIndexDefault-1); + static_cast<BulletsSettings_Impl*>(pActualBullets[0]->pBullets)->aFont = BulletsTypeMgr::GetBulCharFont(pActualBullets[0]->nIndexDefault-1); static_cast<BulletsSettings_Impl*>(pActualBullets[0]->pBullets)->sDescription = rBTMgr.GetDescription(pActualBullets[0]->nIndexDefault-1); static_cast<BulletsSettings_Impl*>(pActualBullets[0]->pBullets)->bIsCustomized = rBTMgr.IsCustomized(pActualBullets[0]->nIndexDefault-1); static_cast<BulletsSettings_Impl*>(pActualBullets[0]->pBullets)->eType = eNBType::BULLETS; @@ -842,8 +842,8 @@ void MixBulletsTypeMgr::Init() pActualBullets[1]->nIndex = 1+1; //index in the tab page display,decrease 1 to the index within arr pActualBullets[1]->nIndexDefault = 3; //index in the tab page display,decrease 1 to the index within arr pActualBullets[1]->pBullets = new BulletsSettings_Impl(eNBType::BULLETS) ; - static_cast<BulletsSettings_Impl*>(pActualBullets[1]->pBullets)->cBulletChar = rBTMgr.GetBulChar(pActualBullets[1]->nIndexDefault-1); - static_cast<BulletsSettings_Impl*>(pActualBullets[1]->pBullets)->aFont = rBTMgr.GetBulCharFont(pActualBullets[1]->nIndexDefault-1); + static_cast<BulletsSettings_Impl*>(pActualBullets[1]->pBullets)->cBulletChar = BulletsTypeMgr::GetBulChar(pActualBullets[1]->nIndexDefault-1); + static_cast<BulletsSettings_Impl*>(pActualBullets[1]->pBullets)->aFont = BulletsTypeMgr::GetBulCharFont(pActualBullets[1]->nIndexDefault-1); static_cast<BulletsSettings_Impl*>(pActualBullets[1]->pBullets)->sDescription = rBTMgr.GetDescription(pActualBullets[1]->nIndexDefault-1); static_cast<BulletsSettings_Impl*>(pActualBullets[1]->pBullets)->bIsCustomized = rBTMgr.IsCustomized(pActualBullets[1]->nIndexDefault-1); static_cast<BulletsSettings_Impl*>(pActualBullets[1]->pBullets)->eType = eNBType::BULLETS; @@ -854,8 +854,8 @@ void MixBulletsTypeMgr::Init() pActualBullets[2]->nIndex = 2+1; //index in the tab page display,decrease 1 to the index within arr pActualBullets[2]->nIndexDefault = 4; //index in the tab page display,decrease 1 to the index within arr pActualBullets[2]->pBullets = new BulletsSettings_Impl(eNBType::BULLETS) ; - static_cast<BulletsSettings_Impl*>(pActualBullets[2]->pBullets)->cBulletChar = rBTMgr.GetBulChar(pActualBullets[2]->nIndexDefault-1); - static_cast<BulletsSettings_Impl*>(pActualBullets[2]->pBullets)->aFont = rBTMgr.GetBulCharFont(pActualBullets[2]->nIndexDefault-1); + static_cast<BulletsSettings_Impl*>(pActualBullets[2]->pBullets)->cBulletChar = BulletsTypeMgr::GetBulChar(pActualBullets[2]->nIndexDefault-1); + static_cast<BulletsSettings_Impl*>(pActualBullets[2]->pBullets)->aFont = BulletsTypeMgr::GetBulCharFont(pActualBullets[2]->nIndexDefault-1); static_cast<BulletsSettings_Impl*>(pActualBullets[2]->pBullets)->sDescription = rBTMgr.GetDescription(pActualBullets[2]->nIndexDefault-1); static_cast<BulletsSettings_Impl*>(pActualBullets[2]->pBullets)->bIsCustomized = rBTMgr.IsCustomized(pActualBullets[2]->nIndexDefault-1); static_cast<BulletsSettings_Impl*>(pActualBullets[2]->pBullets)->eType = eNBType::BULLETS; @@ -866,8 +866,8 @@ void MixBulletsTypeMgr::Init() pActualBullets[3]->nIndex = 3+1; //index in the tab page display,decrease 1 to the index within arr pActualBullets[3]->nIndexDefault = 5; //index in the tab page display,decrease 1 to the index within arr pActualBullets[3]->pBullets = new BulletsSettings_Impl(eNBType::BULLETS) ; - static_cast<BulletsSettings_Impl*>(pActualBullets[3]->pBullets)->cBulletChar = rBTMgr.GetBulChar(pActualBullets[3]->nIndexDefault-1); - static_cast<BulletsSettings_Impl*>(pActualBullets[3]->pBullets)->aFont = rBTMgr.GetBulCharFont(pActualBullets[3]->nIndexDefault-1); + static_cast<BulletsSettings_Impl*>(pActualBullets[3]->pBullets)->cBulletChar = BulletsTypeMgr::GetBulChar(pActualBullets[3]->nIndexDefault-1); + static_cast<BulletsSettings_Impl*>(pActualBullets[3]->pBullets)->aFont = BulletsTypeMgr::GetBulCharFont(pActualBullets[3]->nIndexDefault-1); static_cast<BulletsSettings_Impl*>(pActualBullets[3]->pBullets)->sDescription = rBTMgr.GetDescription(pActualBullets[3]->nIndexDefault-1); static_cast<BulletsSettings_Impl*>(pActualBullets[3]->pBullets)->bIsCustomized = rBTMgr.IsCustomized(pActualBullets[3]->nIndexDefault-1); static_cast<BulletsSettings_Impl*>(pActualBullets[3]->pBullets)->eType = eNBType::BULLETS; @@ -878,8 +878,8 @@ void MixBulletsTypeMgr::Init() pActualBullets[4]->nIndex = 4+1; //index in the tab page display,decrease 1 to the index within arr pActualBullets[4]->nIndexDefault = 6; //index in the tab page display,decrease 1 to the index within arr pActualBullets[4]->pBullets = new BulletsSettings_Impl(eNBType::BULLETS) ; - static_cast<BulletsSettings_Impl*>(pActualBullets[4]->pBullets)->cBulletChar = rBTMgr.GetBulChar(pActualBullets[4]->nIndexDefault-1); - static_cast<BulletsSettings_Impl*>(pActualBullets[4]->pBullets)->aFont = rBTMgr.GetBulCharFont(pActualBullets[4]->nIndexDefault-1); + static_cast<BulletsSettings_Impl*>(pActualBullets[4]->pBullets)->cBulletChar = BulletsTypeMgr::GetBulChar(pActualBullets[4]->nIndexDefault-1); + static_cast<BulletsSettings_Impl*>(pActualBullets[4]->pBullets)->aFont = BulletsTypeMgr::GetBulCharFont(pActualBullets[4]->nIndexDefault-1); static_cast<BulletsSettings_Impl*>(pActualBullets[4]->pBullets)->sDescription = rBTMgr.GetDescription(pActualBullets[4]->nIndexDefault-1); static_cast<BulletsSettings_Impl*>(pActualBullets[4]->pBullets)->bIsCustomized = rBTMgr.IsCustomized(pActualBullets[4]->nIndexDefault-1); static_cast<BulletsSettings_Impl*>(pActualBullets[4]->pBullets)->eType = eNBType::BULLETS; @@ -890,8 +890,8 @@ void MixBulletsTypeMgr::Init() pActualBullets[5]->nIndex = 5+1; //index in the tab page display,decrease 1 to the index within arr pActualBullets[5]->nIndexDefault = 8; //index in the tab page display,decrease 1 to the index within arr pActualBullets[5]->pBullets = new BulletsSettings_Impl(eNBType::BULLETS) ; - static_cast<BulletsSettings_Impl*>(pActualBullets[5]->pBullets)->cBulletChar = rBTMgr.GetBulChar(pActualBullets[5]->nIndexDefault-1); - static_cast<BulletsSettings_Impl*>(pActualBullets[5]->pBullets)->aFont = rBTMgr.GetBulCharFont(pActualBullets[5]->nIndexDefault-1); + static_cast<BulletsSettings_Impl*>(pActualBullets[5]->pBullets)->cBulletChar = BulletsTypeMgr::GetBulChar(pActualBullets[5]->nIndexDefault-1); + static_cast<BulletsSettings_Impl*>(pActualBullets[5]->pBullets)->aFont = BulletsTypeMgr::GetBulCharFont(pActualBullets[5]->nIndexDefault-1); static_cast<BulletsSettings_Impl*>(pActualBullets[5]->pBullets)->sDescription = rBTMgr.GetDescription(pActualBullets[5]->nIndexDefault-1); static_cast<BulletsSettings_Impl*>(pActualBullets[5]->pBullets)->bIsCustomized = rBTMgr.IsCustomized(pActualBullets[5]->nIndexDefault-1); static_cast<BulletsSettings_Impl*>(pActualBullets[5]->pBullets)->eType = eNBType::BULLETS; diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx index 07fb087a1d94..a14df2c9d575 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx @@ -56,7 +56,7 @@ private: void ExecuteLineSpace(); /// Set one particular value. - void SetLineSpace(SvxLineSpacingItem& rLineSpace, int eSpace, long lValue = 0); + static void SetLineSpace(SvxLineSpacingItem& rLineSpace, int eSpace, long lValue = 0); /// For the buttons - set the values, and close the popup. void ExecuteLineSpacing(sal_uInt16 aEntry); diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx index c110d74502fd..b7f46b82b6a2 100644 --- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx +++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx @@ -61,7 +61,7 @@ public: const SfxPoolItem* pState, const bool bIsEnabled) SAL_OVERRIDE; - FieldUnit GetCurrentUnit( SfxItemState eState, const SfxPoolItem* pState ); + static FieldUnit GetCurrentUnit( SfxItemState eState, const SfxPoolItem* pState ); private: // UI controls diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx index 1d2af6c7c916..efa51e7a09c2 100644 --- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx +++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx @@ -148,7 +148,7 @@ private: DECL_LINK( RotationHdl, void * ); DECL_LINK( FlipHdl, ToolBox * ); - void SetupIcons(); + static void SetupIcons(); void Initialize(); void executePosX(); void executePosY(); @@ -163,7 +163,7 @@ private: virtual ~PosSizePropertyPanel(); void MetricState( SfxItemState eState, const SfxPoolItem* pState ); - FieldUnit GetCurrentUnit( SfxItemState eState, const SfxPoolItem* pState ); + static FieldUnit GetCurrentUnit( SfxItemState eState, const SfxPoolItem* pState ); void DisableControls(); void SetPosXYMinMax(); diff --git a/svx/source/svdraw/gradtrns.hxx b/svx/source/svdraw/gradtrns.hxx index d5b29116fa10..d8efa391b680 100644 --- a/svx/source/svdraw/gradtrns.hxx +++ b/svx/source/svdraw/gradtrns.hxx @@ -45,9 +45,9 @@ class GradTransformer public: GradTransformer() {} - void GradToVec(GradTransGradient& rG, GradTransVector& rV, + static void GradToVec(GradTransGradient& rG, GradTransVector& rV, const SdrObject* pObj); - void VecToGrad(GradTransVector& rV, GradTransGradient& rG, + static void VecToGrad(GradTransVector& rV, GradTransGradient& rG, GradTransGradient& rGOld, const SdrObject* pObj, bool bMoveSingle, bool bMoveFirst); }; diff --git a/svx/source/svdraw/svddrag.cxx b/svx/source/svdraw/svddrag.cxx index 3c0f109954b0..f6ed475da790 100644 --- a/svx/source/svdraw/svddrag.cxx +++ b/svx/source/svdraw/svddrag.cxx @@ -89,7 +89,7 @@ void SdrDragStat::PrevPoint() } } -Point SdrDragStat::KorregPos(const Point& rNow, const Point& /*rPrev*/) const +Point SdrDragStat::KorregPos(const Point& rNow, const Point& /*rPrev*/) { Point aRet(rNow); return aRet; diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index 738e8cbdae3b..a1ae7ca6f7b1 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -1808,7 +1808,7 @@ void SdrDragResize::TakeSdrDragComment(OUString& rStr) const if(!bEqual) rStr += "x="; - getSdrDragView().GetModel()->TakePercentStr(aXFact, aStr); + SdrModel::TakePercentStr(aXFact, aStr); rStr += aStr; } @@ -1818,7 +1818,7 @@ void SdrDragResize::TakeSdrDragComment(OUString& rStr) const rStr += " "; rStr += "y="; - getSdrDragView().GetModel()->TakePercentStr(aYFact, aStr); + SdrModel::TakePercentStr(aYFact, aStr); rStr += aStr; } @@ -2134,7 +2134,7 @@ void SdrDragRotate::TakeSdrDragComment(OUString& rStr) const } OUString aStr; - getSdrDragView().GetModel()->TakeAngleStr(nTmpAngle, aStr); + SdrModel::TakeAngleStr(nTmpAngle, aStr); rStr += aStr + ")"; if(getSdrDragView().IsDragWithCopy()) @@ -2270,7 +2270,7 @@ void SdrDragShear::TakeSdrDragComment(OUString& rStr) const nTmpAngle = NormAngle180(nTmpAngle); OUString aStr; - getSdrDragView().GetModel()->TakeAngleStr(nTmpAngle, aStr); + SdrModel::TakeAngleStr(nTmpAngle, aStr); rStr += aStr + ")"; if(getSdrDragView().IsDragWithCopy()) @@ -2856,7 +2856,7 @@ void SdrDragCrook::TakeSdrDragComment(OUString& rStr) const nVal = std::abs(nVal); OUString aStr; - getSdrDragView().GetModel()->TakeAngleStr(nVal, aStr); + SdrModel::TakeAngleStr(nVal, aStr); rStr += aStr + ")"; } @@ -3356,7 +3356,7 @@ void SdrDragCrook::applyCurrentTransformationToSdrObject(SdrObject& rTarget) const Rectangle aLocalMarkRect(getSdrDragView().GetMarkedObjRect()); const bool bLocalRotate(!bContortion && eMode == SDRCROOK_ROTATE && getSdrDragView().IsRotateAllowed(false)); - getSdrDragView().ImpCrookObj(&rTarget,aCenter,aRad,eMode,bVertical,!bContortion,bLocalRotate,aLocalMarkRect); + SdrEditView::ImpCrookObj(&rTarget,aCenter,aRad,eMode,bVertical,!bContortion,bLocalRotate,aLocalMarkRect); } } } @@ -3595,7 +3595,7 @@ void SdrDragDistort::applyCurrentTransformationToSdrObject(SdrObject& rTarget) if (bDoDistort) { - getSdrDragView().ImpDistortObj(&rTarget, aMarkRect, aDistortedRect, !bContortion); + SdrEditView::ImpDistortObj(&rTarget, aMarkRect, aDistortedRect, !bContortion); } } diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx index bb56746f45e9..e2fd8d2df57b 100644 --- a/svx/source/svdraw/svdedtv2.cxx +++ b/svx/source/svdraw/svdedtv2.cxx @@ -563,7 +563,7 @@ void SdrEditView::ImpCopyAttributes(const SdrObject* pSource, SdrObject* pDest) } } -bool SdrEditView::ImpCanConvertForCombine1(const SdrObject* pObj) const +bool SdrEditView::ImpCanConvertForCombine1(const SdrObject* pObj) { // new condition IsLine() to be able to combine simple Lines bool bIsLine(false); @@ -581,7 +581,7 @@ bool SdrEditView::ImpCanConvertForCombine1(const SdrObject* pObj) const return (aInfo.bCanConvToPath || aInfo.bCanConvToPoly || bIsLine); } -bool SdrEditView::ImpCanConvertForCombine(const SdrObject* pObj) const +bool SdrEditView::ImpCanConvertForCombine(const SdrObject* pObj) { SdrObjList* pOL = pObj->GetSubList(); @@ -611,7 +611,7 @@ bool SdrEditView::ImpCanConvertForCombine(const SdrObject* pObj) const return true; } -basegfx::B2DPolyPolygon SdrEditView::ImpGetPolyPolygon1(const SdrObject* pObj, bool bCombine) const +basegfx::B2DPolyPolygon SdrEditView::ImpGetPolyPolygon1(const SdrObject* pObj, bool bCombine) { basegfx::B2DPolyPolygon aRetval; const SdrPathObj* pPath = PTR_CAST(SdrPathObj, pObj); @@ -660,7 +660,7 @@ basegfx::B2DPolyPolygon SdrEditView::ImpGetPolyPolygon1(const SdrObject* pObj, b return aRetval; } -basegfx::B2DPolyPolygon SdrEditView::ImpGetPolyPolygon(const SdrObject* pObj, bool bCombine) const +basegfx::B2DPolyPolygon SdrEditView::ImpGetPolyPolygon(const SdrObject* pObj, bool bCombine) { SdrObjList* pOL = pObj->GetSubList(); @@ -683,7 +683,7 @@ basegfx::B2DPolyPolygon SdrEditView::ImpGetPolyPolygon(const SdrObject* pObj, bo } } -basegfx::B2DPolygon SdrEditView::ImpCombineToSinglePolygon(const basegfx::B2DPolyPolygon& rPolyPolygon) const +basegfx::B2DPolygon SdrEditView::ImpCombineToSinglePolygon(const basegfx::B2DPolyPolygon& rPolyPolygon) { const sal_uInt32 nPolyCount(rPolyPolygon.count()); @@ -1348,7 +1348,7 @@ void SdrEditView::CombineMarkedObjects(bool bNoPolyPoly) // Dismantle -bool SdrEditView::ImpCanDismantle(const basegfx::B2DPolyPolygon& rPpolyPolygon, bool bMakeLines) const +bool SdrEditView::ImpCanDismantle(const basegfx::B2DPolyPolygon& rPpolyPolygon, bool bMakeLines) { bool bCan(false); const sal_uInt32 nPolygonCount(rPpolyPolygon.count()); @@ -1373,7 +1373,7 @@ bool SdrEditView::ImpCanDismantle(const basegfx::B2DPolyPolygon& rPpolyPolygon, return bCan; } -bool SdrEditView::ImpCanDismantle(const SdrObject* pObj, bool bMakeLines) const +bool SdrEditView::ImpCanDismantle(const SdrObject* pObj, bool bMakeLines) { bool bOtherObjs(false); // true=objects other than PathObj's existent bool bMin1PolyPoly(false); // true=at least 1 tools::PolyPolygon with more than one Polygon existent diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 3a7c78965d2b..7923c7aac6d1 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -1923,7 +1923,7 @@ sal_uInt16 SdrObjEditView::GetSelectionLevel() const return nLevel; } -bool SdrObjEditView::SupportsFormatPaintbrush( sal_uInt32 nObjectInventor, sal_uInt16 nObjectIdentifier ) const +bool SdrObjEditView::SupportsFormatPaintbrush( sal_uInt32 nObjectInventor, sal_uInt16 nObjectIdentifier ) { if( nObjectInventor != SdrInventor && nObjectInventor != E3dInventor ) return false; diff --git a/svx/source/svdraw/svdfmtf.hxx b/svx/source/svdraw/svdfmtf.hxx index 3e317feed5ac..33435955f93e 100644 --- a/svx/source/svdraw/svdfmtf.hxx +++ b/svx/source/svdraw/svdfmtf.hxx @@ -131,12 +131,12 @@ protected: void DoAction(MetaMaskScaleAction& rAct); void DoAction(MetaMaskScalePartAction& rAct); void DoAction(MetaGradientAction& rAct); - void DoAction(MetaWallpaperAction& rAct); + static void DoAction(MetaWallpaperAction& rAct); void DoAction(MetaTransparentAction& rAct); - void DoAction(MetaEPSAction& rAct); + static void DoAction(MetaEPSAction& rAct); void DoAction(MetaRefPointAction& rAct) { rAct.Execute(&maVD); } void DoAction(MetaTextLineColorAction& rAct) { rAct.Execute(&maVD); mbFntDirty = true; } - void DoAction(MetaTextLineAction& rAct); + static void DoAction(MetaTextLineAction& rAct); void DoAction(MetaFloatTransparentAction& rAct); void DoAction(MetaGradientExAction& rAct); void DoAction(MetaLayoutModeAction& rAct) { rAct.Execute(&maVD); mbFntDirty = true; } diff --git a/svx/source/svdraw/svdglue.cxx b/svx/source/svdraw/svdglue.cxx index bc69407a219a..9018d6844e86 100644 --- a/svx/source/svdraw/svdglue.cxx +++ b/svx/source/svdraw/svdglue.cxx @@ -149,7 +149,7 @@ void SdrGluePoint::SetAlignAngle(long nAngle) else if (nAngle<33750) nAlign=SDRHORZALIGN_RIGHT |SDRVERTALIGN_BOTTOM; } -long SdrGluePoint::EscDirToAngle(sal_uInt16 nEsc) const +long SdrGluePoint::EscDirToAngle(sal_uInt16 nEsc) { switch (nEsc) { case SDRESC_RIGHT : return 0; @@ -160,7 +160,7 @@ long SdrGluePoint::EscDirToAngle(sal_uInt16 nEsc) const return 0; } -sal_uInt16 SdrGluePoint::EscAngleToDir(long nAngle) const +sal_uInt16 SdrGluePoint::EscAngleToDir(long nAngle) { nAngle=NormAngle360(nAngle); if (nAngle>=31500 || nAngle<4500) diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index d6248ff9cb45..348cf2d37bd9 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -639,7 +639,7 @@ void SdrHdl::CreateB2dIAObject() } } -BitmapMarkerKind SdrHdl::GetNextBigger(BitmapMarkerKind eKnd) const +BitmapMarkerKind SdrHdl::GetNextBigger(BitmapMarkerKind eKnd) { BitmapMarkerKind eRetval(eKnd); @@ -1262,7 +1262,7 @@ void SdrHdlGradient::FromIAOToItem(SdrObject* _pObj, bool bSetItemOnObject, bool aOldGradTransGradient.aGradient = static_cast<const XFillFloatTransparenceItem&>(rSet.Get(XATTR_FILLFLOATTRANSPARENCE)).GetGradientValue(); // transform vector data to gradient - aGradTransformer.VecToGrad(aGradTransVector, aGradTransGradient, aOldGradTransGradient, _pObj, bMoveSingleHandle, bMoveFirstHandle); + GradTransformer::VecToGrad(aGradTransVector, aGradTransGradient, aOldGradTransGradient, _pObj, bMoveSingleHandle, bMoveFirstHandle); if(bSetItemOnObject) { @@ -1293,7 +1293,7 @@ void SdrHdlGradient::FromIAOToItem(SdrObject* _pObj, bool bSetItemOnObject, bool } // back transformation, set values on pIAOHandle - aGradTransformer.GradToVec(aGradTransGradient, aGradTransVector, _pObj); + GradTransformer::GradToVec(aGradTransGradient, aGradTransVector, _pObj); SetPos(Point(FRound(aGradTransVector.maPositionA.getX()), FRound(aGradTransVector.maPositionA.getY()))); Set2ndPos(Point(FRound(aGradTransVector.maPositionB.getX()), FRound(aGradTransVector.maPositionB.getY()))); diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 0ae5ea568f38..eb0f00ee6582 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -1324,7 +1324,7 @@ void SdrModel::TakeMetricStr(long nVal, OUString& rStr, bool bNoUnitChars, sal_I rStr = aBuf.makeStringAndClear(); } -void SdrModel::TakeAngleStr(long nAngle, OUString& rStr, bool bNoDegChar) const +void SdrModel::TakeAngleStr(long nAngle, OUString& rStr, bool bNoDegChar) { bool bNeg = nAngle < 0; @@ -1355,7 +1355,7 @@ void SdrModel::TakeAngleStr(long nAngle, OUString& rStr, bool bNoDegChar) const rStr = aBuf.makeStringAndClear(); } -void SdrModel::TakePercentStr(const Fraction& rVal, OUString& rStr, bool bNoPercentChar) const +void SdrModel::TakePercentStr(const Fraction& rVal, OUString& rStr, bool bNoPercentChar) { sal_Int32 nMul(rVal.GetNumerator()); sal_Int32 nDiv(rVal.GetDenominator()); diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index 52194e44620a..93141e73ca8a 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -1003,7 +1003,7 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode) GradTransGradient aGradTransGradient; aGradTransGradient.aGradient = static_cast<const XFillFloatTransparenceItem&>(rSet.Get(XATTR_FILLFLOATTRANSPARENCE)).GetGradientValue(); - aGradTransformer.GradToVec(aGradTransGradient, aGradTransVector, pObj); + GradTransformer::GradToVec(aGradTransGradient, aGradTransVector, pObj); // build handles const Point aTmpPos1(basegfx::fround(aGradTransVector.maPositionA.getX()), basegfx::fround(aGradTransVector.maPositionA.getY())); @@ -1045,7 +1045,7 @@ void SdrMarkView::AddDragModeHdl(SdrDragMode eMode) Size aHdlSize(15, 15); aGradTransGradient.aGradient = static_cast<const XFillGradientItem&>(rSet.Get(XATTR_FILLGRADIENT)).GetGradientValue(); - aGradTransformer.GradToVec(aGradTransGradient, aGradTransVector, pObj); + GradTransformer::GradToVec(aGradTransGradient, aGradTransVector, pObj); // build handles const Point aTmpPos1(basegfx::fround(aGradTransVector.maPositionA.getX()), basegfx::fround(aGradTransVector.maPositionA.getY())); diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 3ea38340eaf4..e829dffac9d0 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -412,7 +412,7 @@ void SdrObject::Free( SdrObject*& _rpObject ) delete pObject; } -SdrObjPlusData* SdrObject::NewPlusData() const +SdrObjPlusData* SdrObject::NewPlusData() { return new SdrObjPlusData; } @@ -686,7 +686,7 @@ void SdrObject::SetName(const OUString& rStr) { bUndo = true; SdrUndoAction* pUndoAction = - GetModel()->GetSdrUndoFactory().CreateUndoObjectStrAttr( + SdrUndoFactory::CreateUndoObjectStrAttr( *this, SdrUndoObjStrAttr::OBJ_NAME, GetName(), @@ -730,7 +730,7 @@ void SdrObject::SetTitle(const OUString& rStr) { bUndo = true; SdrUndoAction* pUndoAction = - GetModel()->GetSdrUndoFactory().CreateUndoObjectStrAttr( + SdrUndoFactory::CreateUndoObjectStrAttr( *this, SdrUndoObjStrAttr::OBJ_TITLE, GetTitle(), @@ -774,7 +774,7 @@ void SdrObject::SetDescription(const OUString& rStr) { bUndo = true; SdrUndoAction* pUndoAction = - GetModel()->GetSdrUndoFactory().CreateUndoObjectStrAttr( + SdrUndoFactory::CreateUndoObjectStrAttr( *this, SdrUndoObjStrAttr::OBJ_DESCRIPTION, GetDescription(), @@ -1085,7 +1085,7 @@ OUString SdrObject::GetAngleStr(long nAngle, bool bNoDegChar) const { OUString aStr; if (pModel!=NULL) { - pModel->TakeAngleStr(nAngle,aStr,bNoDegChar); + SdrModel::TakeAngleStr(nAngle,aStr,bNoDegChar); } return aStr; } @@ -2407,7 +2407,7 @@ void extractLineContourFromPrimitive2DSequence( -SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, bool bForceLineDash) const +SdrObject* SdrObject::ImpConvertToContourObj(SdrObject* pRet, bool bForceLineDash) { bool bNoChange(true); diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx index 6d2e56408bb5..8bfc8e16d4cd 100644 --- a/svx/source/svdraw/svdoedge.cxx +++ b/svx/source/svdraw/svdoedge.cxx @@ -599,7 +599,7 @@ void SdrEdgeObj::ImpRecalcEdgeTrack() } } -sal_uInt16 SdrEdgeObj::ImpCalcEscAngle(SdrObject* pObj, const Point& rPt) const +sal_uInt16 SdrEdgeObj::ImpCalcEscAngle(SdrObject* pObj, const Point& rPt) { if (pObj==NULL) return SDRESC_ALL; Rectangle aR(pObj->GetSnapRect()); @@ -637,7 +637,7 @@ sal_uInt16 SdrEdgeObj::ImpCalcEscAngle(SdrObject* pObj, const Point& rPt) const } } -XPolygon SdrEdgeObj::ImpCalcObjToCenter(const Point& rStPt, long nEscAngle, const Rectangle& rRect, const Point& rMeeting) const +XPolygon SdrEdgeObj::ImpCalcObjToCenter(const Point& rStPt, long nEscAngle, const Rectangle& rRect, const Point& rMeeting) { XPolygon aXP; aXP.Insert(XPOLY_APPEND,rStPt,XPOLY_NORMAL); diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx index 531f2b4e9de8..be529e4fa46e 100644 --- a/svx/source/svdraw/svdomeas.cxx +++ b/svx/source/svdraw/svdomeas.cxx @@ -544,7 +544,7 @@ void SdrMeasureObj::ImpCalcGeometrics(const ImpMeasureRec& rRec, ImpMeasurePoly& } } -basegfx::B2DPolyPolygon SdrMeasureObj::ImpCalcXPoly(const ImpMeasurePoly& rPol) const +basegfx::B2DPolyPolygon SdrMeasureObj::ImpCalcXPoly(const ImpMeasurePoly& rPol) { basegfx::B2DPolyPolygon aRetval; basegfx::B2DPolygon aPartPolyA; diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index 378df6d6f73d..262223694d50 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -269,11 +269,11 @@ public: XPolygon GetFormPoly() const; bool CalcBezier(const Point& rP1, const Point& rP2, const Point& rDir, bool bMouseDown); XPolygon GetBezierPoly() const; - XPolygon GetCurvePoly() const { return XPolygon(); } + static XPolygon GetCurvePoly() { return XPolygon(); } bool CalcCircle(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView); XPolygon GetCirclePoly() const; bool CalcLine(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView); - Point CalcLine(const Point& rCsr, long nDirX, long nDirY, SdrView* pView) const; + static Point CalcLine(const Point& rCsr, long nDirX, long nDirY, SdrView* pView); XPolygon GetLinePoly() const; bool CalcRect(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView); XPolygon GetRectPoly() const; @@ -387,7 +387,7 @@ XPolygon ImpPathCreateUser::GetCirclePoly() const } } -Point ImpPathCreateUser::CalcLine(const Point& aCsr, long nDirX, long nDirY, SdrView* pView) const +Point ImpPathCreateUser::CalcLine(const Point& aCsr, long nDirX, long nDirY, SdrView* pView) { long x=aCsr.X(),x1=x,x2=x; long y=aCsr.Y(),y1=y,y2=y; @@ -529,14 +529,14 @@ public: Pointer GetCreatePointer() const; // helping stuff - bool IsClosed(SdrObjKind eKind) const { return eKind==OBJ_POLY || eKind==OBJ_PATHPOLY || eKind==OBJ_PATHFILL || eKind==OBJ_FREEFILL || eKind==OBJ_SPLNFILL; } - bool IsFreeHand(SdrObjKind eKind) const { return eKind==OBJ_FREELINE || eKind==OBJ_FREEFILL; } - bool IsBezier(SdrObjKind eKind) const { return eKind==OBJ_PATHLINE || eKind==OBJ_PATHFILL; } + static bool IsClosed(SdrObjKind eKind) { return eKind==OBJ_POLY || eKind==OBJ_PATHPOLY || eKind==OBJ_PATHFILL || eKind==OBJ_FREEFILL || eKind==OBJ_SPLNFILL; } + static bool IsFreeHand(SdrObjKind eKind) { return eKind==OBJ_FREELINE || eKind==OBJ_FREEFILL; } + static bool IsBezier(SdrObjKind eKind) { return eKind==OBJ_PATHLINE || eKind==OBJ_PATHFILL; } bool IsCreating() const { return mbCreating; } // get the polygon basegfx::B2DPolyPolygon TakeObjectPolyPolygon(const SdrDragStat& rDrag) const; - basegfx::B2DPolyPolygon TakeDragPolyPolygon(const SdrDragStat& rDrag) const; + static basegfx::B2DPolyPolygon TakeDragPolyPolygon(const SdrDragStat& rDrag); basegfx::B2DPolyPolygon getModifiedPolyPolygon() const { return aPathPolygon.getB2DPolyPolygon(); } }; @@ -957,7 +957,7 @@ OUString ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag if(pU->bCircle) { - mrSdrPathObject.GetModel()->TakeAngleStr(std::abs(pU->nCircRelAngle), aMetr); + SdrModel::TakeAngleStr(std::abs(pU->nCircRelAngle), aMetr); aStr += aMetr; aStr += " r="; mrSdrPathObject.GetModel()->TakeMetricStr(pU->nCircRadius, aMetr, true); @@ -981,7 +981,7 @@ OUString ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag sal_Int32 nAngle(GetAngle(aNow)); aStr += " "; - mrSdrPathObject.GetModel()->TakeAngleStr(nAngle, aMetr); + SdrModel::TakeAngleStr(nAngle, aMetr); aStr += aMetr; } @@ -1074,7 +1074,7 @@ OUString ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag sal_Int32 nAngle(GetAngle(aNow)); aStr += " "; - mrSdrPathObject.GetModel()->TakeAngleStr(nAngle, aMetr); + SdrModel::TakeAngleStr(nAngle, aMetr); aStr += aMetr; } else if(nPointCount > 1) @@ -1120,7 +1120,7 @@ OUString ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag sal_Int32 nAngle(GetAngle(aPt)); aStr += " "; - mrSdrPathObject.GetModel()->TakeAngleStr(nAngle, aMetr); + SdrModel::TakeAngleStr(nAngle, aMetr); aStr += aMetr; } @@ -1141,7 +1141,7 @@ OUString ImpPathForDragAndCreate::getSpecialDragComment(const SdrDragStat& rDrag sal_Int32 nAngle(GetAngle(aPt)); aStr += " "; - mrSdrPathObject.GetModel()->TakeAngleStr(nAngle, aMetr); + SdrModel::TakeAngleStr(nAngle, aMetr); aStr += aMetr; } } @@ -1605,7 +1605,7 @@ basegfx::B2DPolyPolygon ImpPathForDragAndCreate::TakeObjectPolyPolygon(const Sdr return aRetval; } -basegfx::B2DPolyPolygon ImpPathForDragAndCreate::TakeDragPolyPolygon(const SdrDragStat& rDrag) const +basegfx::B2DPolyPolygon ImpPathForDragAndCreate::TakeDragPolyPolygon(const SdrDragStat& rDrag) { basegfx::B2DPolyPolygon aRetval; SdrView* pView = rDrag.GetView(); @@ -2308,7 +2308,7 @@ basegfx::B2DPolyPolygon SdrPathObj::TakeCreatePoly(const SdrDragStat& rDrag) con if(mpDAC) { aRetval = mpDAC->TakeObjectPolyPolygon(rDrag); - aRetval.append(mpDAC->TakeDragPolyPolygon(rDrag)); + aRetval.append(ImpPathForDragAndCreate::TakeDragPolyPolygon(rDrag)); } return aRetval; @@ -2333,7 +2333,7 @@ basegfx::B2DPolyPolygon SdrPathObj::getDragPolyPolygon(const SdrDragStat& rDrag) if(mpDAC) { - aRetval = mpDAC->TakeDragPolyPolygon(rDrag); + aRetval = ImpPathForDragAndCreate::TakeDragPolyPolygon(rDrag); } return aRetval; diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index 116efe2a54be..5eb6fe4bb1ab 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -412,7 +412,7 @@ SdrTextVertAdjust SdrTextObj::GetTextVerticalAdjust(const SfxItemSet& rSet) cons return eRet; } // defaults: TOP for text frame, CENTER for captions of drawing objects -void SdrTextObj::ImpJustifyRect(Rectangle& rRect) const +void SdrTextObj::ImpJustifyRect(Rectangle& rRect) { if (!rRect.IsEmpty()) { rRect.Justify(); @@ -878,7 +878,7 @@ OutlinerParaObject* SdrTextObj::GetEditOutlinerParaObject() const return pPara; } -void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextSize, const Size& rShapeSize, Fraction& rFitXKorreg) const +void SdrTextObj::ImpSetCharStretching(SdrOutliner& rOutliner, const Size& rTextSize, const Size& rShapeSize, Fraction& rFitXKorreg) { OutputDevice* pOut = rOutliner.GetRefDevice(); bool bNoStretching(false); diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx index 8041b3dd4add..84ef3242fd46 100644 --- a/svx/source/svdraw/svdotextdecomposition.cxx +++ b/svx/source/svdraw/svdotextdecomposition.cxx @@ -97,9 +97,9 @@ namespace DECL_LINK(decomposeBlockBulletPrimitive, DrawBulletInfo* ); DECL_LINK(decomposeStretchBulletPrimitive, DrawBulletInfo* ); - bool impIsUnderlineAbove(const vcl::Font& rFont) const; + static bool impIsUnderlineAbove(const vcl::Font& rFont); void impCreateTextPortionPrimitive(const DrawPortionInfo& rInfo); - drawinglayer::primitive2d::BasePrimitive2D* impCheckFieldPrimitive(drawinglayer::primitive2d::BasePrimitive2D* pPrimitive, const DrawPortionInfo& rInfo) const; + static drawinglayer::primitive2d::BasePrimitive2D* impCheckFieldPrimitive(drawinglayer::primitive2d::BasePrimitive2D* pPrimitive, const DrawPortionInfo& rInfo); void impFlushTextPortionPrimitivesToLinePrimitives(); void impFlushLinePrimitivesToParagraphPrimitives(); void impHandleDrawPortionInfo(const DrawPortionInfo& rInfo); @@ -159,7 +159,7 @@ namespace drawinglayer::primitive2d::Primitive2DSequence getPrimitive2DSequence(); }; - bool impTextBreakupHandler::impIsUnderlineAbove(const vcl::Font& rFont) const + bool impTextBreakupHandler::impIsUnderlineAbove(const vcl::Font& rFont) { if(!rFont.IsVertical()) { @@ -452,7 +452,7 @@ namespace } } - drawinglayer::primitive2d::BasePrimitive2D* impTextBreakupHandler::impCheckFieldPrimitive(drawinglayer::primitive2d::BasePrimitive2D* pPrimitive, const DrawPortionInfo& rInfo) const + drawinglayer::primitive2d::BasePrimitive2D* impTextBreakupHandler::impCheckFieldPrimitive(drawinglayer::primitive2d::BasePrimitive2D* pPrimitive, const DrawPortionInfo& rInfo) { if(rInfo.mpFieldData) { diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx index 61b5f8acf1e9..86d7c7defeed 100644 --- a/svx/source/svdraw/svdotextpathdecomposition.cxx +++ b/svx/source/svdraw/svdotextpathdecomposition.cxx @@ -214,7 +214,7 @@ namespace std::vector< drawinglayer::primitive2d::BasePrimitive2D* >& mrShadowDecomposition; // destination primitive list for shadow Reference < com::sun::star::i18n::XBreakIterator > mxBreak; // break iterator - double getParagraphTextLength(const ::std::vector< const impPathTextPortion* >& rTextPortions) + static double getParagraphTextLength(const ::std::vector< const impPathTextPortion* >& rTextPortions) { drawinglayer::primitive2d::TextLayouterDevice aTextLayouter; double fRetval(0.0); diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index ede8b069f5b3..6c35b7128752 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -320,7 +320,7 @@ void SdrObjList::SetRectsDirty() if (pUpList!=NULL) pUpList->SetRectsDirty(); } -void SdrObjList::impChildInserted(SdrObject& rChild) const +void SdrObjList::impChildInserted(SdrObject& rChild) { sdr::contact::ViewContact* pParent = rChild.GetViewContact().GetParentContact(); diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index 12bf4203b9d4..1d764a8a169b 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -1456,7 +1456,7 @@ void SdrUndoPage::ImpMovePage(sal_uInt16 nOldNum, sal_uInt16 nNewNum) } } -void SdrUndoPage::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, sal_uInt16 /*n*/, bool /*bRepeat*/) const +void SdrUndoPage::ImpTakeDescriptionStr(sal_uInt16 nStrCacheID, OUString& rStr, sal_uInt16 /*n*/, bool /*bRepeat*/) { rStr = ImpGetResStr(nStrCacheID); } diff --git a/svx/source/table/accessiblecell.hxx b/svx/source/table/accessiblecell.hxx index f004442639bf..dca0e54d79cc 100644 --- a/svx/source/table/accessiblecell.hxx +++ b/svx/source/table/accessiblecell.hxx @@ -74,7 +74,7 @@ public: virtual OUString SAL_CALL getAccessibleName() throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; sdr::table::CellRef getCellRef() { return mxCell;} void UpdateChildren(); - OUString getCellName( sal_Int32 nCol, sal_Int32 nRow ); + static OUString getCellName( sal_Int32 nCol, sal_Int32 nRow ); // XAccessibleComponent virtual sal_Bool SAL_CALL containsPoint( const ::com::sun::star::awt::Point& aPoint) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index f2b4692a327a..7270573c2529 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -814,7 +814,7 @@ bool SdrTableObj::isValid( const CellPos& rPos ) const -CellPos SdrTableObj::getFirstCell() const +CellPos SdrTableObj::getFirstCell() { return CellPos( 0,0 ); } diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index 9a2dd80e9fb8..3a717a46522e 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -399,7 +399,7 @@ void SvxTableController::onSelectionHasChanged() /* fdo#46186 Selecting the table means selecting the entire cells */ if (!hasSelectedCells() && pTableObj) { - maCursorFirstPos = pTableObj->getFirstCell(); + maCursorFirstPos = SdrTableObj::getFirstCell(); maCursorLastPos = pTableObj->getLastCell(); mbCellSelectionMode=true; } @@ -1460,7 +1460,7 @@ sal_uInt16 SvxTableController::getKeyboardAction( const KeyEvent& rKEvt, vcl::Wi if( !bMod1 && !bMod2 && !bTextEdit ) { // when not already editing, return starts text edit - setSelectionStart( pTableObj->getFirstCell() ); + setSelectionStart( SdrTableObj::getFirstCell() ); nAction = ACTION_EDIT_CELL; } break; @@ -1483,7 +1483,7 @@ sal_uInt16 SvxTableController::getKeyboardAction( const KeyEvent& rKEvt, vcl::Wi else { // f2 with no selection and no text edit starts text edit - setSelectionStart( pTableObj->getFirstCell() ); + setSelectionStart( SdrTableObj::getFirstCell() ); nAction = ACTION_EDIT_CELL; } break; @@ -1621,7 +1621,7 @@ bool SvxTableController::executeAction( sal_uInt16 nAction, bool bSelect, vcl::W { case ACTION_GOTO_FIRST_CELL: { - gotoCell( pTableObj->getFirstCell(), bSelect, pWindow, nAction ); + gotoCell( SdrTableObj::getFirstCell(), bSelect, pWindow, nAction ); break; } @@ -1645,7 +1645,7 @@ bool SvxTableController::executeAction( sal_uInt16 nAction, bool bSelect, vcl::W case ACTION_GOTO_FIRST_COLUMN: { - CellPos aPos( pTableObj->getFirstCell().mnCol, getSelectionEnd().mnRow ); + CellPos aPos( SdrTableObj::getFirstCell().mnCol, getSelectionEnd().mnRow ); gotoCell( aPos, bSelect, pWindow, nAction ); break; } @@ -1659,7 +1659,7 @@ bool SvxTableController::executeAction( sal_uInt16 nAction, bool bSelect, vcl::W case ACTION_GOTO_FIRST_ROW: { - CellPos aPos( getSelectionEnd().mnCol, pTableObj->getFirstCell().mnRow ); + CellPos aPos( getSelectionEnd().mnCol, SdrTableObj::getFirstCell().mnRow ); gotoCell( aPos, bSelect, pWindow, nAction ); break; } @@ -2765,7 +2765,7 @@ bool SvxTableController::ApplyFormatPaintBrush( SfxItemSet& rFormatSet, bool bNo xCell->SetMergedItemSetAndBroadcast(aAttr, bReplaceAll); SdrText* pText = static_cast< SdrText* >( xCell.get() ); - mpView->ApplyFormatPaintBrushToText( rFormatSet, *pTableObj, pText, bNoCharacterFormats, bNoParagraphFormats ); + SdrObjEditView::ApplyFormatPaintBrushToText( rFormatSet, *pTableObj, pText, bNoCharacterFormats, bNoParagraphFormats ); } } } diff --git a/svx/source/table/tablelayouter.hxx b/svx/source/table/tablelayouter.hxx index f60fc3ef62cb..642128bbf2e9 100644 --- a/svx/source/table/tablelayouter.hxx +++ b/svx/source/table/tablelayouter.hxx @@ -111,7 +111,7 @@ private: inline bool isValid( const CellPos& rPos ) const { return isValidColumn( rPos.mnCol ) && isValidRow( rPos.mnRow ); } void ClearBorderLayout(); - void ClearBorderLayout(BorderLineMap& rMap); + static void ClearBorderLayout(BorderLineMap& rMap); void ResizeBorderLayout(); void ResizeBorderLayout( BorderLineMap& rMap ); @@ -130,7 +130,7 @@ private: }; typedef std::vector< Layout > LayoutVector; - sal_Int32 distribute( LayoutVector& rLayouts, sal_Int32 nDistribute ); + static sal_Int32 distribute( LayoutVector& rLayouts, sal_Int32 nDistribute ); TableModelRef mxTable; LayoutVector maRows; diff --git a/svx/source/tbxctrls/SvxColorValueSet.cxx b/svx/source/tbxctrls/SvxColorValueSet.cxx index e1bc89c12385..baecf497ec28 100644 --- a/svx/source/tbxctrls/SvxColorValueSet.cxx +++ b/svx/source/tbxctrls/SvxColorValueSet.cxx @@ -40,21 +40,21 @@ extern "C" SAL_DLLPUBLIC_EXPORT vcl::Window* SAL_CALL makeSvxColorValueSet(vcl:: return new SvxColorValueSet(pParent, nWinBits); } -sal_uInt32 SvxColorValueSet::getMaxRowCount() const +sal_uInt32 SvxColorValueSet::getMaxRowCount() { const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); return rStyleSettings.GetColorValueSetMaximumRowCount(); } -sal_uInt32 SvxColorValueSet::getEntryEdgeLength() const +sal_uInt32 SvxColorValueSet::getEntryEdgeLength() { const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); return rStyleSettings.GetListBoxPreviewDefaultPixelSize().Height() + 1; } -sal_uInt32 SvxColorValueSet::getColumnCount() const +sal_uInt32 SvxColorValueSet::getColumnCount() { const StyleSettings& rStyleSettings = Application::GetSettings().GetStyleSettings(); diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index 8aaf2c187823..8febde00992b 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -230,10 +230,10 @@ SvxColorDockingWindow::SvxColorDockingWindow } } - aItemSize = aColorSet.CalcItemSizePixel(Size(aColorSet.getEntryEdgeLength(), aColorSet.getEntryEdgeLength())); - aItemSize.Width() = aItemSize.Width() + aColorSet.getEntryEdgeLength(); + aItemSize = aColorSet.CalcItemSizePixel(Size(SvxColorValueSet::getEntryEdgeLength(), SvxColorValueSet::getEntryEdgeLength())); + aItemSize.Width() = aItemSize.Width() + SvxColorValueSet::getEntryEdgeLength(); aItemSize.Width() /= 2; - aItemSize.Height() = aItemSize.Height() + aColorSet.getEntryEdgeLength(); + aItemSize.Height() = aItemSize.Height() + SvxColorValueSet::getEntryEdgeLength(); aItemSize.Height() /= 2; SetSize(); @@ -267,7 +267,7 @@ void SvxColorDockingWindow::FillValueSet() aColorSet.Clear(); // create the first entry for 'invisible/none' - const Size aColorSize(aColorSet.getEntryEdgeLength(), aColorSet.getEntryEdgeLength()); + const Size aColorSize(SvxColorValueSet::getEntryEdgeLength(), SvxColorValueSet::getEntryEdgeLength()); long nPtX = aColorSize.Width() - 1; long nPtY = aColorSize.Height() - 1; VirtualDevice aVD; diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index e42c3ce13f79..b6aa20047168 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -318,7 +318,7 @@ private: virtual void Select() SAL_OVERRIDE; virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; virtual bool Notify( NotifyEvent& rNEvt ) SAL_OVERRIDE; - void ImplReleaseFocus(); + static void ImplReleaseFocus(); public: diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index b2b6c7a7774b..91c5be0dfd1d 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -159,7 +159,7 @@ private: PopupMenu m_aMenu; void ReleaseFocus(); - Color TestColorsVisible(const Color &FontCol, const Color &BackCol); + static Color TestColorsVisible(const Color &FontCol, const Color &BackCol); void UserDrawEntry(const UserDrawEvent& rUDEvt, const OUString &rStyleName); void SetupEntry(sal_uInt16 nItem, const Rectangle& rRect, OutputDevice *pDevice, const OUString &rStyleName, bool bIsNotSelected); bool AdjustFontForItemHeight(OutputDevice* pDevice, Rectangle& rTextRect, long nHeight); diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx index d9b6fb731366..97e93817f94b 100644 --- a/svx/source/unodraw/unopage.cxx +++ b/svx/source/unodraw/unopage.cxx @@ -559,7 +559,7 @@ SdrObject *SvxDrawPage::_CreateSdrObject(const Reference< drawing::XShape > & xS return pNewObj; } -void SvxDrawPage::GetTypeAndInventor( sal_uInt16& rType, sal_uInt32& rInventor, const OUString& aName ) const throw() +void SvxDrawPage::GetTypeAndInventor( sal_uInt16& rType, sal_uInt32& rInventor, const OUString& aName ) throw() { sal_uInt32 nTempType = UHashMap::getId( aName ); diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx index adda2244cf57..e6cf941a8487 100644 --- a/svx/source/unogallery/unogalitem.cxx +++ b/svx/source/unogallery/unogalitem.cxx @@ -333,7 +333,7 @@ void GalleryItem::_getPropertyValues( const comphelper::PropertyMapEntry** ppEnt if( pObj ) { *pValue <<= OUString( pObj->GetTitle() ); - pGalTheme->ReleaseObject( pObj ); + ::GalleryTheme::ReleaseObject( pObj ); } } } @@ -357,7 +357,7 @@ void GalleryItem::_getPropertyValues( const comphelper::PropertyMapEntry** ppEnt aThumbnail = pObj->GetThumbMtf(); *pValue <<= aThumbnail.GetXGraphic(); - pGalTheme->ReleaseObject( pObj ); + ::GalleryTheme::ReleaseObject( pObj ); } } } diff --git a/svx/source/unogallery/unogalitem.hxx b/svx/source/unogallery/unogalitem.hxx index a0e0b1e3a95c..9b57dafd3bdd 100644 --- a/svx/source/unogallery/unogalitem.hxx +++ b/svx/source/unogallery/unogalitem.hxx @@ -85,7 +85,7 @@ protected: protected: - ::comphelper::PropertySetInfo* createPropertySetInfo(); + static ::comphelper::PropertySetInfo* createPropertySetInfo(); private: diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx index 129490a8b82a..6d4ec14fec5c 100644 --- a/svx/source/xoutdev/xtabdash.cxx +++ b/svx/source/xoutdev/xtabdash.cxx @@ -193,7 +193,7 @@ Bitmap XDashList::GetBitmapForUISolidLine() const { if(maBitmapSolidLine.IsEmpty()) { - const_cast< XDashList* >(this)->maBitmapSolidLine = const_cast< XDashList* >(this)->ImpCreateBitmapForXDash(0); + const_cast< XDashList* >(this)->maBitmapSolidLine = XDashList::ImpCreateBitmapForXDash(0); } return maBitmapSolidLine; diff --git a/sw/source/uibase/shells/txtcrsr.cxx b/sw/source/uibase/shells/txtcrsr.cxx index fa98cf0f1ec4..2b28820e2b91 100644 --- a/sw/source/uibase/shells/txtcrsr.cxx +++ b/sw/source/uibase/shells/txtcrsr.cxx @@ -327,7 +327,7 @@ void SwTextShell::ExecMoveMisc(SfxRequest &rReq) if ( !pFormShell || !pDrawView || !pWindow ) break; - std::unique_ptr< ::svx::ISdrObjectFilter > pFilter( pFormShell->CreateFocusableControlFilter( + std::unique_ptr< ::svx::ISdrObjectFilter > pFilter( FmFormShell::CreateFocusableControlFilter( *pDrawView, *pWindow ) ); if ( !pFilter.get() ) break; diff --git a/sw/source/uibase/uno/unotxvw.cxx b/sw/source/uibase/uno/unotxvw.cxx index dbedf77c4153..8e817a0ab495 100644 --- a/sw/source/uibase/uno/unotxvw.cxx +++ b/sw/source/uibase/uno/unotxvw.cxx @@ -474,7 +474,7 @@ uno::Reference< form::runtime::XFormController > SAL_CALL SwXTextView::getFormCo uno::Reference< form::runtime::XFormController > xController; if ( pFormShell && pDrawView && pWindow ) - xController = pFormShell->GetFormController( _Form, *pDrawView, *pWindow ); + xController = FmFormShell::GetFormController( _Form, *pDrawView, *pWindow ); return xController; } |