sw/inc/dcontact.hxx | 4 ----
sw/inc/format.hxx | 3 ---
sw/inc/numrule.hxx | 2 --
sw/source/core/attr/format.cxx | 5 -----
sw/source/core/doc/number.cxx | 10 ----------
sw/source/core/draw/dcontact.cxx | 12 ------------
sw/source/core/draw/dflyobj.cxx | 14 --------------
sw/source/core/inc/UndoManager.hxx | 1 -
sw/source/core/inc/dflyobj.hxx | 4 ----
sw/source/core/text/porfly.cxx | 6 ------
sw/source/core/text/porfly.hxx | 1 -
sw/source/core/text/portxt.cxx | 5 -----
sw/source/core/text/portxt.hxx | 1 -
sw/source/core/undo/docundo.cxx | 7 -------
sw/source/ui/dbui/mailmergewizard.cxx | 5 -----
sw/source/ui/dialog/wordcountdialog.cxx | 5 -----
sw/source/uibase/inc/mailmergewizard.hxx | 1 -
sw/source/uibase/inc/wordcountdialog.hxx | 1 -
sw/source/uibase/sidebar/PagePropertyPanel.cxx | 4 ----
sw/source/uibase/sidebar/PagePropertyPanel.hxx | 1 -
20 files changed, 92 deletions(-)
New commits:
commit c47c1e3551e9bdfb92bbbb8bc87b5e2314449efd
Author: Noel Grandin <n...@peralex.com>
Date: Wed Oct 5 11:12:59 2016 +0200
loplugin:unnecessaryoverride in sw
Change-Id: I641175c9c17fcc46b582b6487b8207deb343e645
diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx
index b19c76c..37ba7c1 100644
--- a/sw/inc/dcontact.hxx
+++ b/sw/inc/dcontact.hxx
@@ -299,10 +299,6 @@ class SwDrawVirtObj : public SdrVirtObj
virtual void NbcSetLayer(SdrLayerID nLayer) override;
virtual void SetLayer(SdrLayerID nLayer) override;
- /// FullDrag support
- virtual bool supportsFullDrag() const override;
- virtual SdrObject* getFullDragClone() const override;
-
virtual void SetBoundRectDirty() override;
virtual const Rectangle& GetCurrentBoundRect() const override;
virtual const Rectangle& GetLastBoundRect() const override;
diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index f03c2e1..21e0910 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -79,9 +79,6 @@ public:
/// for Querying of Writer-functions.
sal_uInt16 Which() const { return m_nWhichId; }
- /// Query format information.
- virtual bool GetInfo( SfxPoolItem& ) const override;
-
/// Copy attributes even among documents.
void CopyAttrs( const SwFormat& );
diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx
index 8f3ade0..4dd9647 100644
--- a/sw/inc/numrule.hxx
+++ b/sw/inc/numrule.hxx
@@ -84,8 +84,6 @@ public:
virtual void SetGraphicBrush( const SvxBrushItem* pBrushItem, const
Size* pSize = nullptr, const sal_Int16* pOrient = nullptr) override;
- virtual void SetVertOrient(sal_Int16 eSet) override;
- virtual sal_Int16 GetVertOrient() const override;
const SwFormatVertOrient* GetGraphicOrientation() const;
bool IsEnumeration() const; // #i22362#
diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx
index e958b2e..09202c3 100644
--- a/sw/source/core/attr/format.cxx
+++ b/sw/source/core/attr/format.cxx
@@ -721,11 +721,6 @@ sal_uInt16 SwFormat::ResetAllFormatAttr()
return aNew.Count();
}
-bool SwFormat::GetInfo( SfxPoolItem& rInfo ) const
-{
- return SwModify::GetInfo( rInfo );
-}
-
void SwFormat::DelDiffs( const SfxItemSet& rSet )
{
if( !m_aSet.Count() )
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 262bd80..217fb83 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -322,16 +322,6 @@ void SwNumFormat::SetGraphicBrush( const SvxBrushItem*
pBrushItem, const Size
SvxNumberFormat::SetGraphicBrush( pBrushItem, pSize, pOrient);
}
-void SwNumFormat::SetVertOrient(sal_Int16 eSet)
-{
- SvxNumberFormat::SetVertOrient(eSet);
-}
-
-sal_Int16 SwNumFormat::GetVertOrient() const
-{
- return SvxNumberFormat::GetVertOrient();
-}
-
void SwNumFormat::UpdateNumNodes( SwDoc* pDoc )
{
bool bDocIsModified = pDoc->getIDocumentState().IsModified();
diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx
index 5540cc2..0200bfa 100644
--- a/sw/source/core/draw/dcontact.cxx
+++ b/sw/source/core/draw/dcontact.cxx
@@ -2517,16 +2517,4 @@ void SwDrawVirtObj::SetLayer(SdrLayerID nLayer)
SdrVirtObj::NbcSetLayer( ReferencedObj().GetLayer() );
}
-bool SwDrawVirtObj::supportsFullDrag() const
-{
- // call parent
- return SdrVirtObj::supportsFullDrag();
-}
-
-SdrObject* SwDrawVirtObj::getFullDragClone() const
-{
- // call parent
- return SdrVirtObj::getFullDragClone();
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/draw/dflyobj.cxx b/sw/source/core/draw/dflyobj.cxx
index 1813191..18e24fd 100644
--- a/sw/source/core/draw/dflyobj.cxx
+++ b/sw/source/core/draw/dflyobj.cxx
@@ -999,18 +999,4 @@ SdrObject* SwVirtFlyDrawObj::CheckMacroHit( const
SdrObjMacroHitRec& rRec ) cons
return SdrObject::CheckMacroHit( rRec );
}
-// Dragging
-
-bool SwVirtFlyDrawObj::supportsFullDrag() const
-{
- // call parent
- return SdrVirtObj::supportsFullDrag();
-}
-
-SdrObject* SwVirtFlyDrawObj::getFullDragClone() const
-{
- // call parent
- return SdrVirtObj::getFullDragClone();
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/inc/UndoManager.hxx
b/sw/source/core/inc/UndoManager.hxx
index 247e245..ede9604 100644
--- a/sw/source/core/inc/UndoManager.hxx
+++ b/sw/source/core/inc/UndoManager.hxx
@@ -86,7 +86,6 @@ public:
bool bTryMerg = false) override;
virtual bool Undo() override;
virtual bool Redo() override;
- virtual void EnableUndo(bool bEnable) override;
SwUndo * RemoveLastUndo();
SwUndo * GetLastUndo();
diff --git a/sw/source/core/inc/dflyobj.hxx b/sw/source/core/inc/dflyobj.hxx
index e62391d..acfdcb8 100644
--- a/sw/source/core/inc/dflyobj.hxx
+++ b/sw/source/core/inc/dflyobj.hxx
@@ -119,10 +119,6 @@ public:
virtual bool HasMacro() const override;
virtual SdrObject* CheckMacroHit (const SdrObjMacroHitRec& rRec)
const override;
virtual Pointer GetMacroPointer (const SdrObjMacroHitRec& rRec)
const override;
-
- // FullDrag support
- virtual bool supportsFullDrag() const override;
- virtual SdrObject* getFullDragClone() const override;
};
#endif
diff --git a/sw/source/core/text/porfly.cxx b/sw/source/core/text/porfly.cxx
index 5903566..1d35375 100644
--- a/sw/source/core/text/porfly.cxx
+++ b/sw/source/core/text/porfly.cxx
@@ -419,10 +419,4 @@ void SwFlyCntPortion::GetFlyCursorOfst(Point &rPoint,
SwPosition &rPos, SwCursor
GetFlyFrame()->GetCursorOfst(&rPos, rPoint, pCMS);
}
-sal_Int32 SwFlyCntPortion::GetCursorOfst( const sal_uInt16 nOfst ) const
-{
- // OSL_FAIL("SwFlyCntPortion::GetCursorOfst: use GetFlyCursorOfst()");
- return SwLinePortion::GetCursorOfst( nOfst );
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/text/porfly.hxx b/sw/source/core/text/porfly.hxx
index 129bf39..67e29f1 100644
--- a/sw/source/core/text/porfly.hxx
+++ b/sw/source/core/text/porfly.hxx
@@ -49,7 +49,6 @@ class SwFlyCntPortion : public SwLinePortion
bool bDraw : 1; // DrawContact?
bool bMax : 1; // Line adjustment and height == line height
sal_uInt8 nAlign : 3; // Line adjustment? No, above, middle, bottom
- virtual sal_Int32 GetCursorOfst( const sal_uInt16 nOfst ) const override;
public:
// Use new datatype for parameter <nFlags>
diff --git a/sw/source/core/text/portxt.cxx b/sw/source/core/text/portxt.cxx
index 3b3d980..e12955c 100644
--- a/sw/source/core/text/portxt.cxx
+++ b/sw/source/core/text/portxt.cxx
@@ -697,11 +697,6 @@ SwPosSize SwTextInputFieldPortion::GetTextSize( const
SwTextSizeInfo &rInf ) con
return rInf.GetTextSize();
}
-sal_uInt16 SwTextInputFieldPortion::GetViewWidth( const SwTextSizeInfo &rInf )
const
-{
- return SwTextPortion::GetViewWidth( rInf );
-}
-
SwHolePortion::SwHolePortion( const SwTextPortion &rPor )
: nBlankWidth( 0 )
{
diff --git a/sw/source/core/text/portxt.hxx b/sw/source/core/text/portxt.hxx
index 9462b56..26d7970 100644
--- a/sw/source/core/text/portxt.hxx
+++ b/sw/source/core/text/portxt.hxx
@@ -62,7 +62,6 @@ public:
virtual bool Format( SwTextFormatInfo &rInf ) override;
virtual void Paint( const SwTextPaintInfo &rInf ) const override;
- virtual sal_uInt16 GetViewWidth( const SwTextSizeInfo &rInf ) const
override;
virtual bool GetExpText( const SwTextSizeInfo &rInf, OUString &rText )
const override;
virtual SwPosSize GetTextSize( const SwTextSizeInfo &rInfo ) const
override;
};
diff --git a/sw/source/core/undo/docundo.cxx b/sw/source/core/undo/docundo.cxx
index 7b98290..56c9e3a 100644
--- a/sw/source/core/undo/docundo.cxx
+++ b/sw/source/core/undo/docundo.cxx
@@ -493,13 +493,6 @@ SwUndo * UndoManager::RemoveLastUndo()
// svl::IUndoManager
-void UndoManager::EnableUndo(bool bEnable)
-{
- // SdrUndoManager does not have a counter anymore, but reverted to the old
behavior of
- // having a simple boolean flag for locking. So, simply forward.
- SdrUndoManager::EnableUndo(bEnable);
-}
-
void UndoManager::AddUndoAction(SfxUndoAction *pAction, bool bTryMerge)
{
SwUndo *const pUndo( dynamic_cast<SwUndo *>(pAction) );
diff --git a/sw/source/ui/dbui/mailmergewizard.cxx
b/sw/source/ui/dbui/mailmergewizard.cxx
index 9a0ff90..dc4a8bd 100644
--- a/sw/source/ui/dbui/mailmergewizard.cxx
+++ b/sw/source/ui/dbui/mailmergewizard.cxx
@@ -246,9 +246,4 @@ short SwMailMergeWizard::Execute()
return RET_CANCEL;
}
-void SwMailMergeWizard::StartExecuteModal( const Link<Dialog&, void>&
rEndDialogHdl )
-{
- ::svt::RoadmapWizard::StartExecuteModal( rEndDialogHdl );
-}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/dialog/wordcountdialog.cxx
b/sw/source/ui/dialog/wordcountdialog.cxx
index 6de40a8..e33535c 100644
--- a/sw/source/ui/dialog/wordcountdialog.cxx
+++ b/sw/source/ui/dialog/wordcountdialog.cxx
@@ -157,11 +157,6 @@ SwWordCountFloatDlg::SwWordCountFloatDlg(SfxBindings*
_pBindings,
m_pClosePB->GrabFocus();
}
-void SwWordCountFloatDlg::Activate()
-{
- SfxModelessDialog::Activate();
-}
-
void SwWordCountFloatDlg::UpdateCounts()
{
SwWrtShell &rSh = ::GetActiveView()->GetWrtShell();
diff --git a/sw/source/uibase/inc/mailmergewizard.hxx
b/sw/source/uibase/inc/mailmergewizard.hxx
index 8ca75562..f1b61c7 100644
--- a/sw/source/uibase/inc/mailmergewizard.hxx
+++ b/sw/source/uibase/inc/mailmergewizard.hxx
@@ -83,7 +83,6 @@ public:
void updateRoadmapItemLabel( WizardState _nState );
virtual short Execute() override;
- virtual void StartExecuteModal( const Link<Dialog&,void>&
rEndDialogHdl ) override;
};
#endif
diff --git a/sw/source/uibase/inc/wordcountdialog.hxx
b/sw/source/uibase/inc/wordcountdialog.hxx
index dde6068..da92684 100644
--- a/sw/source/uibase/inc/wordcountdialog.hxx
+++ b/sw/source/uibase/inc/wordcountdialog.hxx
@@ -28,7 +28,6 @@ struct SwDocStat;
class SwWordCountFloatDlg : public SfxModelessDialog
{
- virtual void Activate() override;
void SetValues(const SwDocStat& rCurrent, const SwDocStat& rDoc);
void showCJK(bool bShowCJK);
void showStandardizedPages(bool bShowStandardizedPages);
diff --git a/sw/source/uibase/sidebar/PagePropertyPanel.cxx
b/sw/source/uibase/sidebar/PagePropertyPanel.cxx
index 508cb3e..7a3db1d 100644
--- a/sw/source/uibase/sidebar/PagePropertyPanel.cxx
+++ b/sw/source/uibase/sidebar/PagePropertyPanel.cxx
@@ -57,10 +57,6 @@ PagePropertyPanel::~PagePropertyPanel()
disposeOnce();
}
-void PagePropertyPanel::dispose()
-{
- PanelLayout::dispose();
-}
} } // end of namespace ::sw::sidebar
diff --git a/sw/source/uibase/sidebar/PagePropertyPanel.hxx
b/sw/source/uibase/sidebar/PagePropertyPanel.hxx
index f744014..450d353 100644
--- a/sw/source/uibase/sidebar/PagePropertyPanel.hxx
+++ b/sw/source/uibase/sidebar/PagePropertyPanel.hxx
@@ -54,7 +54,6 @@ namespace sw { namespace sidebar {
SfxBindings* pBindings );
private:
virtual ~PagePropertyPanel() override;
- virtual void dispose() override;
};
} } // end of namespace ::sw::sidebar
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
