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/source/core/bastyp | |
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/source/core/bastyp')
-rw-r--r-- | sw/source/core/bastyp/SwSmartTagMgr.cxx | 10 | ||||
-rw-r--r-- | sw/source/core/bastyp/tabcol.cxx | 44 |
2 files changed, 27 insertions, 27 deletions
diff --git a/sw/source/core/bastyp/SwSmartTagMgr.cxx b/sw/source/core/bastyp/SwSmartTagMgr.cxx index 80b9a92a0bc4..096705e8ba73 100644 --- a/sw/source/core/bastyp/SwSmartTagMgr.cxx +++ b/sw/source/core/bastyp/SwSmartTagMgr.cxx @@ -26,16 +26,16 @@ using namespace com::sun::star; using namespace com::sun::star::uno; -SwSmartTagMgr* SwSmartTagMgr::mpTheSwSmartTagMgr = nullptr; +SwSmartTagMgr* SwSmartTagMgr::spTheSwSmartTagMgr = nullptr; SwSmartTagMgr& SwSmartTagMgr::Get() { - if ( !mpTheSwSmartTagMgr ) + if ( !spTheSwSmartTagMgr ) { - mpTheSwSmartTagMgr = new SwSmartTagMgr( SwDocShell::Factory().GetModuleName() ); - mpTheSwSmartTagMgr->Init("Writer"); + spTheSwSmartTagMgr = new SwSmartTagMgr( SwDocShell::Factory().GetModuleName() ); + spTheSwSmartTagMgr->Init("Writer"); } - return *mpTheSwSmartTagMgr; + return *spTheSwSmartTagMgr; } SwSmartTagMgr::SwSmartTagMgr( const OUString& rModuleName ) : diff --git a/sw/source/core/bastyp/tabcol.cxx b/sw/source/core/bastyp/tabcol.cxx index 82272b8537d6..3c4e08e32096 100644 --- a/sw/source/core/bastyp/tabcol.cxx +++ b/sw/source/core/bastyp/tabcol.cxx @@ -21,36 +21,36 @@ #include <limits.h> SwTabCols::SwTabCols( sal_uInt16 nSize ) : - nLeftMin( 0 ), - nLeft( 0 ), - nRight( 0 ), - nRightMax( 0 ), - bLastRowAllowedToChange( true ) + m_nLeftMin( 0 ), + m_nLeft( 0 ), + m_nRight( 0 ), + m_nRightMax( 0 ), + m_bLastRowAllowedToChange( true ) { if ( nSize ) - aData.reserve( nSize ); + m_aData.reserve( nSize ); } SwTabCols::SwTabCols( const SwTabCols& rCpy ) : - nLeftMin( rCpy.GetLeftMin() ), - nLeft( rCpy.GetLeft() ), - nRight( rCpy.GetRight() ), - nRightMax( rCpy.GetRightMax() ), - bLastRowAllowedToChange( rCpy.IsLastRowAllowedToChange() ), - aData( rCpy.GetData() ) + m_nLeftMin( rCpy.GetLeftMin() ), + m_nLeft( rCpy.GetLeft() ), + m_nRight( rCpy.GetRight() ), + m_nRightMax( rCpy.GetRightMax() ), + m_bLastRowAllowedToChange( rCpy.IsLastRowAllowedToChange() ), + m_aData( rCpy.GetData() ) { } SwTabCols &SwTabCols::operator=( const SwTabCols& rCpy ) { - nLeftMin = rCpy.GetLeftMin(); - nLeft = rCpy.GetLeft(); - nRight = rCpy.GetRight(); - nRightMax= rCpy.GetRightMax(); - bLastRowAllowedToChange = rCpy.IsLastRowAllowedToChange(); + m_nLeftMin = rCpy.GetLeftMin(); + m_nLeft = rCpy.GetLeft(); + m_nRight = rCpy.GetRight(); + m_nRightMax= rCpy.GetRightMax(); + m_bLastRowAllowedToChange = rCpy.IsLastRowAllowedToChange(); Remove( 0, Count() ); - aData = rCpy.GetData(); + m_aData = rCpy.GetData(); return *this; } @@ -63,7 +63,7 @@ void SwTabCols::Insert( long nValue, long nMin, long nMax, aEntry.nMin = nMin; aEntry.nMax = nMax; aEntry.bHidden = bValue; - aData.insert( aData.begin() + nPos, aEntry ); + m_aData.insert( m_aData.begin() + nPos, aEntry ); } void SwTabCols::Insert( long nValue, bool bValue, size_t nPos ) @@ -73,7 +73,7 @@ void SwTabCols::Insert( long nValue, bool bValue, size_t nPos ) aEntry.nMin = 0; aEntry.nMax = LONG_MAX; aEntry.bHidden = bValue; - aData.insert( aData.begin() + nPos, aEntry ); + m_aData.insert( m_aData.begin() + nPos, aEntry ); #if OSL_DEBUG_LEVEL > 1 for ( const auto& rPos : aData ) @@ -85,8 +85,8 @@ void SwTabCols::Insert( long nValue, bool bValue, size_t nPos ) void SwTabCols::Remove( size_t nPos, size_t nCount ) { - SwTabColsEntries::iterator aStart = aData.begin() + nPos; - aData.erase( aStart, aStart + nCount ); + SwTabColsEntries::iterator aStart = m_aData.begin() + nPos; + m_aData.erase( aStart, aStart + nCount ); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |