include/drawinglayer/primitive2d/textprimitive2d.hxx | 2 +- include/sfx2/tabdlg.hxx | 4 ++-- include/vcl/window.hxx | 4 ++-- sd/source/ui/inc/unomodel.hxx | 2 +- sw/source/writerfilter/ooxml/OOXMLPropertySet.hxx | 2 +- vcl/inc/salinst.hxx | 1 - vcl/inc/unx/geninst.h | 1 - vcl/ios/dummies.cxx | 4 ---- vcl/unx/generic/print/genprnpsp.cxx | 5 ----- 9 files changed, 7 insertions(+), 18 deletions(-)
New commits: commit 18c2199537b405dfb549d44ee1d29a58105ec86c Author: Noel Grandin <[email protected]> AuthorDate: Mon Dec 2 12:08:32 2024 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Mon Dec 2 14:00:55 2024 +0100 loplugin:unnecessaryvirtual Change-Id: Ie010deb5cdf9da20f2ca60d79feabf1c0de93c57 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/177669 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/include/drawinglayer/primitive2d/textprimitive2d.hxx b/include/drawinglayer/primitive2d/textprimitive2d.hxx index a71c24732d45..878ef9d8291c 100644 --- a/include/drawinglayer/primitive2d/textprimitive2d.hxx +++ b/include/drawinglayer/primitive2d/textprimitive2d.hxx @@ -179,7 +179,7 @@ public: virtual bool hasTextRelief() const; virtual bool hasShadow() const; virtual bool hasTextDecoration() const; - virtual bool hasOutline() const; + bool hasOutline() const; /// compare operator virtual bool operator==(const BasePrimitive2D& rPrimitive) const override; diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index 336fe80c11dd..b63bac0db100 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.hxx @@ -265,8 +265,8 @@ public: virtual void FillUserData(); virtual bool IsReadOnly() const; // Whether the user has canceled the dialog. Allows to restore settings, etc. - virtual bool IsCancelMode() { return mbCancel; } - virtual void SetCancelMode(bool bCancel) { mbCancel = bCancel; } + bool IsCancelMode() { return mbCancel; } + void SetCancelMode(bool bCancel) { mbCancel = bCancel; } virtual void PageCreated (const SfxAllItemSet& aSet); virtual void ChangesApplied(); static const SfxPoolItem* GetItem( const SfxItemSet& rSet, sal_uInt16 nSlot, bool bDeep = true ); diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 008415417350..a9a6ac6eee3a 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -1122,8 +1122,8 @@ public: /// Use OS specific way to bring user attention to current window virtual void FlashWindow() const; - virtual void SetTaskBarProgress(int nCurrentProgress); - virtual void SetTaskBarState(VclTaskBarStates eTaskBarState); + void SetTaskBarProgress(int nCurrentProgress); + void SetTaskBarState(VclTaskBarStates eTaskBarState); /** @name Accessibility */ diff --git a/sd/source/ui/inc/unomodel.hxx b/sd/source/ui/inc/unomodel.hxx index 91d4fd87be94..13a2635c781a 100644 --- a/sd/source/ui/inc/unomodel.hxx +++ b/sd/source/ui/inc/unomodel.hxx @@ -405,7 +405,7 @@ public: virtual void SAL_CALL removeEventListener( const css::uno::Reference< css::lang::XEventListener >& aListener ) override; private: - virtual css::uno::Reference< ::css::drawing::XDrawPage > insertNewImpl( sal_Int32 nIndex, std::optional<OUString> oName ); + css::uno::Reference< ::css::drawing::XDrawPage > insertNewImpl( sal_Int32 nIndex, std::optional<OUString> oName ); }; /*********************************************************************** diff --git a/sw/source/writerfilter/ooxml/OOXMLPropertySet.hxx b/sw/source/writerfilter/ooxml/OOXMLPropertySet.hxx index 3fc77dc5bc20..c23d57ed8c71 100644 --- a/sw/source/writerfilter/ooxml/OOXMLPropertySet.hxx +++ b/sw/source/writerfilter/ooxml/OOXMLPropertySet.hxx @@ -67,7 +67,7 @@ public: #ifdef DBG_UTIL virtual std::string toString() const override; #endif - virtual OOXMLValue* clone() const; + OOXMLValue* clone() const; private: typedef std::variant<std::monostate, // diff --git a/vcl/inc/salinst.hxx b/vcl/inc/salinst.hxx index 1fbe86285054..b8549b23fc5f 100644 --- a/vcl/inc/salinst.hxx +++ b/vcl/inc/salinst.hxx @@ -195,7 +195,6 @@ public: // callbacks for printer updates virtual void updatePrinterUpdate() {} - virtual void jobEndedPrinterUpdate() {} /// Set the app's (somewhat) magic/main-thread to this one. virtual void updateMainThread() {} diff --git a/vcl/inc/unx/geninst.h b/vcl/inc/unx/geninst.h index 32f0a61d1cc7..423047ae2106 100644 --- a/vcl/inc/unx/geninst.h +++ b/vcl/inc/unx/geninst.h @@ -63,7 +63,6 @@ public: virtual OUString GetDefaultPrinter() override; virtual void PostPrintersChanged() = 0; virtual void updatePrinterUpdate() override; - virtual void jobEndedPrinterUpdate() override; bool isPrinterInit() const { return mbPrinterInit; } virtual std::unique_ptr<GenPspGraphics> CreatePrintGraphics() = 0; diff --git a/vcl/ios/dummies.cxx b/vcl/ios/dummies.cxx index a1d3cbcb674e..42ecc363e35d 100644 --- a/vcl/ios/dummies.cxx +++ b/vcl/ios/dummies.cxx @@ -99,10 +99,6 @@ void SalGenericInstance::updatePrinterUpdate() { } -void SalGenericInstance::jobEndedPrinterUpdate() -{ -} - using namespace psp; bool AquaGraphicsBackend::drawNativeControl(ControlType /* nType */, diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx index b9dd1ec6f465..bbba1230b624 100644 --- a/vcl/unx/generic/print/genprnpsp.cxx +++ b/vcl/unx/generic/print/genprnpsp.cxx @@ -721,7 +721,6 @@ bool PspSalPrinter::StartJob( bool PspSalPrinter::EndJob() { - GetSalInstance()->jobEndedPrinterUpdate(); return true; } @@ -1035,8 +1034,4 @@ void SalGenericInstance::updatePrinterUpdate() PostPrintersChanged(); } -void SalGenericInstance::jobEndedPrinterUpdate() -{ -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
