diff options
-rw-r--r-- | accessibility/inc/standard/svtaccessiblenumericfield.hxx | 3 | ||||
-rw-r--r-- | include/formula/token.hxx | 2 | ||||
-rw-r--r-- | include/oox/shape/ShapeContextHandler.hxx | 4 | ||||
-rw-r--r-- | package/inc/ZipPackageFolder.hxx | 2 | ||||
-rw-r--r-- | sfx2/source/inc/StyleList.hxx | 2 | ||||
-rw-r--r-- | starmath/inc/document.hxx | 2 | ||||
-rw-r--r-- | starmath/inc/smediteng.hxx | 2 | ||||
-rw-r--r-- | starmath/inc/view.hxx | 8 | ||||
-rw-r--r-- | svl/source/inc/fsfactory.hxx | 2 | ||||
-rw-r--r-- | svtools/inc/mousefunction.hxx | 6 | ||||
-rw-r--r-- | sw/source/core/inc/UndoOverwrite.hxx | 4 | ||||
-rw-r--r-- | vcl/inc/pdf/pdfwriter_impl.hxx | 5 | ||||
-rw-r--r-- | vcl/inc/unx/saldisp.hxx | 18 |
13 files changed, 28 insertions, 32 deletions
diff --git a/accessibility/inc/standard/svtaccessiblenumericfield.hxx b/accessibility/inc/standard/svtaccessiblenumericfield.hxx index 30688979c8a9..fb3b30e594fb 100644 --- a/accessibility/inc/standard/svtaccessiblenumericfield.hxx +++ b/accessibility/inc/standard/svtaccessiblenumericfield.hxx @@ -26,7 +26,8 @@ typedef ::cppu::ImplHelper1<css::accessibility::XAccessibleValue> SVTXAccessibleNumericField_BASE; -class SVTXAccessibleNumericField : public VCLXAccessibleEdit, public SVTXAccessibleNumericField_BASE +class SVTXAccessibleNumericField final : public VCLXAccessibleEdit, + public SVTXAccessibleNumericField_BASE { public: SVTXAccessibleNumericField(VCLXWindow* pVCLXindow); diff --git a/include/formula/token.hxx b/include/formula/token.hxx index 77bf3eeb90ea..ebb08e6d7c17 100644 --- a/include/formula/token.hxx +++ b/include/formula/token.hxx @@ -226,7 +226,7 @@ inline void intrusive_ptr_release(const FormulaToken* p) p->DecRef(); } -class FORMULA_DLLPUBLIC FormulaSpaceToken : public FormulaToken +class FORMULA_DLLPUBLIC FormulaSpaceToken final : public FormulaToken { private: sal_uInt8 nByte; diff --git a/include/oox/shape/ShapeContextHandler.hxx b/include/oox/shape/ShapeContextHandler.hxx index 3b5e50955ceb..dadaf7f64cb3 100644 --- a/include/oox/shape/ShapeContextHandler.hxx +++ b/include/oox/shape/ShapeContextHandler.hxx @@ -34,7 +34,7 @@ namespace oox::shape { class ShapeFilterBase; -class ShapeFragmentHandler : public core::FragmentHandler2 +class ShapeFragmentHandler final : public core::FragmentHandler2 { public: typedef rtl::Reference<ShapeFragmentHandler> Pointer_t; @@ -46,7 +46,7 @@ public: } }; -class OOX_DLLPUBLIC ShapeContextHandler: +class OOX_DLLPUBLIC ShapeContextHandler final : public ::cppu::WeakImplHelper< css::xml::sax::XFastContextHandler > { public: diff --git a/package/inc/ZipPackageFolder.hxx b/package/inc/ZipPackageFolder.hxx index 75889a6b14f4..21ff8343c252 100644 --- a/package/inc/ZipPackageFolder.hxx +++ b/package/inc/ZipPackageFolder.hxx @@ -58,7 +58,7 @@ struct ZipContentInfo typedef std::unordered_map < OUString, ZipContentInfo > ContentHash; -class ZipPackageFolder : public cppu::ImplInheritanceHelper +class ZipPackageFolder final : public cppu::ImplInheritanceHelper < ZipPackageEntry, css::container::XNameContainer, diff --git a/sfx2/source/inc/StyleList.hxx b/sfx2/source/inc/StyleList.hxx index 238655da889a..3b46371c6813 100644 --- a/sfx2/source/inc/StyleList.hxx +++ b/sfx2/source/inc/StyleList.hxx @@ -45,7 +45,7 @@ class TreeViewDropTarget; constexpr int MAX_FAMILIES = 6; constexpr int COUNT_BOUND_FUNC = 14; -class StyleList : public SfxListener +class StyleList final : public SfxListener { friend class TreeViewDropTarget; friend class SfxTemplateControllerItem; diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx index 77d13aa77d08..772b66748fb4 100644 --- a/starmath/inc/document.hxx +++ b/starmath/inc/document.hxx @@ -73,7 +73,7 @@ public: }; -class SM_DLLPUBLIC SmDocShell : public SfxObjectShell, public SfxListener +class SM_DLLPUBLIC SmDocShell final : public SfxObjectShell, public SfxListener { friend class SmPrinterAccess; friend class SmCursor; diff --git a/starmath/inc/smediteng.hxx b/starmath/inc/smediteng.hxx index 29902361b585..4e0b3162a811 100644 --- a/starmath/inc/smediteng.hxx +++ b/starmath/inc/smediteng.hxx @@ -11,7 +11,7 @@ #include <editeng/fontitem.hxx> #include <unotools/lingucfg.hxx> -class SmEditEngine : public EditEngine +class SmEditEngine final : public EditEngine { public: SmEditEngine(SfxItemPool* pItemPool); diff --git a/starmath/inc/view.hxx b/starmath/inc/view.hxx index e0a939478d2d..8d54cac903c5 100644 --- a/starmath/inc/view.hxx +++ b/starmath/inc/view.hxx @@ -181,7 +181,7 @@ public: virtual void StateChangedAtToolBoxControl(sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState) override; }; -class SmCmdBoxWindow : public SfxDockingWindow +class SmCmdBoxWindow final : public SfxDockingWindow { std::unique_ptr<SmEditWindow, o3tl::default_delete<SmEditWindow>> m_xEdit; SmEditController aController; @@ -191,8 +191,6 @@ class SmCmdBoxWindow : public SfxDockingWindow DECL_LINK(InitialFocusTimerHdl, Timer *, void); -protected: - virtual Size CalcDockingSize(SfxChildAlignment eAlign) override; virtual SfxChildAlignment CheckAlignment(SfxChildAlignment eActual, SfxChildAlignment eWish) override; @@ -237,7 +235,7 @@ public: namespace sfx2 { class FileDialogHelper; } -class SmViewShell: public SfxViewShell +class SmViewShell final : public SfxViewShell { std::unique_ptr<sfx2::DocumentInserter> mpDocInserter; std::unique_ptr<SfxRequest> mpRequest; @@ -254,8 +252,6 @@ class SmViewShell: public SfxViewShell DECL_LINK( DialogClosedHdl, sfx2::FileDialogHelper*, void ); virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; -protected: - static Size GetTextLineSize(OutputDevice const & rDevice, const OUString& rLine); static Size GetTextSize(OutputDevice const & rDevice, diff --git a/svl/source/inc/fsfactory.hxx b/svl/source/inc/fsfactory.hxx index dd053f6d636f..450337639b9d 100644 --- a/svl/source/inc/fsfactory.hxx +++ b/svl/source/inc/fsfactory.hxx @@ -26,7 +26,7 @@ #include <cppuhelper/implbase.hxx> #include <osl/diagnose.h> -class FSStorageFactory : public ::cppu::WeakImplHelper< css::lang::XSingleServiceFactory, +class FSStorageFactory final : public ::cppu::WeakImplHelper< css::lang::XSingleServiceFactory, css::lang::XServiceInfo > { css::uno::Reference< css::uno::XComponentContext > m_xContext; diff --git a/svtools/inc/mousefunction.hxx b/svtools/inc/mousefunction.hxx index 979a2b6c463f..00313b0f4497 100644 --- a/svtools/inc/mousefunction.hxx +++ b/svtools/inc/mousefunction.hxx @@ -61,7 +61,7 @@ protected: //= ColumnResize -class ColumnResize : public MouseFunction +class ColumnResize final : public MouseFunction { public: ColumnResize() @@ -84,7 +84,7 @@ private: //= RowSelection -class RowSelection : public MouseFunction +class RowSelection final : public MouseFunction { public: RowSelection() @@ -107,7 +107,7 @@ private: //= ColumnSortHandler -class ColumnSortHandler : public MouseFunction +class ColumnSortHandler final : public MouseFunction { public: ColumnSortHandler() diff --git a/sw/source/core/inc/UndoOverwrite.hxx b/sw/source/core/inc/UndoOverwrite.hxx index f348ecd6c79f..5f9d59d4f2fb 100644 --- a/sw/source/core/inc/UndoOverwrite.hxx +++ b/sw/source/core/inc/UndoOverwrite.hxx @@ -31,7 +31,7 @@ namespace utl { class TransliterationWrapper; } -class SwUndoOverwrite: public SwUndo, private SwUndoSaveContent +class SwUndoOverwrite final : public SwUndo, private SwUndoSaveContent { OUString m_aDelStr, m_aInsStr; std::unique_ptr<SwRedlineSaveDatas> m_pRedlSaveData; @@ -66,7 +66,7 @@ public: }; struct UndoTransliterate_Data; -class SwUndoTransliterate : public SwUndo, public SwUndRng +class SwUndoTransliterate final : public SwUndo, public SwUndRng { std::vector< std::unique_ptr<UndoTransliterate_Data> > m_aChanges; TransliterationFlags m_nType; diff --git a/vcl/inc/pdf/pdfwriter_impl.hxx b/vcl/inc/pdf/pdfwriter_impl.hxx index ff714e3d3b76..3accc4d4488e 100644 --- a/vcl/inc/pdf/pdfwriter_impl.hxx +++ b/vcl/inc/pdf/pdfwriter_impl.hxx @@ -624,7 +624,7 @@ enum class Mode { DEFAULT, NOWRITE }; } -class PDFWriterImpl : public VirtualDevice, public PDFObjectContainer +class PDFWriterImpl final : public VirtualDevice, public PDFObjectContainer { friend class PDFStreamIf; @@ -641,14 +641,13 @@ public: static void convertLineInfoToExtLineInfo( const LineInfo& rIn, PDFWriter::ExtLineInfo& rOut ); -protected: +private: bool ImplNewFont() const override; void ImplClearFontData(bool bNewFontLists) override; void ImplRefreshFontData(bool bNewFontLists) override; vcl::Region ClipToDeviceBounds(vcl::Region aRegion) const override; void DrawHatchLine_DrawLine(const Point& rStartPoint, const Point& rEndPoint) override; -private: MapMode m_aMapMode; // PDFWriterImpl scaled units std::vector< PDFPage > m_aPages; /* maps object numbers to file offsets (needed for xref) */ diff --git a/vcl/inc/unx/saldisp.hxx b/vcl/inc/unx/saldisp.hxx index 59d02f394da0..3ec499ff1ee5 100644 --- a/vcl/inc/unx/saldisp.hxx +++ b/vcl/inc/unx/saldisp.hxx @@ -178,23 +178,23 @@ protected: public: SalXLib(); - virtual ~SalXLib(); - virtual void Init(); + ~SalXLib(); + void Init(); - virtual bool Yield( bool bWait, bool bHandleAllCurrentEvents ); - virtual void Wakeup(); + bool Yield( bool bWait, bool bHandleAllCurrentEvents ); + void Wakeup(); void TriggerUserEventProcessing(); - virtual void Insert( int fd, void* data, + void Insert( int fd, void* data, YieldFunc pending, YieldFunc queued, YieldFunc handle ); - virtual void Remove( int fd ); + void Remove( int fd ); - virtual void StartTimer( sal_uInt64 nMS ); - virtual void StopTimer(); + void StartTimer( sal_uInt64 nMS ); + void StopTimer(); - virtual bool CheckTimeout( bool bExecuteTimers = true ); + bool CheckTimeout( bool bExecuteTimers = true ); SalI18N_InputMethod* GetInputMethod() const { return m_pInputMethod.get(); } Display* GetDisplay() const { return m_pDisplay; } |