diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-26 14:59:38 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-27 06:09:29 +0000 |
commit | 883172375dbf5c0a79cbda5b615ff26ed27c78be (patch) | |
tree | 5d81ab1b28e7509a26148b602fd14f8c5c83642f /include | |
parent | loplugin:expandablemethods in sw (diff) | |
download | core-883172375dbf5c0a79cbda5b615ff26ed27c78be.tar.gz core-883172375dbf5c0a79cbda5b615ff26ed27c78be.zip |
loplugin:expandablemethods in svx
Change-Id: I0d193ddf07cc0ddc89b6ce2df6eb71d44e49b631
Reviewed-on: https://gerrit.libreoffice.org/30295
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
27 files changed, 1 insertions, 58 deletions
diff --git a/include/svx/AccessibleControlShape.hxx b/include/svx/AccessibleControlShape.hxx index 545a6674a5bc..86a583b359e8 100644 --- a/include/svx/AccessibleControlShape.hxx +++ b/include/svx/AccessibleControlShape.hxx @@ -147,9 +147,6 @@ protected: /// stops multiplexing the state changes of our aggregate context void stopStateMultiplexing( ); - /// retrieves the SdrObject of the shape we represent - SdrObject* getSdrObject( ) const; - /** adjusts our AccessibleRole, depending on the control type we're working for <p>Only to be called during initialization</p> diff --git a/include/svx/AccessibleShape.hxx b/include/svx/AccessibleShape.hxx index f88d190bbe7a..c5d04641208b 100644 --- a/include/svx/AccessibleShape.hxx +++ b/include/svx/AccessibleShape.hxx @@ -443,8 +443,6 @@ protected: GetFullAccessibleName(AccessibleShape *shape) throw (css::uno::RuntimeException, std::exception); virtual OUString GetStyle(); - void UpdateDocumentAllSelState(css::uno::Reference< - css::accessibility::XAccessibleStateSet > &xStateSet); /** Update the <const>OPAQUE</const> and <const>SELECTED</const> state. */ void UpdateStates(); diff --git a/include/svx/SmartTagMgr.hxx b/include/svx/SmartTagMgr.hxx index f75a7f38385b..a5f6209a512e 100644 --- a/include/svx/SmartTagMgr.hxx +++ b/include/svx/SmartTagMgr.hxx @@ -117,8 +117,6 @@ private: */ void AssociateActionsWithRecognizers(); - void CreateBreakIterator() const; - public: SmartTagMgr( const OUString& rApplicationName ); diff --git a/include/svx/algitem.hxx b/include/svx/algitem.hxx index 448d2475eb97..4fc822940d98 100644 --- a/include/svx/algitem.hxx +++ b/include/svx/algitem.hxx @@ -63,8 +63,6 @@ public: bool IsStacked() const; /** Returns the rotation this item represents (returns nStdAngle for STANDARD and STACKED state). */ sal_Int32 GetRotation( sal_Int32 nStdAngle ) const; - /** Fills this item according to passed item values. */ - void SetFromRotation( sal_Int32 nRotation, bool bStacked ); }; class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxMarginItem: public SfxPoolItem diff --git a/include/svx/chrtitem.hxx b/include/svx/chrtitem.hxx index 2c97d85d48ad..e14939ec1eb6 100644 --- a/include/svx/chrtitem.hxx +++ b/include/svx/chrtitem.hxx @@ -189,7 +189,6 @@ public: 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; - OUString GetValueText() const; virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit eCoreMetric, MapUnit ePresMetric, diff --git a/include/svx/ctredlin.hxx b/include/svx/ctredlin.hxx index 59546404d38b..3396bcf27707 100644 --- a/include/svx/ctredlin.hxx +++ b/include/svx/ctredlin.hxx @@ -203,7 +203,6 @@ private: protected: - void ShowDateFields(SvxRedlinDateMode nKind); void EnableDateLine1(bool bFlag); void EnableDateLine2(bool bFlag); @@ -351,7 +350,6 @@ public: SvxTPFilter* GetFilterPage() { return pTPFilter;} SvxTPView* GetViewPage() { return pTPView;} - SvxRedlinTable* GetViewTable(); }; #endif // INCLUDED_SVX_CTREDLIN_HXX diff --git a/include/svx/fmshell.hxx b/include/svx/fmshell.hxx index 05def09f75c4..6347df6774fe 100644 --- a/include/svx/fmshell.hxx +++ b/include/svx/fmshell.hxx @@ -85,8 +85,6 @@ class SVX_DLLPUBLIC FmFormShell : public SfxShell // (the FormView itself is not a broadcaster, therefore it can't always correctly notify the // form explorer who is interested in the event) - const OutputDevice* GetCurrentViewDevice() const { return m_pFormView ? m_pFormView->GetActualOutDev() : nullptr; } - public: SFX_DECL_INTERFACE(SVX_INTERFACE_FORM_SH) diff --git a/include/svx/fmsrcimp.hxx b/include/svx/fmsrcimp.hxx index f58d1f61f87b..adfce10e28ab 100644 --- a/include/svx/fmsrcimp.hxx +++ b/include/svx/fmsrcimp.hxx @@ -344,8 +344,6 @@ private: // moves the iterator with respect to the direction/overflow iterator/overflow cursor SVX_DLLPRIVATE void BuildAndInsertFieldInfo(const css::uno::Reference< css::container::XIndexAccess >& xAllFields, sal_Int32 nField); - SVX_DLLPRIVATE bool HasPreviousLoc() { return m_aPreviousLocBookmark.hasValue(); } - void OnSearchTerminated(); // is used by SearchThread, after the return from this handler the thread removes itself DECL_LINK(OnNewRecordCount, sal_Int32, void); diff --git a/include/svx/hdft.hxx b/include/svx/hdft.hxx index 97f6b66a4d59..7db266f30e21 100644 --- a/include/svx/hdft.hxx +++ b/include/svx/hdft.hxx @@ -42,10 +42,6 @@ class SVX_DLLPUBLIC SvxHFPage : public SfxTabPage using TabPage::ActivatePage; using TabPage::DeactivatePage; -private: - //UUUU - void EnableDrawingLayerFillStyles(bool bNew) { mbEnableDrawingLayerFillStyles = bNew; } - public: virtual bool FillItemSet( SfxItemSet* rOutSet ) override; diff --git a/include/svx/imapdlg.hxx b/include/svx/imapdlg.hxx index dccdfd6abb2a..b20e6f9478c5 100644 --- a/include/svx/imapdlg.hxx +++ b/include/svx/imapdlg.hxx @@ -144,7 +144,6 @@ public: const void* GetEditingObject() const { return pCheckObj; } - void SetImageMap( const ImageMap& rImageMap ); const ImageMap& GetImageMap() const; void SetTargetList( const TargetList& rTargetList ); diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx index 8813a36ca83f..e7117899694b 100644 --- a/include/svx/nbdtmg.hxx +++ b/include/svx/nbdtmg.hxx @@ -144,8 +144,6 @@ class SVX_DLLPUBLIC NBOTypeMgrBase MapUnit eCoreUnit; // store the attributes passed from pSet OUString aNumCharFmtName; - void StoreBulCharFmtName_impl(); - void StoreMapUnit_impl(); NBOTypeMgrBase(const NBOTypeMgrBase&) = delete; public: @@ -164,7 +162,7 @@ class SVX_DLLPUBLIC NBOTypeMgrBase virtual bool IsCustomized(sal_uInt16 nIndex)=0; static sal_uInt16 IsSingleLevel(sal_uInt16 nCurLevel); // store the attributes passed from pSet - void SetItems(const SfxItemSet* pArg) { pSet = pArg;StoreBulCharFmtName_impl();StoreMapUnit_impl();} + void SetItems(const SfxItemSet* pArg); protected: const OUString& GetBulCharFmtName() { return aNumCharFmtName;} MapUnit GetMapUnit() { return eCoreUnit;} diff --git a/include/svx/numfmtsh.hxx b/include/svx/numfmtsh.hxx index c8601d022953..f039ae9a0b6a 100644 --- a/include/svx/numfmtsh.hxx +++ b/include/svx/numfmtsh.hxx @@ -211,7 +211,6 @@ private: SVX_DLLPRIVATE ::std::vector<sal_uInt32>::iterator GetRemoved_Impl( size_t nKey ); SVX_DLLPRIVATE bool IsRemoved_Impl( size_t nKey ); SVX_DLLPRIVATE ::std::vector<sal_uInt32>::iterator GetAdded_Impl( size_t nKey ); - SVX_DLLPRIVATE bool IsAdded_Impl( size_t nKey ); SVX_DLLPRIVATE void GetPreviewString_Impl( OUString& rString, Color*& rpColor ); diff --git a/include/svx/rulritem.hxx b/include/svx/rulritem.hxx index 294df95a14b3..1078f9da3e5a 100644 --- a/include/svx/rulritem.hxx +++ b/include/svx/rulritem.hxx @@ -195,7 +195,6 @@ public: SvxColumnDescription& GetActiveColumnDescription(); sal_uInt16 Count() const; - void Insert(const SvxColumnDescription& rDesc, sal_uInt16 nPos); void Append(const SvxColumnDescription& rDesc); void SetLeft(long aLeft); void SetRight(long aRight); diff --git a/include/svx/sdr/animation/scheduler.hxx b/include/svx/sdr/animation/scheduler.hxx index 06477558f92f..1d1c16ac289d 100644 --- a/include/svx/sdr/animation/scheduler.hxx +++ b/include/svx/sdr/animation/scheduler.hxx @@ -79,9 +79,6 @@ namespace sdr SAL_DLLPRIVATE void Insert(Event* pNew); SAL_DLLPRIVATE void Remove(Event* pOld); - // clear list - SAL_DLLPRIVATE void Clear(); - // get first SAL_DLLPRIVATE Event* GetFirst() { return mpHead; } }; diff --git a/include/svx/sdr/contact/objectcontact.hxx b/include/svx/sdr/contact/objectcontact.hxx index d3ebcf0cd881..e883b9d2a968 100644 --- a/include/svx/sdr/contact/objectcontact.hxx +++ b/include/svx/sdr/contact/objectcontact.hxx @@ -79,9 +79,6 @@ private: // flag for preview renderer bool mbIsPreviewRenderer : 1; - // method to create a EventHandler. Needs to give a result. - static sdr::event::TimerEventHandler* CreateEventHandler(); - protected: // Interface to allow derivates to travel over the registered VOC's sal_uInt32 getViewObjectContactCount() const { return maViewObjectContactVector.size(); } @@ -135,9 +132,6 @@ public: // return a existing one or create a new one using CreateEventHandler(). sdr::event::TimerEventHandler& GetEventHandler() const; - // delete the EventHandler - void DeleteEventHandler(); - // test if there is an EventHandler without creating one on demand bool HasEventHandler() const; diff --git a/include/svx/sdrmasterpagedescriptor.hxx b/include/svx/sdrmasterpagedescriptor.hxx index 2469e078f85b..39777f96456b 100644 --- a/include/svx/sdrmasterpagedescriptor.hxx +++ b/include/svx/sdrmasterpagedescriptor.hxx @@ -49,9 +49,6 @@ namespace sdr void operator=(const MasterPageDescriptor& rCandidate) = delete; - protected: - sdr::contact::ViewContact* CreateObjectSpecificViewContact(); - public: MasterPageDescriptor(SdrPage& aOwnerPage, SdrPage& aUsedPage); virtual ~MasterPageDescriptor(); diff --git a/include/svx/sidebar/PanelLayout.hxx b/include/svx/sidebar/PanelLayout.hxx index d69607b89b90..ca4086f6bfd1 100644 --- a/include/svx/sidebar/PanelLayout.hxx +++ b/include/svx/sidebar/PanelLayout.hxx @@ -27,7 +27,6 @@ class SVX_DLLPUBLIC PanelLayout : public Control, public VclBuilderContainer private: Idle m_aPanelLayoutIdle; bool m_bInClose; - bool hasPanelPendingLayout() const; DECL_DLLPRIVATE_LINK(ImplHandlePanelLayoutTimerHdl, Idle*, void); diff --git a/include/svx/svddrgmt.hxx b/include/svx/svddrgmt.hxx index 3743f27e4e1b..df51ea85bd7d 100644 --- a/include/svx/svddrgmt.hxx +++ b/include/svx/svddrgmt.hxx @@ -130,7 +130,6 @@ protected: // access for derivated classes to maOverlayObjectList void addToOverlayObjectList(sdr::overlay::OverlayObject& rNew) { maOverlayObjectList.append(rNew); } - basegfx::B2DRange getB2DRangeFromOverlayObjectList() const { return maOverlayObjectList.getBaseRange(); } // access for derivated classes to mrSdrDragView SdrDragView& getSdrDragView() { return mrSdrDragView; } diff --git a/include/svx/svdhdl.hxx b/include/svx/svdhdl.hxx index 035053b3c962..c1bf98956e3a 100644 --- a/include/svx/svdhdl.hxx +++ b/include/svx/svdhdl.hxx @@ -491,8 +491,6 @@ protected: virtual void CreateB2dIAObject() override; BitmapEx GetBitmapForHandle( const BitmapEx& rBitmap, int nSize ); - - static BitmapEx GetHandlesBitmap(); }; diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx index 159c0998fe9f..bb187a8547fe 100644 --- a/include/svx/svdmrkv.hxx +++ b/include/svx/svdmrkv.hxx @@ -229,7 +229,6 @@ public: protected: // all available changing methods SdrMarkList& GetMarkedObjectListWriteAccess() { return mpSdrViewSelection->GetMarkedObjectListWriteAccess(); } - void SetEdgesOfMarkedNodesDirty() { mpSdrViewSelection->SetEdgesOfMarkedNodesDirty(); } public: // all available const methods for read access to selection @@ -245,8 +244,6 @@ public: OUString GetDescriptionOfMarkedObjects() const { return GetMarkedObjectList().GetMarkDescription(); } OUString GetDescriptionOfMarkedPoints() const { return GetMarkedObjectList().GetPointMarkDescription(); } OUString GetDescriptionOfMarkedGluePoints() const { return GetMarkedObjectList().GetGluePointMarkDescription(); } - void GetBoundRectFromMarkedObjects(SdrPageView* pPageView, Rectangle& rRect) const { GetMarkedObjectList().TakeBoundRect(pPageView, rRect); } - bool GetSnapRectFromMarkedObjects(SdrPageView* pPageView, Rectangle& rRect) const { return GetMarkedObjectList().TakeSnapRect(pPageView, rRect); } // Get a list of all those links which are connected to marked nodes, // but which are not marked themselves. diff --git a/include/svx/svdoedge.hxx b/include/svx/svdoedge.hxx index c7e6e4cd2886..e1e3b64c271b 100644 --- a/include/svx/svdoedge.hxx +++ b/include/svx/svdoedge.hxx @@ -110,7 +110,6 @@ public: {} Point& ImpGetLineVersatzPoint(SdrEdgeLineCode eLineCode); - const Point& ImpGetLineVersatzPoint(SdrEdgeLineCode eLineCode) const { return const_cast<SdrEdgeInfoRec*>(this)->ImpGetLineVersatzPoint(eLineCode); } sal_uInt16 ImpGetPolyIdx(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const; bool ImpIsHorzLine(SdrEdgeLineCode eLineCode, const XPolygon& rXP) const; void ImpSetLineVersatz(SdrEdgeLineCode eLineCode, const XPolygon& rXP, long nVal); diff --git a/include/svx/svdomedia.hxx b/include/svx/svdomedia.hxx index 28d94c9a668e..5b69ed6ea67c 100644 --- a/include/svx/svdomedia.hxx +++ b/include/svx/svdomedia.hxx @@ -62,8 +62,6 @@ public: void setMediaProperties( const ::avmedia::MediaItem& rState ); const ::avmedia::MediaItem& getMediaProperties() const; - Size getPreferredSize() const; - const css::uno::Reference< css::graphic::XGraphic > getSnapshot() const; css::uno::Reference< css::io::XInputStream> diff --git a/include/svx/svdpagv.hxx b/include/svx/svdpagv.hxx index 5d7e27a2e833..6233d09e9782 100644 --- a/include/svx/svdpagv.hxx +++ b/include/svx/svdpagv.hxx @@ -110,8 +110,6 @@ public: const SdrPageWindow* FindPatchedPageWindow( const OutputDevice& rOutDev ) const; private: - SVX_DLLPRIVATE void CreateNewPageWindowEntry(SdrPaintWindow& rPaintWindow); - void ImpInvalidateHelpLineArea(sal_uInt16 nNum) const; void SetLayer(const OUString& rName, SetOfByte& rBS, bool bJa); diff --git a/include/svx/svdtrans.hxx b/include/svx/svdtrans.hxx index 2c96e13916b6..026f930dfe2f 100644 --- a/include/svx/svdtrans.hxx +++ b/include/svx/svdtrans.hxx @@ -287,7 +287,6 @@ class SVX_DLLPUBLIC SdrFormatter { MapUnit eDstMU; private: SVX_DLLPRIVATE void Undirty(); - SVX_DLLPRIVATE void ForceUndirty() const { if (bDirty) const_cast<SdrFormatter*>(this)->Undirty(); } public: SdrFormatter(MapUnit eSrc, MapUnit eDst) : nMul_(0) diff --git a/include/svx/textchainflow.hxx b/include/svx/textchainflow.hxx index 0bc40e85a579..d52e26a86e3d 100644 --- a/include/svx/textchainflow.hxx +++ b/include/svx/textchainflow.hxx @@ -68,9 +68,6 @@ protected: virtual void impSetFlowOutlinerParams(SdrOutliner *, SdrOutliner *); - // impGetMergedUnderflowingParaObject merges underflowing text with the one in the next box - OutlinerParaObject *impGetMergedUnderflowParaObject(SdrOutliner *pOutliner); - private: bool mbOFisUFinduced; diff --git a/include/svx/viewpt3d.hxx b/include/svx/viewpt3d.hxx index f085dd45f76a..61157fe79569 100644 --- a/include/svx/viewpt3d.hxx +++ b/include/svx/viewpt3d.hxx @@ -70,8 +70,6 @@ class SVX_DLLPUBLIC Viewport3D double fWRatio; // device/view aspect ratio double fHRatio; - void MakeTransform(); - public: Viewport3D(); diff --git a/include/svx/xmleohlp.hxx b/include/svx/xmleohlp.hxx index c76b4468869b..24f9d30b0662 100644 --- a/include/svx/xmleohlp.hxx +++ b/include/svx/xmleohlp.hxx @@ -111,8 +111,6 @@ public: SvXMLEmbeddedObjectHelperMode eCreateMode ); static void Destroy( SvXMLEmbeddedObjectHelper* pSvXMLEmbeddedObjectHelper ); - void Flush(); - // XEmbeddedObjectResolver virtual OUString SAL_CALL resolveEmbeddedObjectURL( const OUString& aURL ) throw(css::uno::RuntimeException, std::exception) override; |