sw/inc/ndtxt.hxx | 2 +- sw/inc/node.hxx | 1 - sw/source/core/bastyp/swcache.cxx | 5 ----- sw/source/core/docnode/node.cxx | 4 ---- sw/source/core/inc/swcache.hxx | 2 -- sw/source/core/text/frmform.cxx | 2 +- sw/source/core/text/txtcache.hxx | 2 +- 7 files changed, 3 insertions(+), 15 deletions(-)
New commits: commit 04151aeb553ac65de3530dab83353f47052b6608 Author: Noel Grandin <[email protected]> Date: Wed Mar 28 10:00:42 2018 +0200 loplugin:virtualdown in sw Change-Id: Ia4053970a23d62ac7483f18d6caa559ddf43b176 Reviewed-on: https://gerrit.libreoffice.org/51988 Tested-by: Jenkins <[email protected]> Reviewed-by: Noel Grandin <[email protected]> diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx index 74ca9624ef1c..4543defcbd33 100644 --- a/sw/inc/ndtxt.hxx +++ b/sw/inc/ndtxt.hxx @@ -347,7 +347,7 @@ public: virtual SwContentFrame *MakeFrame( SwFrame* ) override; virtual SwContentNode *SplitContentNode( const SwPosition & ) override; virtual SwContentNode *JoinNext() override; - virtual void JoinPrev() override; + void JoinPrev(); SwContentNode *AppendNode( const SwPosition & ); diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx index 739f6200ef50..e16b797f641d 100644 --- a/sw/inc/node.hxx +++ b/sw/inc/node.hxx @@ -383,7 +383,6 @@ public: virtual SwContentNode *SplitContentNode(const SwPosition & ) = 0; virtual SwContentNode *JoinNext(); - virtual void JoinPrev(); /** Is it possible to join two nodes? In pIdx the second position can be returned. */ bool CanJoinNext( SwNodeIndex* pIdx =nullptr ) const; diff --git a/sw/source/core/bastyp/swcache.cxx b/sw/source/core/bastyp/swcache.cxx index 282e5c6d4307..2019d7d0b3b5 100644 --- a/sw/source/core/bastyp/swcache.cxx +++ b/sw/source/core/bastyp/swcache.cxx @@ -495,9 +495,4 @@ void SwCacheAccess::Get_() } } -bool SwCacheAccess::IsAvailable() const -{ - return m_pObj != nullptr; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx index 8e4bc9e66f37..3db76343d687 100644 --- a/sw/source/core/docnode/node.cxx +++ b/sw/source/core/docnode/node.cxx @@ -1374,10 +1374,6 @@ SwContentNode *SwContentNode::JoinNext() return this; } -void SwContentNode::JoinPrev() -{ -} - /// Get info from Modify bool SwContentNode::GetInfo( SfxPoolItem& rInfo ) const { diff --git a/sw/source/core/inc/swcache.hxx b/sw/source/core/inc/swcache.hxx index 182da7225bce..30410061b49f 100644 --- a/sw/source/core/inc/swcache.hxx +++ b/sw/source/core/inc/swcache.hxx @@ -205,8 +205,6 @@ protected: public: virtual ~SwCacheAccess(); - virtual bool IsAvailable() const; - /// Shorthand for those who know that they did not override isAvailable() /// FIXME: wtf? bool IsAvail() const { return m_pObj != nullptr; } diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx index 54a8bea78782..b6203899aee0 100644 --- a/sw/source/core/text/frmform.cxx +++ b/sw/source/core/text/frmform.cxx @@ -1834,7 +1834,7 @@ void SwTextFrame::Format( vcl::RenderContext* pRenderContext, const SwBorderAttr // We do not want to be interrupted during formatting TextFrameLockGuard aLock(this); SwTextLineAccess aAccess( this ); - const bool bNew = !aAccess.SwTextLineAccess::IsAvailable(); + const bool bNew = !aAccess.IsAvailable(); const bool bSetOfst = (GetOfst() && GetOfst() > GetTextNode()->GetText().getLength()); diff --git a/sw/source/core/text/txtcache.hxx b/sw/source/core/text/txtcache.hxx index 07c30405381a..491040c46934 100644 --- a/sw/source/core/text/txtcache.hxx +++ b/sw/source/core/text/txtcache.hxx @@ -54,7 +54,7 @@ public: SwParaPortion *GetPara(); - virtual bool IsAvailable() const override; + bool IsAvailable() const; }; #endif _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
