diff options
Diffstat (limited to 'sw/inc')
-rw-r--r-- | sw/inc/SwStyleNameMapper.hxx | 3 | ||||
-rw-r--r-- | sw/inc/colwd.hxx | 3 | ||||
-rw-r--r-- | sw/inc/dpage.hxx | 5 | ||||
-rw-r--r-- | sw/inc/fmtcol.hxx | 10 | ||||
-rw-r--r-- | sw/inc/frmfmt.hxx | 4 | ||||
-rw-r--r-- | sw/inc/ndarr.hxx | 3 | ||||
-rw-r--r-- | sw/inc/swmodule.hxx | 3 | ||||
-rw-r--r-- | sw/inc/swserv.hxx | 3 | ||||
-rw-r--r-- | sw/inc/swtblfmt.hxx | 9 | ||||
-rw-r--r-- | sw/inc/unoframe.hxx | 10 | ||||
-rw-r--r-- | sw/inc/unotextbodyhf.hxx | 7 |
11 files changed, 21 insertions, 39 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; |