diff options
Diffstat (limited to 'sw')
44 files changed, 90 insertions, 153 deletions
diff --git a/sw/inc/SwStyleNameMapper.hxx b/sw/inc/SwStyleNameMapper.hxx index 769360f5f605..138e855030c4 100644 --- a/sw/inc/SwStyleNameMapper.hxx +++ b/sw/inc/SwStyleNameMapper.hxx @@ -75,12 +75,11 @@ struct SwTableEntry; typedef std::unordered_map<OUString, sal_uInt16> NameToIdHash; -class SwStyleNameMapper +class SwStyleNameMapper final { friend void InitCore(); friend void FinitCore(); -protected: // UI Name tables static std::vector<OUString> *s_pTextUINameArray, *s_pListsUINameArray, diff --git a/sw/inc/colwd.hxx b/sw/inc/colwd.hxx index 13684ac833c4..5f6c5380dc9e 100644 --- a/sw/inc/colwd.hxx +++ b/sw/inc/colwd.hxx @@ -26,13 +26,12 @@ class SwTableFUNC; -class SwTableWidthDlg : public SvxStandardDialog +class SwTableWidthDlg final : public SvxStandardDialog { VclPtr<NumericField> m_pColNF; VclPtr<MetricField> m_pWidthMF; SwTableFUNC &rFnc; -protected: virtual void Apply() override; DECL_LINK(LoseFocusHdl, Edit&, void); diff --git a/sw/inc/dpage.hxx b/sw/inc/dpage.hxx index f733280806d1..f905f6834627 100644 --- a/sw/inc/dpage.hxx +++ b/sw/inc/dpage.hxx @@ -27,7 +27,7 @@ class SdrPageGridFrameList; class SwDrawModel; class SwDoc; -class SwDPage : public FmFormPage, public SdrObjUserCall +class SwDPage final : public FmFormPage, public SdrObjUserCall { SwDPage &operator=(const SwDPage&) = delete; @@ -53,10 +53,9 @@ public: virtual css::uno::Reference< css::uno::XInterface > createUnoPage() override; -protected: +private: void lateInit(const SwDPage& rPage, SwDrawModel* pNewModel); -private: SwDPage(const SwDPage& rSrcPage); }; diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx index 5511ccd7d022..35984ebe90bb 100644 --- a/sw/inc/fmtcol.hxx +++ b/sw/inc/fmtcol.hxx @@ -134,10 +134,10 @@ public: void dumpAsXml(struct _xmlTextWriter* pWriter) const; }; -class SwGrfFormatColl: public SwFormatColl +class SwGrfFormatColl final : public SwFormatColl { friend class SwDoc; -protected: + SwGrfFormatColl( SwAttrPool& rPool, const sal_Char* pFormatCollName, SwGrfFormatColl* pDerFrom = nullptr ) : SwFormatColl( rPool, pFormatCollName, aGrfFormatCollSetRange, @@ -149,8 +149,6 @@ protected: : SwFormatColl( rPool, rFormatCollName, aGrfFormatCollSetRange, pDerFrom, RES_GRFFMTCOLL ) {} - -public: }; // FEATURE::CONDCOLL @@ -200,11 +198,11 @@ public: using SwFormatCollConditions = std::vector<std::unique_ptr<SwCollCondition>>; -class SW_DLLPUBLIC SwConditionTextFormatColl : public SwTextFormatColl +class SW_DLLPUBLIC SwConditionTextFormatColl final : public SwTextFormatColl { friend class SwDoc; friend class ::sw::DocumentStylePoolManager; -protected: + SwFormatCollConditions m_CondColls; SwConditionTextFormatColl( SwAttrPool& rPool, const OUString &rFormatCollName, diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx index 6c2de6c35e20..be17d8355497 100644 --- a/sw/inc/frmfmt.hxx +++ b/sw/inc/frmfmt.hxx @@ -177,7 +177,7 @@ public: // The FlyFrame-Format -class SW_DLLPUBLIC SwFlyFrameFormat: public SwFrameFormat +class SW_DLLPUBLIC SwFlyFrameFormat final : public SwFrameFormat { friend class SwDoc; OUString msTitle; @@ -193,8 +193,8 @@ class SW_DLLPUBLIC SwFlyFrameFormat: public SwFrameFormat SwFlyFrameFormat( const SwFlyFrameFormat &rCpy ) = delete; SwFlyFrameFormat &operator=( const SwFlyFrameFormat &rCpy ) = delete; -protected: SwFlyFrameFormat( SwAttrPool& rPool, const OUString &rFormatNm, SwFrameFormat *pDrvdFrame ); + public: virtual ~SwFlyFrameFormat() override; diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx index fbc56be1e810..ecb4432bdd76 100644 --- a/sw/inc/ndarr.hxx +++ b/sw/inc/ndarr.hxx @@ -90,7 +90,7 @@ public: struct SwTableToTextSave; using SwTableToTextSaves = std::vector<std::unique_ptr<SwTableToTextSave>>; -class SW_DLLPUBLIC SwNodes +class SW_DLLPUBLIC SwNodes final : private BigPtrArray { friend class SwDoc; @@ -135,7 +135,6 @@ class SW_DLLPUBLIC SwNodes SwNodes(SwNodes const&) = delete; SwNodes& operator=(SwNodes const&) = delete; -protected: SwNodes( SwDoc* pDoc ); public: diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx index a70e4a24fd5f..9186d4cd9d26 100644 --- a/sw/inc/swmodule.hxx +++ b/sw/inc/swmodule.hxx @@ -69,7 +69,7 @@ namespace com{ namespace sun{ namespace star{ namespace scanner{ class XScannerManager2; }}}} -class SW_DLLPUBLIC SwModule: public SfxModule, public SfxListener, public utl::ConfigurationListener +class SW_DLLPUBLIC SwModule final : public SfxModule, public SfxListener, public utl::ConfigurationListener { OUString m_sActAuthor; @@ -115,7 +115,6 @@ class SW_DLLPUBLIC SwModule: public SfxModule, public SfxListener, public utl::C virtual void ConfigurationChanged( utl::ConfigurationBroadcaster*, ConfigurationHints ) override; -protected: // Envelopes, labels. void InsertEnv(SfxRequest&); void InsertLab(SfxRequest&, bool bLabel); diff --git a/sw/inc/swserv.hxx b/sw/inc/swserv.hxx index 4c51c8785940..0fa076c208f7 100644 --- a/sw/inc/swserv.hxx +++ b/sw/inc/swserv.hxx @@ -28,11 +28,10 @@ class SwTableNode; struct SwPosition; class SwPaM; -class SwServerObject : public ::sfx2::SvLinkSource +class SwServerObject final : public ::sfx2::SvLinkSource { using sfx2::SvLinkSource::SendDataChanged; -protected: enum ServerModes { BOOKMARK_SERVER, TABLE_SERVER, SECTION_SERVER, NONE_SERVER } eType; union { ::sw::mark::IMark* pBkmk; diff --git a/sw/inc/swtblfmt.hxx b/sw/inc/swtblfmt.hxx index 51fdeb49d208..6a5765fb9b9f 100644 --- a/sw/inc/swtblfmt.hxx +++ b/sw/inc/swtblfmt.hxx @@ -23,11 +23,10 @@ class SwDoc; -class SW_DLLPUBLIC SwTableFormat : public SwFrameFormat +class SW_DLLPUBLIC SwTableFormat final : public SwFrameFormat { friend class SwDoc; -protected: SwTableFormat( SwAttrPool& rPool, const OUString &rFormatNm, SwFrameFormat *pDrvdFrame ) : SwFrameFormat( rPool, rFormatNm, pDrvdFrame, RES_FRMFMT, aTableSetRange ) @@ -40,11 +39,10 @@ public: virtual bool supportsFullDrawingLayerFillAttributeSet() const override; }; -class SwTableLineFormat : public SwFrameFormat +class SwTableLineFormat final : public SwFrameFormat { friend class SwDoc; -protected: SwTableLineFormat( SwAttrPool& rPool, SwFrameFormat *pDrvdFrame ) : SwFrameFormat( rPool, OUString(), pDrvdFrame, RES_FRMFMT, aTableLineSetRange ) {} @@ -56,11 +54,10 @@ public: virtual bool supportsFullDrawingLayerFillAttributeSet() const override; }; -class SW_DLLPUBLIC SwTableBoxFormat : public SwFrameFormat +class SW_DLLPUBLIC SwTableBoxFormat final : public SwFrameFormat { friend class SwDoc; -protected: SwTableBoxFormat( SwAttrPool& rPool, SwFrameFormat *pDrvdFrame ) : SwFrameFormat( rPool, OUString(), pDrvdFrame, RES_FRMFMT, aTableBoxSetRange ) {} diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx index 44e27f6434b6..1c642296eceb 100644 --- a/sw/inc/unoframe.hxx +++ b/sw/inc/unoframe.hxx @@ -169,11 +169,10 @@ typedef cppu::WeakImplHelper > SwXTextFrameBaseClass; -class SwXTextFrame : public SwXTextFrameBaseClass, +class SwXTextFrame final : public SwXTextFrameBaseClass, public SwXText, public SwXFrame { -protected: friend class SwXFrame; // just for CreateXFrame virtual const SwStartNode *GetStartNode() const override; @@ -247,9 +246,8 @@ typedef cppu::ImplInheritanceHelper css::document::XEventsSupplier > SwXTextGraphicObjectBaseClass; -class SwXTextGraphicObject : public SwXTextGraphicObjectBaseClass +class SwXTextGraphicObject final : public SwXTextGraphicObjectBaseClass { -protected: friend class SwXFrame; // just for CreateXFrame virtual ~SwXTextGraphicObject() override; @@ -281,10 +279,10 @@ typedef cppu::ImplInheritanceHelper css::document::XEventsSupplier > SwXTextEmbeddedObjectBaseClass; -class SwXTextEmbeddedObject : public SwXTextEmbeddedObjectBaseClass +class SwXTextEmbeddedObject final : public SwXTextEmbeddedObjectBaseClass { css::uno::Reference<css::util::XModifyListener> m_xOLEListener; -protected: + friend class SwXFrame; // just for CreateXFrame virtual ~SwXTextEmbeddedObject() override; diff --git a/sw/inc/unotextbodyhf.hxx b/sw/inc/unotextbodyhf.hxx index 91fcaab8b5e7..49851d55b88e 100644 --- a/sw/inc/unotextbodyhf.hxx +++ b/sw/inc/unotextbodyhf.hxx @@ -98,18 +98,13 @@ typedef ::cppu::WeakImplHelper , css::container::XEnumerationAccess > SwXHeadFootText_Base; -class SwXHeadFootText +class SwXHeadFootText final : public SwXHeadFootText_Base , public SwXText { - -private: - class Impl; ::sw::UnoImplPtr<Impl> m_pImpl; -protected: - virtual const SwStartNode *GetStartNode() const override; virtual css::uno::Reference< css::text::XTextCursor > CreateCursor() override; diff --git a/sw/source/core/crsr/overlayrangesoutline.hxx b/sw/source/core/crsr/overlayrangesoutline.hxx index 997a4c48fa0b..3621f7fe664c 100644 --- a/sw/source/core/crsr/overlayrangesoutline.hxx +++ b/sw/source/core/crsr/overlayrangesoutline.hxx @@ -30,7 +30,6 @@ namespace sw { class OverlayRangesOutline : public sdr::overlay::OverlayObject { - protected: // geometry of overlay std::vector< basegfx::B2DRange > maRanges; diff --git a/sw/source/core/inc/SwXMLTextBlocks.hxx b/sw/source/core/inc/SwXMLTextBlocks.hxx index d164d5249554..bce940971467 100644 --- a/sw/source/core/inc/SwXMLTextBlocks.hxx +++ b/sw/source/core/inc/SwXMLTextBlocks.hxx @@ -37,9 +37,8 @@ namespace o3tl { template<> struct typed_flags<SwXmlFlags> : is_typed_flags<SwXmlFlags, 0x0002> {}; } -class SwXMLTextBlocks : public SwImpBlocks +class SwXMLTextBlocks final : public SwImpBlocks { -protected: SfxObjectShellRef xDocShellRef; SwXmlFlags nFlags; OUString aPackageName; @@ -87,7 +86,6 @@ public: const SvxMacroTableDtor& rMacroTable ) override; virtual bool PutMuchEntries( bool bOn ) override; -public: SwDoc* GetDoc() const { return m_xDoc.get(); } //void SetDoc( SwDoc * pNewDoc); ErrCode StartPutBlock( const OUString& rShort, const OUString& rPackageName ); @@ -95,7 +93,6 @@ public: ErrCode GetBlockText( const OUString& rShort, OUString& rText ); ErrCode PutBlockText( const OUString& rShort, const OUString& rText, const OUString& rPackageName ); void MakeBlockText( const OUString& rText ); - }; #endif diff --git a/sw/source/core/inc/dumpfilter.hxx b/sw/source/core/inc/dumpfilter.hxx index 901fa79db575..6ebc6e8c9e83 100644 --- a/sw/source/core/inc/dumpfilter.hxx +++ b/sw/source/core/inc/dumpfilter.hxx @@ -22,7 +22,7 @@ namespace sw { document as XML. This filter should be mostly be used for testing purpose. */ - class LayoutDumpFilter : public cppu::WeakImplHelper + class LayoutDumpFilter final : public cppu::WeakImplHelper < css::document::XFilter, css::document::XExporter, @@ -30,7 +30,6 @@ namespace sw { css::lang::XServiceInfo > { - protected: css::uno::Reference< css::lang::XComponent > m_xSrcDoc; public: diff --git a/sw/source/core/inc/unobookmark.hxx b/sw/source/core/inc/unobookmark.hxx index 064f6c5a1dea..881cf227ec1b 100644 --- a/sw/source/core/inc/unobookmark.hxx +++ b/sw/source/core/inc/unobookmark.hxx @@ -175,20 +175,15 @@ class SwXFieldmarkParameters typedef cppu::ImplInheritanceHelper< SwXBookmark, css::text::XFormField > SwXFieldmark_Base; -class SwXFieldmark +class SwXFieldmark final : public SwXFieldmark_Base { - -private: ::sw::mark::ICheckboxFieldmark* getCheckboxFieldmark(); bool isReplacementObject; -protected: - SwXFieldmark(bool isReplacementObject, SwDoc* pDoc = nullptr); public: - static css::uno::Reference<css::text::XTextContent> CreateXFieldmark(SwDoc & rDoc, ::sw::mark::IMark * pMark, bool isReplacementObject = false); diff --git a/sw/source/core/inc/unofootnote.hxx b/sw/source/core/inc/unofootnote.hxx index 75b6513ac664..79014ecba86c 100644 --- a/sw/source/core/inc/unofootnote.hxx +++ b/sw/source/core/inc/unofootnote.hxx @@ -41,20 +41,15 @@ typedef ::cppu::WeakImplHelper , css::text::XFootnote > SwXFootnote_Base; -class SwXFootnote +class SwXFootnote final : public SwXFootnote_Base , public SwXText { - -private: - friend class SwXFootnotes; class Impl; ::sw::UnoImplPtr<Impl> m_pImpl; -protected: - virtual const SwStartNode *GetStartNode() const override; virtual css::uno::Reference< css::text::XTextCursor > CreateCursor() override; diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx index 2e20756477fa..2d6d46400af8 100644 --- a/sw/source/core/text/inftxt.hxx +++ b/sw/source/core/text/inftxt.hxx @@ -677,7 +677,7 @@ public: * Because rInf is restored again in the DTOR, we can do this. * You could call it a "logical const", if you wish. */ -class SwTextSlot +class SwTextSlot final { OUString aText; std::shared_ptr<vcl::TextLayoutCache> m_pOldCachedVclData; @@ -688,8 +688,8 @@ class SwTextSlot sal_Int32 nIdx; sal_Int32 nLen; bool bOn; -protected: SwTextSizeInfo *pInf; + public: // The replacement string originates either from the portion via GetExpText() // or from the rCh, if it is not empty. diff --git a/sw/source/core/text/txtpaint.hxx b/sw/source/core/text/txtpaint.hxx index 7959dfa834a0..567fe03204d4 100644 --- a/sw/source/core/text/txtpaint.hxx +++ b/sw/source/core/text/txtpaint.hxx @@ -23,12 +23,12 @@ class SwRect; // SwSaveClip #include <txtfrm.hxx> -class SwSaveClip +class SwSaveClip final { vcl::Region aClip; const bool bOn; bool bChg; -protected: + VclPtr<OutputDevice> pOut; void ChgClip_( const SwRect &rRect, const SwTextFrame* pFrame, bool bEnlargeRect ); diff --git a/sw/source/filter/inc/wrtswtbl.hxx b/sw/source/filter/inc/wrtswtbl.hxx index 7ecb70ca3237..ee1cbd771537 100644 --- a/sw/source/filter/inc/wrtswtbl.hxx +++ b/sw/source/filter/inc/wrtswtbl.hxx @@ -93,7 +93,7 @@ public: typedef std::vector<std::unique_ptr<SwWriteTableCell>> SwWriteTableCells; -class SW_DLLPUBLIC SwWriteTableRow +class SW_DLLPUBLIC SwWriteTableRow final { SwWriteTableCells m_Cells; ///< all cells of the rows const SvxBrushItem *pBackground; // background @@ -103,7 +103,6 @@ class SW_DLLPUBLIC SwWriteTableRow SwWriteTableRow & operator= (const SwWriteTableRow &) = delete; -protected: // GCC >= 3.4 needs accessible T (const T&) to pass T as const T& argument. SwWriteTableRow( const SwWriteTableRow & ); diff --git a/sw/source/filter/ww8/WW8FFData.hxx b/sw/source/filter/ww8/WW8FFData.hxx index 7a9d85cff82e..e1ea582b524c 100644 --- a/sw/source/filter/ww8/WW8FFData.hxx +++ b/sw/source/filter/ww8/WW8FFData.hxx @@ -28,7 +28,7 @@ class SvStream; namespace sw { -class WW8FFData +class WW8FFData final { private: // offset 0x4 @@ -62,7 +62,6 @@ private: std::vector< OUString > msListEntries; -protected: static void WriteOUString(SvStream * pStream, const OUString & rStr, bool bAddZero); public: diff --git a/sw/source/filter/ww8/rtfexportfilter.hxx b/sw/source/filter/ww8/rtfexportfilter.hxx index 38261b99685f..33ebfe26acf7 100644 --- a/sw/source/filter/ww8/rtfexportfilter.hxx +++ b/sw/source/filter/ww8/rtfexportfilter.hxx @@ -37,13 +37,12 @@ protected: }; /// The physical access to the RTF document (for writing). -class RtfExportFilter : public cppu::WeakImplHelper +class RtfExportFilter final : public cppu::WeakImplHelper < css::document::XFilter, css::document::XExporter > { -protected: css::uno::Reference<css::uno::XComponentContext> m_xCtx; css::uno::Reference<css::lang::XComponent> m_xSrcDoc; public: diff --git a/sw/source/filter/ww8/rtfsdrexport.hxx b/sw/source/filter/ww8/rtfsdrexport.hxx index 6b949d46a582..b8b84fdf3ede 100644 --- a/sw/source/filter/ww8/rtfsdrexport.hxx +++ b/sw/source/filter/ww8/rtfsdrexport.hxx @@ -35,7 +35,7 @@ class RtfAttributeOutput; class SwFrameFormat; /// Handles export of drawings using RTF markup -class RtfSdrExport : public EscherEx +class RtfSdrExport final : public EscherEx { RtfExport& m_rExport; @@ -71,7 +71,7 @@ public: /// Write editeng text, e.g. shape or comment. void WriteOutliner(const OutlinerParaObject& rParaObj, TextTypes eType); -protected: +private: /// Start the shape for which we just collected the information. /// /// Returns the element's tag number, -1 means we wrote nothing. @@ -86,8 +86,6 @@ protected: void Commit(EscherPropertyContainer& rProps, const tools::Rectangle& rRect) override; -private: - void OpenContainer(sal_uInt16 nEscherContainer, int nRecInstance = 0) override; void CloseContainer() override; @@ -96,7 +94,6 @@ private: void AddShape(sal_uInt32 nShapeType, ShapeFlag nShapeFlags, sal_uInt32 nShapeId = 0) override; -private: /// Add starting and ending point of a line to the m_pShapeAttrList. void AddLineDimensions(const tools::Rectangle& rRectangle); diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx index ba333b218dfe..ed2983f7d221 100644 --- a/sw/source/filter/ww8/ww8par.hxx +++ b/sw/source/filter/ww8/ww8par.hxx @@ -460,7 +460,7 @@ protected: SwFltStackEntry& rEntry ) override; }; -class SwWW8FltRefStack : public SwFltEndStack +class SwWW8FltRefStack final : public SwFltEndStack { public: SwWW8FltRefStack(SwDoc* pDo, sal_uLong nFieldFl) @@ -473,11 +473,10 @@ public: //mapped to their position, hopefully the same, but very possibly //an additional pseudo bookmark std::map<OUString, OUString, SwWW8::ltstr> aFieldVarNames; -protected: +private: SwFltStackEntry *RefToVar(const SwField* pField,SwFltStackEntry& rEntry); virtual void SetAttrInDoc(const SwPosition& rTmpPos, SwFltStackEntry& rEntry) override; -private: SwWW8FltRefStack(const SwWW8FltRefStack&) = delete; SwWW8FltRefStack& operator=(const SwWW8FltRefStack&) = delete; }; diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx index ba0f1e9efecf..416dac0239a4 100644 --- a/sw/source/filter/ww8/ww8scan.hxx +++ b/sw/source/filter/ww8/ww8scan.hxx @@ -1568,12 +1568,12 @@ public: sal_uInt16 GetCount() const { return cstd; } }; -class WW8Fonts +class WW8Fonts final { private: WW8Fonts(const WW8Fonts&) = delete; WW8Fonts& operator=(const WW8Fonts&) = delete; -protected: + std::unique_ptr<WW8_FFN[]> pFontA; // Array of Pointers to Font Description sal_uInt16 nMax; // Array-Size diff --git a/sw/source/filter/xml/xmlitmap.hxx b/sw/source/filter/xml/xmlitmap.hxx index bfb38e9f5218..8cc89046d00a 100644 --- a/sw/source/filter/xml/xmlitmap.hxx +++ b/sw/source/filter/xml/xmlitmap.hxx @@ -56,9 +56,8 @@ class SvXMLItemMapEntries_impl; /** this class manages an array of SvXMLItemMapEntry. It is used for optimizing the static array on startup of import or export */ -class SvXMLItemMapEntries : public SvRefBase +class SvXMLItemMapEntries final : public SvRefBase { -protected: std::unique_ptr<SvXMLItemMapEntries_impl> mpImpl; public: diff --git a/sw/source/uibase/docvw/AnchorOverlayObject.hxx b/sw/source/uibase/docvw/AnchorOverlayObject.hxx index 296856c82394..2ae993fb036e 100644 --- a/sw/source/uibase/docvw/AnchorOverlayObject.hxx +++ b/sw/source/uibase/docvw/AnchorOverlayObject.hxx @@ -37,7 +37,7 @@ enum class AnchorState Tri }; -class AnchorOverlayObject: public sdr::overlay::OverlayObjectWithBasePosition +class AnchorOverlayObject final : public sdr::overlay::OverlayObjectWithBasePosition { public: static AnchorOverlayObject* CreateAnchorOverlayObject( SwView const & rDocView, @@ -76,7 +76,7 @@ class AnchorOverlayObject: public sdr::overlay::OverlayObjectWithBasePosition void SetAnchorState( const AnchorState aState ); AnchorState GetAnchorState() const { return mAnchorState; } - protected: + private: /* 6------------7 1 / /4\ ---------------5 @@ -97,7 +97,6 @@ class AnchorOverlayObject: public sdr::overlay::OverlayObjectWithBasePosition // geometry creation for OverlayObject virtual drawinglayer::primitive2d::Primitive2DContainer createOverlayObjectPrimitive2DSequence() override; - private: // object's geometry basegfx::B2DPolygon maTriangle; basegfx::B2DPolygon maLine; diff --git a/sw/source/uibase/docvw/OverlayRanges.hxx b/sw/source/uibase/docvw/OverlayRanges.hxx index 14ffb950f6c2..5a4bdfc5966b 100644 --- a/sw/source/uibase/docvw/OverlayRanges.hxx +++ b/sw/source/uibase/docvw/OverlayRanges.hxx @@ -31,17 +31,8 @@ namespace sw { namespace overlay { - class OverlayRanges : public sdr::overlay::OverlayObject + class OverlayRanges final : public sdr::overlay::OverlayObject { - protected: - // geometry of overlay - std::vector< basegfx::B2DRange > maRanges; - - bool mbShowSolidBorder; - - // geometry creation for OverlayObject - virtual drawinglayer::primitive2d::Primitive2DContainer createOverlayObjectPrimitive2DSequence() override; - public: static OverlayRanges* CreateOverlayRange( SwView const & rDocView, @@ -69,6 +60,12 @@ namespace sw const std::vector< basegfx::B2DRange >& rRanges, const bool bShowSolidBorder ); + // geometry creation for OverlayObject + virtual drawinglayer::primitive2d::Primitive2DContainer createOverlayObjectPrimitive2DSequence() override; + + // geometry of overlay + std::vector< basegfx::B2DRange > maRanges; + bool mbShowSolidBorder; }; } // end of namespace overlay } // end of namespace sw diff --git a/sw/source/uibase/inc/conttree.hxx b/sw/source/uibase/inc/conttree.hxx index b1a7fa4c7034..4286fcd11d76 100644 --- a/sw/source/uibase/inc/conttree.hxx +++ b/sw/source/uibase/inc/conttree.hxx @@ -68,7 +68,7 @@ namespace o3tl { } /** TreeListBox for content indicator */ -class SwContentTree +class SwContentTree final : public SvTreeListBox , public SfxListener { @@ -125,7 +125,6 @@ class SwContentTree using SvTreeListBox::ExecuteDrop; using SvTreeListBox::EditEntry; -protected: virtual void RequestHelp( const HelpEvent& rHEvt ) override; virtual void InitEntry(SvTreeListEntry*, const OUString&, const Image&, const Image&, SvLBoxButtonKind) override; virtual void DataChanged( const DataChangedEvent& rDCEvt ) override; @@ -256,7 +255,7 @@ public: namespace sfx2 { class DocumentInserter; } namespace sfx2 { class FileDialogHelper; } -class SwGlobalTree : public SvTreeListBox +class SwGlobalTree final : public SvTreeListBox { private: VclPtr<SwNavigationPI> m_xDialog; @@ -285,8 +284,6 @@ private: using SvTreeListBox::ExecuteDrop; using Window::Update; -protected: - virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ) override; virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt ) override; diff --git a/sw/source/uibase/inc/docstdlg.hxx b/sw/source/uibase/inc/docstdlg.hxx index b1226638a794..4004aeab1ef0 100644 --- a/sw/source/uibase/inc/docstdlg.hxx +++ b/sw/source/uibase/inc/docstdlg.hxx @@ -26,7 +26,7 @@ #include <docstat.hxx> // DocInfo now as page -class SwDocStatPage: public SfxTabPage +class SwDocStatPage final : public SfxTabPage { public: SwDocStatPage(vcl::Window *pParent, const SfxItemSet &rSet); @@ -35,13 +35,12 @@ public: static VclPtr<SfxTabPage> Create(vcl::Window *pParent, const SfxItemSet *rSet); -protected: +private: virtual bool FillItemSet( SfxItemSet *rSet) override; virtual void Reset (const SfxItemSet *rSet) override; DECL_LINK(UpdateHdl, Button*, void); -private: VclPtr<FixedText> m_pPageNo; VclPtr<FixedText> m_pTableNo; VclPtr<FixedText> m_pGrfNo; diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx index f913ee6079fb..2956783d1a7c 100644 --- a/sw/source/uibase/inc/edtwin.hxx +++ b/sw/source/uibase/inc/edtwin.hxx @@ -55,7 +55,7 @@ enum class SdrHitKind; To translate the pixel positions from the buffer OutputDevice to the real pixel positions, use the PixelToLogic methods of this class. */ -class SwEditWin: public vcl::Window, +class SwEditWin final : public vcl::Window, public DropTargetHelper, public DragSourceHelper { static QuickHelpData* m_pQuickHlpData; @@ -173,8 +173,6 @@ class SwEditWin: public vcl::Window, void MoveCursor( SwWrtShell &rSh, const Point& rDocPos, const bool bOnlyText, bool bLockView ); -protected: - virtual void DataChanged( const DataChangedEvent& ) override; virtual void PrePaint(vcl::RenderContext& rRenderContext) override; virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect) override; @@ -202,8 +200,8 @@ protected: bool IsInHeaderFooter( const Point &rDocPt, FrameControlType &rControl ) const; bool IsOverHeaderFooterFly( const Point& rDocPos, FrameControlType& rControl, bool& bOverFly, bool& bPageAnchored ) const; -public: +public: virtual void KeyInput(const KeyEvent &rKEvt) override; void UpdatePointer(const Point &, sal_uInt16 nButtons = 0); diff --git a/sw/source/uibase/inc/glosbib.hxx b/sw/source/uibase/inc/glosbib.hxx index eb2ca5888665..6c6565a57880 100644 --- a/sw/source/uibase/inc/glosbib.hxx +++ b/sw/source/uibase/inc/glosbib.hxx @@ -63,7 +63,7 @@ public: virtual void RequestHelp( const HelpEvent& rHEvt ) override; }; -class SwGlossaryGroupDlg : public SvxStandardDialog +class SwGlossaryGroupDlg final : public SvxStandardDialog { VclPtr<FEdit> m_pNameED; VclPtr<ListBox> m_pPathLB; @@ -84,7 +84,6 @@ class SwGlossaryGroupDlg : public SvxStandardDialog bool IsDeleteAllowed(const OUString &rGroup); -protected: virtual void Apply() override; DECL_LINK( SelectHdl, SvTreeListBox*, void ); DECL_LINK( NewHdl, Button *, void ); diff --git a/sw/source/uibase/inc/idxmrk.hxx b/sw/source/uibase/inc/idxmrk.hxx index 8baf13c8ea05..0ccfb3f3f745 100644 --- a/sw/source/uibase/inc/idxmrk.hxx +++ b/sw/source/uibase/inc/idxmrk.hxx @@ -25,10 +25,10 @@ class SwWrtShell; -class SwInsertIdxMarkWrapper : public SfxChildWindow +class SwInsertIdxMarkWrapper final : public SfxChildWindow { ScopedVclPtr<AbstractMarkFloatDlg> pAbstDlg; -protected: + SwInsertIdxMarkWrapper( vcl::Window *pParentWindow, sal_uInt16 nId, SfxBindings* pBindings, @@ -40,10 +40,10 @@ public: void ReInitDlg(SwWrtShell& rWrtShell); }; -class SwInsertAuthMarkWrapper : public SfxChildWindow +class SwInsertAuthMarkWrapper final : public SfxChildWindow { ScopedVclPtr<AbstractMarkFloatDlg> pAbstDlg; -protected: + SwInsertAuthMarkWrapper( vcl::Window *pParentWindow, sal_uInt16 nId, SfxBindings* pBindings, diff --git a/sw/source/uibase/inc/inputwin.hxx b/sw/source/uibase/inc/inputwin.hxx index 8ec5e58ca205..464f63bad57d 100644 --- a/sw/source/uibase/inc/inputwin.hxx +++ b/sw/source/uibase/inc/inputwin.hxx @@ -43,7 +43,7 @@ protected: virtual void KeyInput( const KeyEvent& ) override; }; -class SwInputWindow : public ToolBox +class SwInputWindow final : public ToolBox { friend class InputEdit; @@ -68,7 +68,6 @@ friend class InputEdit; using Window::IsActive; -protected: virtual void Resize() override; virtual void Click() override; DECL_LINK( MenuHdl, Menu *, bool ); diff --git a/sw/source/uibase/inc/num.hxx b/sw/source/uibase/inc/num.hxx index 23fd772cd9e9..622f44f2b5da 100644 --- a/sw/source/uibase/inc/num.hxx +++ b/sw/source/uibase/inc/num.hxx @@ -132,7 +132,7 @@ public: #endif }; -class SwSvxNumBulletTabDialog : public SfxTabDialog +class SwSvxNumBulletTabDialog final : public SfxTabDialog { SwWrtShell& rWrtSh; sal_uInt16 m_nSingleNumPageId; @@ -140,15 +140,15 @@ class SwSvxNumBulletTabDialog : public SfxTabDialog sal_uInt16 m_nOptionsPageId; sal_uInt16 m_nPositionPageId; - protected: - virtual short Ok() override; - virtual void PageCreated(sal_uInt16 nPageId, SfxTabPage& rPage) override; - DECL_LINK(RemoveNumberingHdl, Button*, void); - public: - SwSvxNumBulletTabDialog(vcl::Window* pParent, + virtual short Ok() override; + virtual void PageCreated(sal_uInt16 nPageId, SfxTabPage& rPage) override; + DECL_LINK(RemoveNumberingHdl, Button*, void); + +public: + SwSvxNumBulletTabDialog(vcl::Window* pParent, const SfxItemSet* pSwItemSet, SwWrtShell &); - virtual ~SwSvxNumBulletTabDialog() override; + virtual ~SwSvxNumBulletTabDialog() override; }; #endif // INCLUDED_SW_SOURCE_UIBASE_INC_NUM_HXX diff --git a/sw/source/uibase/inc/numpara.hxx b/sw/source/uibase/inc/numpara.hxx index 5f0e4f3582d7..8641a6ddc1bb 100644 --- a/sw/source/uibase/inc/numpara.hxx +++ b/sw/source/uibase/inc/numpara.hxx @@ -27,7 +27,7 @@ // with this TabPage numbering settings at the paragraph / paragraph style // are performed. -class SwParagraphNumTabPage : public SfxTabPage +class SwParagraphNumTabPage final : public SfxTabPage { VclPtr<VclHBox> m_pOutlineStartBX; VclPtr<ListBox> m_pOutlineLvLB; @@ -61,7 +61,6 @@ class SwParagraphNumTabPage : public SfxTabPage static const sal_uInt16 aPageRg[]; -protected: static bool ExecuteEditNumStyle_Impl( sal_uInt16 nId, const OUString& rStr, const OUString& rRefStr, SfxStyleFamily nFamily, sal_uInt16 nMask = 0 ); diff --git a/sw/source/uibase/inc/outline.hxx b/sw/source/uibase/inc/outline.hxx index 6fd15a45f8e1..c966e123d09b 100644 --- a/sw/source/uibase/inc/outline.hxx +++ b/sw/source/uibase/inc/outline.hxx @@ -43,7 +43,7 @@ class SwWrtShell; class SwNumRule; class SwChapterNumRules; -class SwOutlineTabDialog : public SfxTabDialog +class SwOutlineTabDialog final : public SfxTabDialog { static sal_uInt16 nNumLevel; @@ -58,19 +58,18 @@ class SwOutlineTabDialog : public SfxTabDialog bool bModified : 1; -protected: DECL_LINK(CancelHdl, Button*, void); DECL_LINK( FormHdl, Button *, void ); DECL_LINK( MenuSelectHdl, Menu *, bool ); - virtual void PageCreated(sal_uInt16 nPageId, SfxTabPage& rPage) override; - virtual short Ok() override; + virtual void PageCreated(sal_uInt16 nPageId, SfxTabPage& rPage) override; + virtual short Ok() override; public: - SwOutlineTabDialog(vcl::Window* pParent, + SwOutlineTabDialog(vcl::Window* pParent, const SfxItemSet* pSwItemSet, SwWrtShell &); - virtual ~SwOutlineTabDialog() override; + virtual ~SwOutlineTabDialog() override; virtual void dispose() override; SwNumRule* GetNumRule() { return xNumRule.get(); } diff --git a/sw/source/uibase/inc/selglos.hxx b/sw/source/uibase/inc/selglos.hxx index 20d8eef9ec76..a8a0f00c7ff2 100644 --- a/sw/source/uibase/inc/selglos.hxx +++ b/sw/source/uibase/inc/selglos.hxx @@ -26,9 +26,8 @@ #include <vcl/button.hxx> -class SwSelGlossaryDlg : public ModalDialog +class SwSelGlossaryDlg final : public ModalDialog { -protected: VclPtr<ListBox> m_pGlosBox; DECL_LINK(DoubleClickHdl, ListBox&, void); diff --git a/sw/source/uibase/inc/swruler.hxx b/sw/source/uibase/inc/swruler.hxx index 7821d3f89281..e5a94ad1de6d 100644 --- a/sw/source/uibase/inc/swruler.hxx +++ b/sw/source/uibase/inc/swruler.hxx @@ -22,8 +22,7 @@ class SwEditWin; * * The comment control only appears when the document has comments already. */ -class SwCommentRuler - : public SvxRuler +class SwCommentRuler final : public SvxRuler { public: SwCommentRuler ( @@ -43,7 +42,7 @@ public: virtual void Paint( vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect ) override; const std::string CreateJsonNotification(); -protected: +private: SwViewShell * mpViewShell; //< Shell to check if there is any comments on doc and their visibility VclPtr<SwEditWin> mpSwWin; //< Used to get SwView to change the SideBar visibility bool mbIsHighlighted; //< If comment control is highlighted (mouse is over it) diff --git a/sw/source/uibase/inc/uinums.hxx b/sw/source/uibase/inc/uinums.hxx index 8ee71aa9a28a..9ccbddcae512 100644 --- a/sw/source/uibase/inc/uinums.hxx +++ b/sw/source/uibase/inc/uinums.hxx @@ -33,7 +33,7 @@ namespace sw { class StoredChapterNumberingRules; } #define MAX_NUM_RULES 9 -class SW_DLLPUBLIC SwNumRulesWithName +class SW_DLLPUBLIC SwNumRulesWithName final { OUString maName; // the NumRule's formats _have_ to be independent of a document @@ -58,7 +58,6 @@ class SW_DLLPUBLIC SwNumRulesWithName SwNumFormatGlobal* aFormats[ MAXLEVEL ]; -protected: friend class sw::StoredChapterNumberingRules; friend class SwChapterNumRules; void SetName(const OUString& rSet) {maName = rSet;} diff --git a/sw/source/uibase/inc/unoatxt.hxx b/sw/source/uibase/inc/unoatxt.hxx index 1b6f1a7fc14b..5ddcea49d0d1 100644 --- a/sw/source/uibase/inc/unoatxt.hxx +++ b/sw/source/uibase/inc/unoatxt.hxx @@ -153,7 +153,7 @@ public: void Invalidate(); }; -class SwXAutoTextEntry +class SwXAutoTextEntry final :public SfxListener ,public cppu::BaseMutex ,public cppu::WeakComponentImplHelper @@ -181,7 +181,6 @@ class SwXAutoTextEntry void SAL_CALL disposing() override; -protected: /** ensure that the current content (which may only be in-memory so far) is flushed to the auto text group file <p>If somebody modifies an auto text via this class, then this is not directly reflected to the respective @@ -198,7 +197,6 @@ protected: // SfxListener overridables virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override; -protected: virtual ~SwXAutoTextEntry() override; // ref-counted objects are not to be deleted from outside -> protected dtor public: diff --git a/sw/source/uibase/inc/unomod.hxx b/sw/source/uibase/inc/unomod.hxx index 81f6350e010d..842ab07e267b 100644 --- a/sw/source/uibase/inc/unomod.hxx +++ b/sw/source/uibase/inc/unomod.hxx @@ -69,10 +69,10 @@ enum class SwXPrintSettingsType Document }; -class SwXPrintSettings : public comphelper::ChainablePropertySet +class SwXPrintSettings final : public comphelper::ChainablePropertySet { friend class SwXDocumentSettings; -protected: + SwXPrintSettingsType meType; SwPrintData * mpPrtOpt; SwDoc *mpDoc; @@ -97,11 +97,10 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; }; -class SwXViewSettings : public comphelper::ChainablePropertySet +class SwXViewSettings final : public comphelper::ChainablePropertySet { - friend class SwXDocumentSettings; -protected: + SwView* pView; SwViewOption* mpViewOption; const SwViewOption* mpConstViewOption; diff --git a/sw/source/uibase/inc/unotxvw.hxx b/sw/source/uibase/inc/unotxvw.hxx index b6cf4e4666af..5f0febfb51e5 100644 --- a/sw/source/uibase/inc/unotxvw.hxx +++ b/sw/source/uibase/inc/unotxvw.hxx @@ -151,15 +151,15 @@ typedef cppu::WeakImplHelper< css::beans::XPropertyState > SwXTextViewCursor_Base; -class SwXTextViewCursor : public SwXTextViewCursor_Base, -public SwClient, -public OTextCursorHelper +class SwXTextViewCursor final : public SwXTextViewCursor_Base, + public SwClient, + public OTextCursorHelper { SwView* m_pView; const SfxItemPropertySet* m_pPropSet; -protected: bool IsTextSelection( bool bAllowTables = true ) const; virtual ~SwXTextViewCursor() override; + public: SwXTextViewCursor(SwView* pVw); diff --git a/sw/source/uibase/inc/wordcountdialog.hxx b/sw/source/uibase/inc/wordcountdialog.hxx index 9d81cf8da841..ea95266a5cac 100644 --- a/sw/source/uibase/inc/wordcountdialog.hxx +++ b/sw/source/uibase/inc/wordcountdialog.hxx @@ -61,10 +61,10 @@ public: void SetCounts(const SwDocStat &rCurrCnt, const SwDocStat &rDocStat); }; -class SwWordCountWrapper : public SfxChildWindow +class SwWordCountWrapper final : public SfxChildWindow { VclPtr<AbstractSwWordCountFloatDlg> xAbstDlg; -protected: + SwWordCountWrapper( vcl::Window *pParentWindow, sal_uInt16 nId, SfxBindings* pBindings, diff --git a/sw/source/uibase/uno/SwXDocumentSettings.hxx b/sw/source/uibase/uno/SwXDocumentSettings.hxx index e42ec574ee3d..5c9e28c78302 100644 --- a/sw/source/uibase/uno/SwXDocumentSettings.hxx +++ b/sw/source/uibase/uno/SwXDocumentSettings.hxx @@ -31,13 +31,12 @@ class SwDocShell; class SwDoc; class SfxPrinter; -class SwXDocumentSettings : +class SwXDocumentSettings final : public comphelper::MasterPropertySet, public css::lang::XServiceInfo, public css::lang::XTypeProvider, public cppu::OWeakObject { -protected: SwXTextDocument* mpModel; SwDocShell* mpDocSh; SwDoc* mpDoc; @@ -54,7 +53,6 @@ protected: virtual void _preGetValues () override; virtual void _getSingleValue( const comphelper::PropertyInfo & rInfo, css::uno::Any & rValue ) override; virtual void _postGetValues () override; -protected: virtual ~SwXDocumentSettings() throw() override; public: |