diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-25 15:53:44 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-10-27 06:08:51 +0000 |
commit | a7ea18ffe715776cb0e2b39e98569c75605ee332 (patch) | |
tree | 1e32da87f2ad0e8d111ba8ed99180bb6b4cf2a77 /sw/inc | |
parent | eca5ea9f79181d45cd7fbabe2313617d3025818a (diff) |
loplugin:expandablemethods in sw
Change-Id: Ibc9edc28f4041235ab30c026bd3774bd74b7e960
Reviewed-on: https://gerrit.libreoffice.org/30287
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/inc')
-rw-r--r-- | sw/inc/PostItMgr.hxx | 2 | ||||
-rw-r--r-- | sw/inc/SwNumberTree.hxx | 7 | ||||
-rw-r--r-- | sw/inc/dcontact.hxx | 4 | ||||
-rw-r--r-- | sw/inc/doc.hxx | 15 | ||||
-rw-r--r-- | sw/inc/expfld.hxx | 3 | ||||
-rw-r--r-- | sw/inc/fmtmeta.hxx | 1 | ||||
-rw-r--r-- | sw/inc/hhcwrp.hxx | 1 | ||||
-rw-r--r-- | sw/inc/ndtxt.hxx | 8 | ||||
-rw-r--r-- | sw/inc/swcrsr.hxx | 1 | ||||
-rw-r--r-- | sw/inc/txtinet.hxx | 3 | ||||
-rw-r--r-- | sw/inc/undobj.hxx | 1 | ||||
-rw-r--r-- | sw/inc/unoframe.hxx | 6 | ||||
-rw-r--r-- | sw/inc/unotbl.hxx | 2 |
13 files changed, 3 insertions, 51 deletions
diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx index 85f1133cd33a..68887aa73a5d 100644 --- a/sw/inc/PostItMgr.hxx +++ b/sw/inc/PostItMgr.hxx @@ -189,8 +189,6 @@ class SwPostItMgr: public SfxListener void InsertItem( SfxBroadcaster* pItem, bool bCheckExistance, bool bFocus); void RemoveItem( SfxBroadcaster* pBroadcast ); - void Sort(); - public: SwPostItMgr(SwView* aDoc); virtual ~SwPostItMgr() override; diff --git a/sw/inc/SwNumberTree.hxx b/sw/inc/SwNumberTree.hxx index 28281fd887ca..eab279312f3d 100644 --- a/sw/inc/SwNumberTree.hxx +++ b/sw/inc/SwNumberTree.hxx @@ -480,13 +480,6 @@ protected: bool bValidating = false) const; /** - Set this node as last valid child of its parent. - - @param bValidation see above - */ - void SetLastValid(bool bValidating) const; - - /** Return if this node is notifiable. @attention If a not is not notifiable a notify request is *not* diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx index 37ba7c1b7791..82a3ae2fb1fc 100644 --- a/sw/inc/dcontact.hxx +++ b/sw/inc/dcontact.hxx @@ -403,10 +403,6 @@ class SwDrawContact : public SwContact { return maAnchoredDrawObj.GetPageFrame(); } - void SetPageFrame( SwPageFrame* _pNewPageFrame ) - { - return maAnchoredDrawObj.SetPageFrame( _pNewPageFrame ); - } void ChkPage(); SwPageFrame* FindPage( const SwRect &rRect ); diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 4d881ad1547b..33e4473681ef 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -828,8 +828,6 @@ public: const SwGrfFormatColls *GetGrfFormatColls() const { return mpGrfFormatCollTable; } SwGrfFormatColl *MakeGrfFormatColl(const OUString &rFormatName, SwGrfFormatColl *pDerivedFrom); - SwGrfFormatColl* FindGrfFormatCollByName( const OUString& rName ) const - { return static_cast<SwGrfFormatColl*>(FindFormatByName( (SwFormatsBase&)*mpGrfFormatCollTable, rName )); } // Table formatting const SwFrameFormats* GetTableFrameFormats() const { return mpTableFrameFormatTable; } @@ -1551,19 +1549,6 @@ public: const int nListLevel, const bool bValue ); - /** Marks/Unmarks a list level of a certain list - - levels of a certain lists are marked now - - @param rList list whose level has to be marked/unmarked - @param nListLevel level to mark - @param bValue - true mark the level - - false unmark the level - */ - static void MarkListLevel( SwList& rList, - const int nListLevel, - const bool bValue ); - // Change a format undoable. void ChgFormat(SwFormat & rFormat, const SfxItemSet & rSet); diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx index 38344e151448..bee8249837ea 100644 --- a/sw/inc/expfld.hxx +++ b/sw/inc/expfld.hxx @@ -303,9 +303,6 @@ class SW_DLLPUBLIC SwInputField : public SwField // Accessing Input Field's content const OUString& getContent() const { return aContent;} - void LockNotifyContentChange(); - void UnlockNotifyContentChange(); - public: /// Direct input via dialog; delete old value. SwInputField( diff --git a/sw/inc/fmtmeta.hxx b/sw/inc/fmtmeta.hxx index 5e655c034c5b..549b7a1a454f 100644 --- a/sw/inc/fmtmeta.hxx +++ b/sw/inc/fmtmeta.hxx @@ -141,7 +141,6 @@ protected: SwFormatMeta * GetFormatMeta() const { return m_pFormat; } void SetFormatMeta( SwFormatMeta * const i_pFormat ) { m_pFormat = i_pFormat; }; - void NotifyChangeTextNodeImpl(); void NotifyChangeTextNode(SwTextNode *const pTextNode); css::uno::WeakReference<css::rdf::XMetadatable> const& GetXMeta() const diff --git a/sw/inc/hhcwrp.hxx b/sw/inc/hhcwrp.hxx index 3248b62daab7..c4b86a518f96 100644 --- a/sw/inc/hhcwrp.hxx +++ b/sw/inc/hhcwrp.hxx @@ -56,7 +56,6 @@ class SW_DLLPUBLIC SwHHCWrapper : public editeng::HangulHanjaConversion bool FindConvText_impl(); ///< former FindSpellError /// from SwSpellWrapper copied and modified - bool HasOtherCnt_impl(); void ConvStart_impl( SwConversionArgs *pConvArgs, SvxSpellArea eSpell ); ///< former SpellStart void ConvEnd_impl( SwConversionArgs *pConvArgs ); ///< former SpellEnd bool ConvContinue_impl( SwConversionArgs *pConvArgs ); ///< former SpellContinue diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx index 0d481b1b751d..87f4a7b28e81 100644 --- a/sw/inc/ndtxt.hxx +++ b/sw/inc/ndtxt.hxx @@ -158,14 +158,6 @@ class SW_DLLPUBLIC SwTextNode: public SwContentNode, public ::sfx2::Metadatable /// Start: Data collected during idle time - SAL_DLLPRIVATE void SetParaNumberOfWords( sal_uLong nTmpWords ) const; - SAL_DLLPRIVATE sal_uLong GetParaNumberOfWords() const; - SAL_DLLPRIVATE void SetParaNumberOfAsianWords( sal_uLong nTmpAsianWords ) const; - SAL_DLLPRIVATE sal_uLong GetParaNumberOfAsianWords() const; - SAL_DLLPRIVATE void SetParaNumberOfChars( sal_uLong nTmpChars ) const; - SAL_DLLPRIVATE sal_uLong GetParaNumberOfChars() const; - SAL_DLLPRIVATE void SetParaNumberOfCharsExcludingSpaces( sal_uLong nTmpChars ) const; - SAL_DLLPRIVATE sal_uLong GetParaNumberOfCharsExcludingSpaces() const; SAL_DLLPRIVATE void InitSwParaStatistics( bool bNew ); /** create number for this text node, if not already existing diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx index f5c59e033a02..b2d03e0b62a0 100644 --- a/sw/inc/swcrsr.hxx +++ b/sw/inc/swcrsr.hxx @@ -81,7 +81,6 @@ class SW_DLLPUBLIC SwCursor : public SwPaM SwCursor(SwCursor const& rPaM) = delete; protected: - SwCursor_SavePos* CreateNewSavePos() const; void SaveState(); void RestoreState(); diff --git a/sw/inc/txtinet.hxx b/sw/inc/txtinet.hxx index 409e46843d6f..ad93d97761e0 100644 --- a/sw/inc/txtinet.hxx +++ b/sw/inc/txtinet.hxx @@ -70,7 +70,8 @@ inline const SwTextNode& SwTextINetFormat::GetTextNode() const inline SwTextNode& SwTextINetFormat::GetTextNode() { - return const_cast<SwTextNode&>( const_cast<SwTextINetFormat const*>(this)->GetTextNode() ); + assert( m_pTextNode ); + return *m_pTextNode; } #endif diff --git a/sw/inc/undobj.hxx b/sw/inc/undobj.hxx index d081e63b90d5..ef154ca2d41c 100644 --- a/sw/inc/undobj.hxx +++ b/sw/inc/undobj.hxx @@ -77,7 +77,6 @@ protected: // the 4 methods that derived classes have to override // base implementation does nothing virtual void RepeatImpl( ::sw::RepeatContext & ); - bool CanRepeatImpl( ::sw::RepeatContext & ) const; public: // should not be public, but ran into trouble in untbl.cxx virtual void UndoImpl( ::sw::UndoRedoContext & ) = 0; virtual void RedoImpl( ::sw::UndoRedoContext & ) = 0; diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx index 27e8dc01ef46..efbef6b83a1f 100644 --- a/sw/inc/unoframe.hxx +++ b/sw/inc/unoframe.hxx @@ -312,15 +312,11 @@ public: void SAL_CALL operator delete( void * ) throw(); }; -class SwXOLEListener : public cppu::WeakImplHelper -< - css::util::XModifyListener ->, +class SwXOLEListener : public cppu::WeakImplHelper<css::util::XModifyListener>, public SwClient { css::uno::Reference< css::frame::XModel > xOLEModel; - SwFormat* GetFormat() const { return const_cast<SwFormat*>(static_cast<const SwFormat*>(GetRegisteredIn())); } public: SwXOLEListener(SwFormat& rOLEFormat, css::uno::Reference< css::frame::XModel > const & xOLE); virtual ~SwXOLEListener() override; diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx index 8bb80366d9bf..a244cb3128e1 100644 --- a/sw/inc/unotbl.hxx +++ b/sw/inc/unotbl.hxx @@ -116,8 +116,6 @@ public: { return const_cast<SwXCell*>(this)->getValue(); }; virtual void SAL_CALL setValue( double nValue ) throw(css::uno::RuntimeException, std::exception) override; virtual css::table::CellContentType SAL_CALL getType( ) throw(css::uno::RuntimeException, std::exception) override; - css::table::CellContentType SAL_CALL getType( ) const throw(css::uno::RuntimeException, std::exception) - { return const_cast<SwXCell*>(this)->getType(); }; virtual sal_Int32 SAL_CALL getError( ) throw(css::uno::RuntimeException, std::exception) override; //XText |