diff options
Diffstat (limited to 'sw/inc')
-rw-r--r-- | sw/inc/fmtcol.hxx | 4 | ||||
-rw-r--r-- | sw/inc/fmtmeta.hxx | 3 | ||||
-rw-r--r-- | sw/inc/hints.hxx | 2 | ||||
-rw-r--r-- | sw/inc/viewopt.hxx | 1 |
4 files changed, 5 insertions, 5 deletions
diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx index 8a5d64108ced..d389e87544a3 100644 --- a/sw/inc/fmtcol.hxx +++ b/sw/inc/fmtcol.hxx @@ -61,12 +61,12 @@ class SW_DLLPUBLIC SwTextFormatColl: public SwFormatColl bool mbStayAssignedToListLevelOfOutlineStyle; -protected: - bool mbAssignedToOutlineStyle; SwTextFormatColl *mpNextTextFormatColl; +protected: + SwTextFormatColl( SwAttrPool& rPool, const sal_Char* pFormatCollName, SwTextFormatColl* pDerFrom = nullptr, sal_uInt16 nFormatWh = RES_TXTFMTCOLL ) diff --git a/sw/inc/fmtmeta.hxx b/sw/inc/fmtmeta.hxx index bcc93b107e77..2fe348cffce0 100644 --- a/sw/inc/fmtmeta.hxx +++ b/sw/inc/fmtmeta.hxx @@ -129,7 +129,6 @@ class Meta , public SwModify , public sw::BroadcasterMixin { -protected: friend class ::SwFormatMeta; ///< SetFormatMeta, NotifyChangeTextNode friend class ::SwXMeta; ///< GetTextNode, GetTextAttr, Get/SetXMeta @@ -139,6 +138,8 @@ protected: SwFormatMeta * m_pFormat; SwTextNode * m_pTextNode; +protected: + SwTextMeta * GetTextAttr() const; SwTextNode * GetTextNode() const { return m_pTextNode;} ///< @return 0 if not in document (undo) diff --git a/sw/inc/hints.hxx b/sw/inc/hints.hxx index 984747dcf368..ca5f211e28cb 100644 --- a/sw/inc/hints.hxx +++ b/sw/inc/hints.hxx @@ -168,8 +168,8 @@ public: For this we need the current outputdevice */ class SwRefMarkFieldUpdate : public SwMsgPoolItem { -public: VclPtr<OutputDevice> pOut; ///< pointer to the current output device +public: /** Is sent if reference marks should be updated. To get the page/chapter number, the frame has to be asked. For that we need diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx index d2bec092e54b..05f70f2d2aa6 100644 --- a/sw/inc/viewopt.hxx +++ b/sw/inc/viewopt.hxx @@ -142,7 +142,6 @@ class SW_DLLPUBLIC SwViewOption static Color s_aHeaderFooterMarkColor; static ViewOptFlags s_nAppearanceFlags; -protected: static sal_uInt16 s_nPixelTwips;// 1 Pixel == ? Twips OUString m_sSymbolFont; // Symbolfont. |