diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-19 15:06:27 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-20 06:33:23 +0000 |
commit | c2b48a763df113e63e6a27ee05b9a6834e4e49a4 (patch) | |
tree | 9a0c2468b6fd36c6ac8104c88c82ebd8ddd82143 /include | |
parent | 58072c5a7f409cd500ecdc4e81a8f536aa3dda59 (diff) |
loplugin:expandablemethodds in svx
Change-Id: I45447b6f5cf7e17d6e81e8c931b07b26d41b9a8c
Reviewed-on: https://gerrit.libreoffice.org/30057
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
-rw-r--r-- | include/svx/ctredlin.hxx | 1 | ||||
-rw-r--r-- | include/svx/dlgctrl.hxx | 1 | ||||
-rw-r--r-- | include/svx/galtheme.hxx | 2 | ||||
-rw-r--r-- | include/svx/imapdlg.hxx | 3 | ||||
-rw-r--r-- | include/svx/sdasitm.hxx | 2 | ||||
-rw-r--r-- | include/svx/sdr/attribute/sdrallfillattributeshelper.hxx | 2 | ||||
-rw-r--r-- | include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx | 3 | ||||
-rw-r--r-- | include/svx/sdr/overlay/overlayselection.hxx | 1 | ||||
-rw-r--r-- | include/svx/svddrgmt.hxx | 1 | ||||
-rw-r--r-- | include/svx/svdedtv.hxx | 1 | ||||
-rw-r--r-- | include/svx/svdhdl.hxx | 2 | ||||
-rw-r--r-- | include/svx/svdmrkv.hxx | 2 | ||||
-rw-r--r-- | include/svx/svdobj.hxx | 5 | ||||
-rw-r--r-- | include/svx/svdocapt.hxx | 1 | ||||
-rw-r--r-- | include/svx/svdoedge.hxx | 2 | ||||
-rw-r--r-- | include/svx/svdograf.hxx | 2 | ||||
-rw-r--r-- | include/svx/svdotext.hxx | 4 | ||||
-rw-r--r-- | include/svx/svdpagv.hxx | 2 | ||||
-rw-r--r-- | include/svx/svdpntv.hxx | 7 | ||||
-rw-r--r-- | include/svx/svdpoev.hxx | 1 | ||||
-rw-r--r-- | include/svx/unoshape.hxx | 2 | ||||
-rw-r--r-- | include/svx/xit.hxx | 1 |
22 files changed, 2 insertions, 46 deletions
diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx index de280f393da2..59546404d38b 100644 --- a/include/svx/ctredlin.hxx +++ b/include/svx/ctredlin.hxx @@ -348,7 +348,6 @@ public: virtual void dispose() override; void ShowFilterPage(); - void ShowViewPage(); SvxTPFilter* GetFilterPage() { return pTPFilter;} SvxTPView* GetViewPage() { return pTPView;} diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx index ae7ecfba0c96..2bcdfc1ac8d9 100644 --- a/include/svx/dlgctrl.hxx +++ b/include/svx/dlgctrl.hxx @@ -178,7 +178,6 @@ public: void SetPixelColor( const Color& rCol ) { aPixelColor = rCol; } void SetBackgroundColor( const Color& rCol ) { aBackgroundColor = rCol; } - void SetLineColor( const Color& rCol ) { aLineColor = rCol; } sal_uInt16 GetLineCount() const { return nLines; } diff --git a/include/svx/galtheme.hxx b/include/svx/galtheme.hxx index d1abb8be0cfd..f93fd1b40df5 100644 --- a/include/svx/galtheme.hxx +++ b/include/svx/galtheme.hxx @@ -129,7 +129,6 @@ public: SAL_DLLPRIVATE bool ChangeObjectPos( size_t nOldPos, size_t nNewPos ); const OUString& GetName() const; - SAL_DLLPRIVATE const OUString& GetRealName() const; // used for building gallery themes during compilation: SAL_DLLPRIVATE void SetDestDir(const OUString& rDestDir, bool bRelative) @@ -159,7 +158,6 @@ public: bool IsReadOnly() const; bool IsDefault() const; - SAL_DLLPRIVATE bool IsModified() const; void Actualize( const Link<const INetURLObject&, void>& rActualizeLink, GalleryProgress* pProgress = nullptr ); SAL_DLLPRIVATE void AbortActualize() { bAbortActualize = true; } diff --git a/include/svx/imapdlg.hxx b/include/svx/imapdlg.hxx index 1bc70862ccc6..dccdfd6abb2a 100644 --- a/include/svx/imapdlg.hxx +++ b/include/svx/imapdlg.hxx @@ -142,9 +142,6 @@ public: void SetExecState( bool bEnable ); - void SetGraphic( const Graphic& rGraphic ); - - void SetEditingObject( void* pObj ) { pCheckObj = pObj; } const void* GetEditingObject() const { return pCheckObj; } void SetImageMap( const ImageMap& rImageMap ); diff --git a/include/svx/sdasitm.hxx b/include/svx/sdasitm.hxx index 31423f26728f..43a5f36c59b6 100644 --- a/include/svx/sdasitm.hxx +++ b/include/svx/sdasitm.hxx @@ -71,8 +71,6 @@ private: virtual bool QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const override; virtual bool PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId ) override; - const css::uno::Sequence< css::beans::PropertyValue >& GetGeometry() const { return aPropSeq;} - css::uno::Any* GetPropertyValueByName( const OUString& rPropName ); const css::uno::Any* GetPropertyValueByName( const OUString& rPropName ) const; css::uno::Any* GetPropertyValueByName( const OUString& rPropName, const OUString& rPropName2 ); diff --git a/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx b/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx index 83505fe09619..90f97035a92f 100644 --- a/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx +++ b/include/svx/sdr/attribute/sdrallfillattributeshelper.hxx @@ -46,7 +46,6 @@ namespace drawinglayer const basegfx::B2DRange& rPaintRange, const basegfx::B2DRange& rDefineRange); - protected: public: SdrAllFillAttributesHelper(const Color& rColor); SdrAllFillAttributesHelper(const SfxItemSet& rSet); @@ -54,7 +53,6 @@ namespace drawinglayer bool isUsed() const; bool hasSdrFillAttribute() const { return maFillAttribute.get(); } - bool hasFillGradientAttribute() const { return maFillGradientAttribute.get(); } bool isTransparent() const; const drawinglayer::attribute::SdrFillAttribute& getFillAttribute() const; diff --git a/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx b/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx index 2c0207b74c0a..8963c6cca123 100644 --- a/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx +++ b/include/svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx @@ -42,9 +42,6 @@ namespace sdr explicit OverlayPrimitive2DSequenceObject(const drawinglayer::primitive2d::Primitive2DContainer& rSequence); virtual ~OverlayPrimitive2DSequenceObject() override; - - // data read access - const drawinglayer::primitive2d::Primitive2DContainer& getSequence() const { return maSequence; } }; } // end of namespace overlay } // end of namespace sdr diff --git a/include/svx/sdr/overlay/overlayselection.hxx b/include/svx/sdr/overlay/overlayselection.hxx index fe1c11e4d3f4..f92874301fc1 100644 --- a/include/svx/sdr/overlay/overlayselection.hxx +++ b/include/svx/sdr/overlay/overlayselection.hxx @@ -66,7 +66,6 @@ namespace sdr // data read access const std::vector< basegfx::B2DRange >& getRanges() const { return maRanges; } - bool getBorder() const { return mbBorder; } /// override to check conditions for last createOverlayObjectPrimitive2DSequence virtual drawinglayer::primitive2d::Primitive2DContainer getOverlayObjectPrimitive2DSequence() const override; diff --git a/include/svx/svddrgmt.hxx b/include/svx/svddrgmt.hxx index 3eefaa79bec1..3743f27e4e1b 100644 --- a/include/svx/svddrgmt.hxx +++ b/include/svx/svddrgmt.hxx @@ -129,7 +129,6 @@ protected: virtual void createSdrDragEntryForSdrObject(const SdrObject& rOriginal, sdr::contact::ObjectContact& rObjectContact); // access for derivated classes to maOverlayObjectList - void clearOverlayObjectList() { maOverlayObjectList.clear(); } void addToOverlayObjectList(sdr::overlay::OverlayObject& rNew) { maOverlayObjectList.append(rNew); } basegfx::B2DRange getB2DRangeFromOverlayObjectList() const { return maOverlayObjectList.getBaseRange(); } diff --git a/include/svx/svdedtv.hxx b/include/svx/svdedtv.hxx index bdf7f00747f7..bcec800008d0 100644 --- a/include/svx/svdedtv.hxx +++ b/include/svx/svdedtv.hxx @@ -184,7 +184,6 @@ public: void EndUndo(); // close undo-grouping (incl. BroadcastEdges) void AddUndo(SdrUndoAction* pUndo) { mpModel->AddUndo(pUndo); } // add action // only after first BegUndo or befor last EndUndo: - void SetUndoComment(const OUString& rComment) { mpModel->SetUndoComment(rComment); } void SetUndoComment(const OUString& rComment, const OUString& rObjDescr) { mpModel->SetUndoComment(rComment,rObjDescr); } bool IsUndoEnabled() const; diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx index eceb49262bf2..035053b3c962 100644 --- a/include/svx/svdhdl.hxx +++ b/include/svx/svdhdl.hxx @@ -242,7 +242,6 @@ public: class SVX_DLLPUBLIC SdrHdlColor : public SdrHdl { -private: // size of colr markers Size aMarkerSize; @@ -261,7 +260,6 @@ private: // help functions SVX_DLLPRIVATE Bitmap CreateColorDropper(Color aCol); SVX_DLLPRIVATE static Color GetLuminance(const Color& rCol); - SVX_DLLPRIVATE void CallColorChangeLink(); public: explicit SdrHdlColor(const Point& rRef, Color aCol = Color(COL_BLACK), const Size& rSize = Size(11, 11), bool bLum = false); diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx index e58ff885a8c7..159c0998fe9f 100644 --- a/include/svx/svdmrkv.hxx +++ b/include/svx/svdmrkv.hxx @@ -323,8 +323,6 @@ public: /** should only be used from outside svx for special ui elements */ bool MarkPointHelper(SdrHdl* pHdl, SdrMark* pMark, bool bUnmark); - // Mark all points within this rectangular alle Punkte (View coordinates) - void MarkPoints(const Rectangle& rRect, bool bUnmark) { MarkPoints(&rRect,bUnmark); } bool UnmarkPoint(SdrHdl& rHdl) { return MarkPoint(rHdl,true); } bool IsPointMarked(const SdrHdl& rHdl) const { ForceUndirtyMrkPnt(); return rHdl.IsSelected(); } bool MarkAllPoints() { return MarkPoints(nullptr,false); } diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx index 3e10abd7d6cf..266f2892e4c7 100644 --- a/include/svx/svdobj.hxx +++ b/include/svx/svdobj.hxx @@ -389,10 +389,6 @@ protected: /// at the same time to avoid recomputation. public: virtual void SetRectsDirty(bool bNotMyself = false); -protected: - - // override if the class inherits from SdrObjPlusData: - static SdrObjPlusData* NewPlusData(); protected: /// A derived class must override these 3 methods if it has own geometric @@ -403,7 +399,6 @@ protected: virtual void SaveGeoData(SdrObjGeoData& rGeo) const; virtual void RestGeoData(const SdrObjGeoData& rGeo); -protected: virtual ~SdrObject() override; public: diff --git a/include/svx/svdocapt.hxx b/include/svx/svdocapt.hxx index 5cca473d9479..b4aa64ade87f 100644 --- a/include/svx/svdocapt.hxx +++ b/include/svx/svdocapt.hxx @@ -69,7 +69,6 @@ private: SVX_DLLPRIVATE static void ImpCalcTail1(const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect); SVX_DLLPRIVATE static void ImpCalcTail2(const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect); SVX_DLLPRIVATE static void ImpCalcTail3(const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect); - SVX_DLLPRIVATE static void ImpCalcTail4(const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect); SVX_DLLPRIVATE static void ImpCalcTail (const ImpCaptParams& rPara, tools::Polygon& rPoly, Rectangle& rRect); SVX_DLLPRIVATE void ImpRecalcTail(); diff --git a/include/svx/svdoedge.hxx b/include/svx/svdoedge.hxx index 96f5d3287ae1..c7e6e4cd2886 100644 --- a/include/svx/svdoedge.hxx +++ b/include/svx/svdoedge.hxx @@ -182,8 +182,6 @@ public: void SetSuppressDefaultConnect(bool bNew) { mbSuppressDefaultConnect = bNew; } bool GetSuppressDefaultConnect() const { return mbSuppressDefaultConnect; } - bool IsBoundRectCalculationRunning() const { return mbBoundRectCalculationRunning; } - protected: virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override; diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx index 1d5a9e6ff9f5..77183c301de2 100644 --- a/include/svx/svdograf.hxx +++ b/include/svx/svdograf.hxx @@ -138,8 +138,6 @@ public: bool IsEPS() const; bool IsSwappedOut() const; - bool IsCropped() const; - const MapMode& GetGrafPrefMapMode() const; const Size& GetGrafPrefSize() const; diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx index 1a4e35ed717c..ec316e916226 100644 --- a/include/svx/svdotext.hxx +++ b/include/svx/svdotext.hxx @@ -353,7 +353,6 @@ public: void SetNextLinkInChain(SdrTextObj *); SdrTextObj *GetPrevLinkInChain() const; bool IsChainable() const; - void SetPreventChainable(); bool GetPreventChainable() const; TextChain *GetTextChain() const; @@ -362,8 +361,7 @@ public: // #i121917# virtual bool HasText() const override; - bool HasEditText() const; - bool IsTextEditActive() const { return (pEdtOutl != nullptr); } + bool IsTextEditActive() const { return pEdtOutl != nullptr; } /** returns the currently active text. */ virtual SdrText* getActiveText() const; diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx index 98bd49e3afad..5d7e27a2e833 100644 --- a/include/svx/svdpagv.hxx +++ b/include/svx/svdpagv.hxx @@ -93,9 +93,7 @@ private: SdrPageWindow* mpPreparedPageWindow; // interface to SdrPageWindow -private: void ClearPageWindows(); - void AppendPageWindow(SdrPageWindow& rNew); SdrPageWindow* RemovePageWindow(SdrPageWindow& rOld); public: sal_uInt32 PageWindowCount() const { return maPageWindows.size(); } diff --git a/include/svx/svdpntv.hxx b/include/svx/svdpntv.hxx index cde8018d76fa..659bf57d1e52 100644 --- a/include/svx/svdpntv.hxx +++ b/include/svx/svdpntv.hxx @@ -209,8 +209,6 @@ protected: Color maGridColor; // Interface to SdrPaintWindow -protected: - void AppendPaintWindow(SdrPaintWindow& rNew); void RemovePaintWindow(SdrPaintWindow& rOld); void ConfigurationChanged( ::utl::ConfigurationBroadcaster*, sal_uInt32 ) override; @@ -238,8 +236,8 @@ protected: public: bool ImpIsGlueVisible() { return mbGlueVisible || mbGlueVisible2 || mbGlueVisible3 || mbGlueVisible4; } -protected: +protected: virtual void Notify(SfxBroadcaster& rBC, const SfxHint& rHint) override; void GlueInvalidate() const; @@ -248,7 +246,6 @@ protected: // Any sub-class override this method, MUST call the base class' ModelHasChanged() method virtual void ModelHasChanged(); -protected: // #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView SdrPaintView(SdrModel* pModel1, OutputDevice* pOut = nullptr); virtual ~SdrPaintView() override; @@ -386,7 +383,6 @@ public: void SetHlplVisible(bool bOn = true) { mbHlplVisible=bOn; InvalidateAllWin(); } void SetHlplFront(bool bOn) { mbHlplFront =bOn; InvalidateAllWin(); } void SetGlueVisible(bool bOn = true) { if (mbGlueVisible!=bOn) { mbGlueVisible=bOn; if (!mbGlueVisible2 && !mbGlueVisible3 && !mbGlueVisible4) GlueInvalidate(); } } - void SetGridColor( Color aColor ); bool IsPreviewRenderer() const { return mbPreviewRenderer; } void SetPreviewRenderer(bool bOn) { mbPreviewRenderer=bOn; } @@ -435,7 +431,6 @@ public: void SetDefaultAttr(const SfxItemSet& rAttr, bool bReplaceAll); const SfxItemSet& GetDefaultAttr() const { return maDefaultAttr; } void SetDefaultStyleSheet(SfxStyleSheet* pStyleSheet, bool bDontRemoveHardAttr); - SfxStyleSheet* GetDefaultStyleSheet() const { return mpDefaultStyleSheet; } void SetNotPersistDefaultAttr(const SfxItemSet& rAttr, bool bReplaceAll); void MergeNotPersistDefaultAttr(SfxItemSet& rAttr, bool bOnlyHardAttr) const; diff --git a/include/svx/svdpoev.hxx b/include/svx/svdpoev.hxx index a4c2d948778d..b76d740b311e 100644 --- a/include/svx/svdpoev.hxx +++ b/include/svx/svdpoev.hxx @@ -37,7 +37,6 @@ protected: SdrPathSegmentKind eMarkedSegmentsKind; private: - SVX_DLLPRIVATE void ImpClearVars(); SVX_DLLPRIVATE void ImpResetPolyPossibilityFlags(); SVX_DLLPRIVATE void ImpCheckPolyPossibilities(); diff --git a/include/svx/unoshape.hxx b/include/svx/unoshape.hxx index 9161daa76822..c900e469ac6a 100644 --- a/include/svx/unoshape.hxx +++ b/include/svx/unoshape.hxx @@ -591,7 +591,6 @@ public: virtual ~SvxShapePolyPolygon() throw() override; // Local support functions - css::drawing::PolygonKind GetPolygonKind() const throw() { return mePolygonKind;} void SetPolygon(const basegfx::B2DPolyPolygon& rNew) throw(css::uno::RuntimeException); basegfx::B2DPolyPolygon GetPolygon() const throw(); }; @@ -618,7 +617,6 @@ public: virtual ~SvxShapePolyPolygonBezier() throw() override; // Local support functions - css::drawing::PolygonKind GetPolygonKind() const throw() { return mePolygonKind;} void SetPolygon(const basegfx::B2DPolyPolygon & rNew) throw(css::uno::RuntimeException); basegfx::B2DPolyPolygon GetPolygon() const throw(); }; diff --git a/include/svx/xit.hxx b/include/svx/xit.hxx index e4df90144d80..7d087758f577 100644 --- a/include/svx/xit.hxx +++ b/include/svx/xit.hxx @@ -58,7 +58,6 @@ public: OUString GetName() const { return GetValue(); } void SetName(const OUString& rName) { SetValue(rName); } - sal_Int32 GetIndex() const { return nPalIndex; } bool IsIndex() const { return (nPalIndex >= 0); } /** this static checks if the given NameOrIndex item has a unique name for its value. |