diff options
author | Miklos Vajna <vmiklos@collabora.com> | 2019-01-07 08:34:52 +0100 |
---|---|---|
committer | Miklos Vajna <vmiklos@collabora.com> | 2019-01-07 09:57:19 +0100 |
commit | a87145d3c98fd5aa853ce22b3696189f3d249f04 (patch) | |
tree | 7877940f88cce98e4f35a58934b2ebe5eeb0acd9 /sw/inc | |
parent | da2d11d2efb1c0baaa80b9d7052f7c8da5b5bf45 (diff) |
sw: prefix members of SwSmartTagMgr, SwFormatPageDesc and SwTabCols
Change-Id: I0bb794f500793f6d248186b683e0adb88b3e5a33
Reviewed-on: https://gerrit.libreoffice.org/65922
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
Diffstat (limited to 'sw/inc')
-rw-r--r-- | sw/inc/SwSmartTagMgr.hxx | 2 | ||||
-rw-r--r-- | sw/inc/fmtpdsc.hxx | 12 | ||||
-rw-r--r-- | sw/inc/tabcol.hxx | 48 |
3 files changed, 31 insertions, 31 deletions
diff --git a/sw/inc/SwSmartTagMgr.hxx b/sw/inc/SwSmartTagMgr.hxx index baa11096f4e0..b8240f685823 100644 --- a/sw/inc/SwSmartTagMgr.hxx +++ b/sw/inc/SwSmartTagMgr.hxx @@ -26,7 +26,7 @@ class SwSmartTagMgr : public SmartTagMgr { private: - static SwSmartTagMgr* mpTheSwSmartTagMgr; + static SwSmartTagMgr* spTheSwSmartTagMgr; SwSmartTagMgr( const OUString& rModuleName ); virtual ~SwSmartTagMgr() override; diff --git a/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx index 0d6d23943cd8..c44ee75d71a7 100644 --- a/sw/inc/fmtpdsc.hxx +++ b/sw/inc/fmtpdsc.hxx @@ -34,8 +34,8 @@ class IntlWrapper; class SW_DLLPUBLIC SwFormatPageDesc : public SfxPoolItem, public SwClient { - ::boost::optional<sal_uInt16> oNumOffset; ///< Offset page number. - SwModify* pDefinedIn; /**< Points to the object in which the + ::boost::optional<sal_uInt16> m_oNumOffset; ///< Offset page number. + SwModify* m_pDefinedIn; /**< Points to the object in which the attribute was set (ContentNode/Format). */ protected: virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew ) override; @@ -62,12 +62,12 @@ public: SwPageDesc *GetPageDesc() { return static_cast<SwPageDesc*>(GetRegisteredIn()); } const SwPageDesc *GetPageDesc() const { return static_cast<const SwPageDesc*>(GetRegisteredIn()); } - const ::boost::optional<sal_uInt16>& GetNumOffset() const { return oNumOffset; } - void SetNumOffset( const ::boost::optional<sal_uInt16>& oNum ) { oNumOffset = oNum; } + const ::boost::optional<sal_uInt16>& GetNumOffset() const { return m_oNumOffset; } + void SetNumOffset( const ::boost::optional<sal_uInt16>& oNum ) { m_oNumOffset = oNum; } /// Query / set where attribute is anchored. - const SwModify* GetDefinedIn() const { return pDefinedIn; } - void ChgDefinedIn( const SwModify* pNew ) { pDefinedIn = const_cast<SwModify*>(pNew); } + const SwModify* GetDefinedIn() const { return m_pDefinedIn; } + void ChgDefinedIn( const SwModify* pNew ) { m_pDefinedIn = const_cast<SwModify*>(pNew); } void RegisterToPageDesc( SwPageDesc& ); bool KnowsPageDesc() const; void dumpAsXml(struct _xmlTextWriter* pWriter) const override; diff --git a/sw/inc/tabcol.hxx b/sw/inc/tabcol.hxx index 3fee607a881c..79c501a014ba 100644 --- a/sw/inc/tabcol.hxx +++ b/sw/inc/tabcol.hxx @@ -39,52 +39,52 @@ typedef std::vector< SwTabColsEntry > SwTabColsEntries; class SW_DLLPUBLIC SwTabCols { - long nLeftMin, // Leftmost border (reference point) for + long m_nLeftMin, // Leftmost border (reference point) for // document coordinates. // All other values are relative to this point! - nLeft, // Left border of table. - nRight, // Right border of table. - nRightMax; // Maximum right border of table. + m_nLeft, // Left border of table. + m_nRight, // Right border of table. + m_nRightMax; // Maximum right border of table. - bool bLastRowAllowedToChange; // If the last row of the table frame + bool m_bLastRowAllowedToChange; // If the last row of the table frame // is split across pages, it may not // change its size. - SwTabColsEntries aData; + SwTabColsEntries m_aData; //For the CopyCTor. - const SwTabColsEntries& GetData() const { return aData; } + const SwTabColsEntries& GetData() const { return m_aData; } public: SwTabCols( sal_uInt16 nSize = 0 ); SwTabCols( const SwTabCols& ); SwTabCols &operator=( const SwTabCols& ); - long& operator[]( size_t nPos ) { return aData[nPos].nPos; } - long operator[]( size_t nPos ) const { return aData[nPos].nPos; } - size_t Count() const { return aData.size(); } + long& operator[]( size_t nPos ) { return m_aData[nPos].nPos; } + long operator[]( size_t nPos ) const { return m_aData[nPos].nPos; } + size_t Count() const { return m_aData.size(); } - bool IsHidden( size_t nPos ) const { return aData[nPos].bHidden; } - void SetHidden( size_t nPos, bool bValue ) { aData[nPos].bHidden = bValue; } + bool IsHidden( size_t nPos ) const { return m_aData[nPos].bHidden; } + void SetHidden( size_t nPos, bool bValue ) { m_aData[nPos].bHidden = bValue; } void Insert( long nValue, bool bValue, size_t nPos ); void Insert( long nValue, long nMin, long nMax, bool bValue, size_t nPos ); void Remove( size_t nPos, size_t nCount = 1 ); - const SwTabColsEntry& GetEntry( size_t nPos ) const { return aData[nPos]; } - SwTabColsEntry& GetEntry( size_t nPos ) { return aData[nPos]; } + const SwTabColsEntry& GetEntry( size_t nPos ) const { return m_aData[nPos]; } + SwTabColsEntry& GetEntry( size_t nPos ) { return m_aData[nPos]; } - long GetLeftMin() const { return nLeftMin; } - long GetLeft() const { return nLeft; } - long GetRight() const { return nRight; } - long GetRightMax()const { return nRightMax;} + long GetLeftMin() const { return m_nLeftMin; } + long GetLeft() const { return m_nLeft; } + long GetRight() const { return m_nRight; } + long GetRightMax()const { return m_nRightMax;} - void SetLeftMin ( long nNew ) { nLeftMin = nNew; } - void SetLeft ( long nNew ) { nLeft = nNew; } - void SetRight ( long nNew ) { nRight = nNew; } - void SetRightMax( long nNew ) { nRightMax = nNew;} + void SetLeftMin ( long nNew ) { m_nLeftMin = nNew; } + void SetLeft ( long nNew ) { m_nLeft = nNew; } + void SetRight ( long nNew ) { m_nRight = nNew; } + void SetRightMax( long nNew ) { m_nRightMax = nNew;} - bool IsLastRowAllowedToChange() const { return bLastRowAllowedToChange; } - void SetLastRowAllowedToChange( bool bNew ) { bLastRowAllowedToChange = bNew; } + bool IsLastRowAllowedToChange() const { return m_bLastRowAllowedToChange; } + void SetLastRowAllowedToChange( bool bNew ) { m_bLastRowAllowedToChange = bNew; } }; class SwTable; |