sw: prefix members of HTMLAttrContext_SaveDoc, SvxCSS1Parser, ...

... SwHTMLImageWatcher and SwWriteTableCell

See tdf#94879 for motivation.

Change-Id: Ib5810ac4de8e8f71410d6800e08755f38d80ee8e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117108
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

6 files changed, 128 insertions, 128 deletions

diff --git a/sw/source/filter/html/htmlctxt.cxx b/sw/source/filter/html/htmlctxt.cxx
index 1769b600f1e0..194458da78fa 100644
--- a/sw/source/filter/html/htmlctxt.cxx
+++ b/sw/source/filter/html/htmlctxt.cxx
@@ -44,67 +44,67 @@ using namespace ::com::sun::star;
 
 class HTMLAttrContext_SaveDoc
 {
-    SwHTMLNumRuleInfo aNumRuleInfo; // Numbering for this environment
+    SwHTMLNumRuleInfo m_aNumRuleInfo; // Numbering for this environment
     std::unique_ptr<SwPosition>
-                      pPos;         // Jump back to here when leaving context
+                      m_pPos;         // Jump back to here when leaving context
     std::shared_ptr<HTMLAttrTable>
-                      xAttrTab;     // Valid attributes for the environment,
+                      m_xAttrTab;     // Valid attributes for the environment,
                                     // if attributes shouldn't be preserved
 
-    size_t nContextStMin;           // Stack lower bound for the environment
+    size_t m_nContextStMin;           // Stack lower bound for the environment
                                     // if stack needs to be protected
-    size_t nContextStAttrMin;       // Stack lower bound for the environment
+    size_t m_nContextStAttrMin;       // Stack lower bound for the environment
                                     // if the attributes shouldn't be preserved
-    bool bStripTrailingPara : 1;
-    bool bKeepNumRules : 1;
-    bool bFixHeaderDist : 1;
-    bool bFixFooterDist : 1;
+    bool m_bStripTrailingPara : 1;
+    bool m_bKeepNumRules : 1;
+    bool m_bFixHeaderDist : 1;
+    bool m_bFixFooterDist : 1;
 
 public:
 
     HTMLAttrContext_SaveDoc() :
-        nContextStMin( SIZE_MAX ), nContextStAttrMin( SIZE_MAX ),
-        bStripTrailingPara( false ), bKeepNumRules( false ),
-        bFixHeaderDist( false ), bFixFooterDist( false )
+        m_nContextStMin( SIZE_MAX ), m_nContextStAttrMin( SIZE_MAX ),
+        m_bStripTrailingPara( false ), m_bKeepNumRules( false ),
+        m_bFixHeaderDist( false ), m_bFixFooterDist( false )
     {}
 
     // The position is ours, so we need to create and delete it
-    void SetPos( const SwPosition& rPos ) { pPos.reset( new SwPosition(rPos) ); }
-    const SwPosition *GetPos() const { return pPos.get(); }
+    void SetPos( const SwPosition& rPos ) { m_pPos.reset( new SwPosition(rPos) ); }
+    const SwPosition *GetPos() const { return m_pPos.get(); }
 
     // The index isn't ours. So no creation or deletion
-    void SetNumInfo( const SwHTMLNumRuleInfo& rInf ) { aNumRuleInfo.Set(rInf); }
-    const SwHTMLNumRuleInfo& GetNumInfo() const { return aNumRuleInfo; }
+    void SetNumInfo( const SwHTMLNumRuleInfo& rInf ) { m_aNumRuleInfo.Set(rInf); }
+    const SwHTMLNumRuleInfo& GetNumInfo() const { return m_aNumRuleInfo; }
 
     std::shared_ptr<HTMLAttrTable> const & GetAttrTab(bool bCreate = false);
 
-    void SetContextStMin( size_t nMin ) { nContextStMin = nMin; }
-    size_t GetContextStMin() const { return nContextStMin; }
+    void SetContextStMin( size_t nMin ) { m_nContextStMin = nMin; }
+    size_t GetContextStMin() const { return m_nContextStMin; }
 
-    void SetContextStAttrMin( size_t nMin ) { nContextStAttrMin = nMin; }
-    size_t GetContextStAttrMin() const { return nContextStAttrMin; }
+    void SetContextStAttrMin( size_t nMin ) { m_nContextStAttrMin = nMin; }
+    size_t GetContextStAttrMin() const { return m_nContextStAttrMin; }
 
-    void SetStripTrailingPara( bool bSet ) { bStripTrailingPara = bSet; }
-    bool GetStripTrailingPara() const { return bStripTrailingPara; }
+    void SetStripTrailingPara( bool bSet ) { m_bStripTrailingPara = bSet; }
+    bool GetStripTrailingPara() const { return m_bStripTrailingPara; }
 
-    void SetKeepNumRules( bool bSet ) { bKeepNumRules = bSet; }
-    bool GetKeepNumRules() const { return bKeepNumRules; }
+    void SetKeepNumRules( bool bSet ) { m_bKeepNumRules = bSet; }
+    bool GetKeepNumRules() const { return m_bKeepNumRules; }
 
-    void SetFixHeaderDist( bool bSet ) { bFixHeaderDist = bSet; }
-    bool GetFixHeaderDist() const { return bFixHeaderDist; }
+    void SetFixHeaderDist( bool bSet ) { m_bFixHeaderDist = bSet; }
+    bool GetFixHeaderDist() const { return m_bFixHeaderDist; }
 
-    void SetFixFooterDist( bool bSet ) { bFixFooterDist = bSet; }
-    bool GetFixFooterDist() const { return bFixFooterDist; }
+    void SetFixFooterDist( bool bSet ) { m_bFixFooterDist = bSet; }
+    bool GetFixFooterDist() const { return m_bFixFooterDist; }
 };
 
 std::shared_ptr<HTMLAttrTable> const & HTMLAttrContext_SaveDoc::GetAttrTab( bool bCreate )
 {
-    if (!xAttrTab && bCreate)
+    if (!m_xAttrTab && bCreate)
     {
-        xAttrTab = std::make_shared<HTMLAttrTable>();
-        memset(xAttrTab.get(), 0, sizeof(HTMLAttrTable));
+        m_xAttrTab = std::make_shared<HTMLAttrTable>();
+        memset(m_xAttrTab.get(), 0, sizeof(HTMLAttrTable));
     }
-    return xAttrTab;
+    return m_xAttrTab;
 }
 
 HTMLAttrContext_SaveDoc *HTMLAttrContext::GetSaveDocContext( bool bCreate )
diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx
index 4466602c5ca3..4a6254a54be0 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -372,11 +372,11 @@ namespace {
 class SwHTMLImageWatcher :
     public cppu::WeakImplHelper< awt::XImageConsumer, XEventListener >
 {
-    uno::Reference< drawing::XShape >       xShape;     // the control
-    uno::Reference< XImageProducerSupplier >    xSrc;
-    uno::Reference< awt::XImageConsumer >   xThis;      // reference to self
-    bool                            bSetWidth;
-    bool                            bSetHeight;
+    uno::Reference< drawing::XShape >       m_xShape;     // the control
+    uno::Reference< XImageProducerSupplier >    m_xSrc;
+    uno::Reference< awt::XImageConsumer >   m_xThis;      // reference to self
+    bool                            m_bSetWidth;
+    bool                            m_bSetHeight;
 
     void clear();
 
@@ -386,7 +386,7 @@ public:
 
     // startProduction can not be called in the constructor because it can
     // destruct itself, hence a separate method.
-    void start() { xSrc->getImageProducer()->startProduction(); }
+    void start() { m_xSrc->getImageProducer()->startProduction(); }
 
     // UNO binding
 
@@ -417,45 +417,45 @@ public:
 SwHTMLImageWatcher::SwHTMLImageWatcher(
         const uno::Reference< drawing::XShape >& rShape,
         bool bWidth, bool bHeight ) :
-    xShape( rShape ),
-    bSetWidth( bWidth ), bSetHeight( bHeight )
+    m_xShape( rShape ),
+    m_bSetWidth( bWidth ), m_bSetHeight( bHeight )
 {
     // Remember the source of the image
-    uno::Reference< drawing::XControlShape > xControlShape( xShape, UNO_QUERY );
+    uno::Reference< drawing::XControlShape > xControlShape( m_xShape, UNO_QUERY );
     uno::Reference< awt::XControlModel > xControlModel(
             xControlShape->getControl() );
-    xSrc.set( xControlModel, UNO_QUERY );
-    OSL_ENSURE( xSrc.is(), "No XImageProducerSupplier" );
+    m_xSrc.set( xControlModel, UNO_QUERY );
+    OSL_ENSURE( m_xSrc.is(), "No XImageProducerSupplier" );
 
     // Register as Event-Listener on the shape to be able to release it on dispose.
     uno::Reference< XEventListener > xEvtLstnr = static_cast<XEventListener *>(this);
-    uno::Reference< XComponent > xComp( xShape, UNO_QUERY );
+    uno::Reference< XComponent > xComp( m_xShape, UNO_QUERY );
     xComp->addEventListener( xEvtLstnr );
 
     // Lastly we keep a reference to ourselves so we are not destroyed
     // (should not be necessary since we're still registered elsewhere)
-    xThis = static_cast<awt::XImageConsumer *>(this);
+    m_xThis = static_cast<awt::XImageConsumer *>(this);
 
     // Register at ImageProducer to retrieve the size...
-    xSrc->getImageProducer()->addConsumer( xThis );
+    m_xSrc->getImageProducer()->addConsumer( m_xThis );
 }
 
 void SwHTMLImageWatcher::clear()
 {
     // Unregister on Shape
     uno::Reference< XEventListener > xEvtLstnr = static_cast<XEventListener *>(this);
-    uno::Reference< XComponent > xComp( xShape, UNO_QUERY );
+    uno::Reference< XComponent > xComp( m_xShape, UNO_QUERY );
     xComp->removeEventListener( xEvtLstnr );
 
     // Unregister on ImageProducer
-    uno::Reference<awt::XImageProducer> xProd = xSrc->getImageProducer();
+    uno::Reference<awt::XImageProducer> xProd = m_xSrc->getImageProducer();
     if( xProd.is() )
-        xProd->removeConsumer( xThis );
+        xProd->removeConsumer( m_xThis );
 }
 
 void SwHTMLImageWatcher::init( sal_Int32 Width, sal_Int32 Height )
 {
-    OSL_ENSURE( bSetWidth || bSetHeight,
+    OSL_ENSURE( m_bSetWidth || m_bSetHeight,
             "Width or height has to be adjusted" );
 
     // If no width or height is given, it is initialized to those of
@@ -476,16 +476,16 @@ void SwHTMLImageWatcher::init( sal_Int32 Width, sal_Int32 Height )
         aNewSz.Height = aTmp.Height();
     }
 
-    if( !bSetWidth || !bSetHeight )
+    if( !m_bSetWidth || !m_bSetHeight )
     {
-        awt::Size aSz( xShape->getSize() );
-        if( bSetWidth && aNewSz.Height )
+        awt::Size aSz( m_xShape->getSize() );
+        if( m_bSetWidth && aNewSz.Height )
         {
             aNewSz.Width *= aSz.Height;
             aNewSz.Width /= aNewSz.Height;
             aNewSz.Height = aSz.Height;
         }
-        if( bSetHeight && aNewSz.Width )
+        if( m_bSetHeight && aNewSz.Width )
         {
             aNewSz.Height *= aSz.Width;
             aNewSz.Height /= aNewSz.Width;
@@ -497,14 +497,14 @@ void SwHTMLImageWatcher::init( sal_Int32 Width, sal_Int32 Height )
     if( aNewSz.Height < MINFLY )
         aNewSz.Height = MINFLY;
 
-    xShape->setSize( aNewSz );
-    if( bSetWidth )
+    m_xShape->setSize( aNewSz );
+    if( m_bSetWidth )
     {
         // If the control is anchored to a table, the column have to be recalculated
 
         // To get to the SwXShape* we need an interface that is implemented by SwXShape
 
-        uno::Reference< beans::XPropertySet > xPropSet( xShape, UNO_QUERY );
+        uno::Reference< beans::XPropertySet > xPropSet( m_xShape, UNO_QUERY );
         SwXShape *pSwShape = comphelper::getUnoTunnelImplementation<SwXShape>(xPropSet);
 
         OSL_ENSURE( pSwShape, "Where is SW-Shape?" );
@@ -538,7 +538,7 @@ void SwHTMLImageWatcher::init( sal_Int32 Width, sal_Int32 Height )
 
     // unregister and delete self
     clear();
-    xThis = nullptr;
+    m_xThis = nullptr;
 }
 
 void SwHTMLImageWatcher::setColorModel(
@@ -566,7 +566,7 @@ void SwHTMLImageWatcher::complete( sal_Int32 Status,
     {
         // unregister and delete self
         clear();
-        xThis = nullptr;
+        m_xThis = nullptr;
     }
 }
 
@@ -575,11 +575,11 @@ void SwHTMLImageWatcher::disposing(const lang::EventObject& evt)
     uno::Reference< awt::XImageConsumer > xTmp;
 
     // We need to release the shape if it is disposed of
-    if( evt.Source == xShape )
+    if( evt.Source == m_xShape )
     {
         clear();
         xTmp = static_cast<awt::XImageConsumer*>(this);
-        xThis = nullptr;
+        m_xThis = nullptr;
     }
 }
 
diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx
index 3a0594d7adbd..280c927320d0 100644
--- a/sw/source/filter/html/svxcss1.cxx
+++ b/sw/source/filter/html/svxcss1.cxx
@@ -678,14 +678,14 @@ void SvxCSS1Parser::SelectorParsed( std::unique_ptr<CSS1Selector> pSelector, boo
 {
     if( bFirst )
     {
-        OSL_ENSURE( pSheetItemSet, "Where is the Item-Set for Style-Sheets?" );
+        OSL_ENSURE( m_pSheetItemSet, "Where is the Item-Set for Style-Sheets?" );
 
         for (const std::unique_ptr<CSS1Selector> & rpSelection : m_Selectors)
         {
-            StyleParsed(rpSelection.get(), *pSheetItemSet, *pSheetPropInfo);
+            StyleParsed(rpSelection.get(), *m_pSheetItemSet, *m_pSheetPropInfo);
         }
-        pSheetItemSet->ClearItem();
-        pSheetPropInfo->Clear();
+        m_pSheetItemSet->ClearItem();
+        m_pSheetPropInfo->Clear();
 
         // prepare the next rule
         m_Selectors.clear();
@@ -697,11 +697,11 @@ void SvxCSS1Parser::SelectorParsed( std::unique_ptr<CSS1Selector> pSelector, boo
 SvxCSS1Parser::SvxCSS1Parser( SfxItemPool& rPool, const OUString& rBaseURL,
                               sal_uInt16 const *pWhichIds, sal_uInt16 nWhichIds ) :
     CSS1Parser(),
-    sBaseURL( rBaseURL ),
-    pItemSet(nullptr),
-    pPropInfo( nullptr ),
-    eDfltEnc( RTL_TEXTENCODING_DONTKNOW ),
-    bIgnoreFontFamily( false )
+    m_sBaseURL( rBaseURL ),
+    m_pItemSet(nullptr),
+    m_pPropInfo( nullptr ),
+    m_eDefaultEnc( RTL_TEXTENCODING_DONTKNOW ),
+    m_bIgnoreFontFamily( false )
 {
     // also initialize item IDs
     aItemIds.nFont = rPool.GetTrueWhich( SID_ATTR_CHAR_FONT, false );
@@ -740,20 +740,20 @@ SvxCSS1Parser::SvxCSS1Parser( SfxItemPool& rPool, const OUString& rBaseURL,
     aItemIds.nLanguageCTL = rPool.GetTrueWhich( SID_ATTR_CHAR_CTL_LANGUAGE, false );
     aItemIds.nDirection = rPool.GetTrueWhich( SID_ATTR_FRAMEDIRECTION, false );
 
-    aWhichMap.insert( aWhichMap.begin(), 0 );
-    BuildWhichTable( aWhichMap, reinterpret_cast<sal_uInt16 *>(&aItemIds),
+    m_aWhichMap.insert( m_aWhichMap.begin(), 0 );
+    BuildWhichTable( m_aWhichMap, reinterpret_cast<sal_uInt16 *>(&aItemIds),
                              sizeof(aItemIds) / sizeof(sal_uInt16) );
     if( pWhichIds && nWhichIds )
-        BuildWhichTable( aWhichMap, pWhichIds, nWhichIds );
+        BuildWhichTable( m_aWhichMap, pWhichIds, nWhichIds );
 
-    pSheetItemSet.reset( new SfxItemSet( rPool, aWhichMap.data() ) );
-    pSheetPropInfo.reset( new SvxCSS1PropertyInfo );
+    m_pSheetItemSet.reset( new SfxItemSet( rPool, m_aWhichMap.data() ) );
+    m_pSheetPropInfo.reset( new SvxCSS1PropertyInfo );
 }
 
 SvxCSS1Parser::~SvxCSS1Parser()
 {
-    pSheetItemSet.reset();
-    pSheetPropInfo.reset();
+    m_pSheetItemSet.reset();
+    m_pSheetPropInfo.reset();
 }
 
 void SvxCSS1Parser::InsertId( const OUString& rId,
@@ -818,23 +818,23 @@ SvxCSS1MapEntry* SvxCSS1Parser::GetTag( const OUString& rTag )
 
 bool SvxCSS1Parser::ParseStyleSheet( const OUString& rIn )
 {
-    pItemSet = pSheetItemSet.get();
-    pPropInfo = pSheetPropInfo.get();
+    m_pItemSet = m_pSheetItemSet.get();
+    m_pPropInfo = m_pSheetPropInfo.get();
 
     CSS1Parser::ParseStyleSheet( rIn );
 
     for (const std::unique_ptr<CSS1Selector> & rpSelector : m_Selectors)
     {
-        StyleParsed(rpSelector.get(), *pSheetItemSet, *pSheetPropInfo);
+        StyleParsed(rpSelector.get(), *m_pSheetItemSet, *m_pSheetPropInfo);
     }
 
     // and clean up a little bit
     m_Selectors.clear();
-    pSheetItemSet->ClearItem();
-    pSheetPropInfo->Clear();
+    m_pSheetItemSet->ClearItem();
+    m_pSheetPropInfo->Clear();
 
-    pItemSet = nullptr;
-    pPropInfo = nullptr;
+    m_pItemSet = nullptr;
+    m_pPropInfo = nullptr;
 
     return true;
 }
@@ -843,14 +843,14 @@ void SvxCSS1Parser::ParseStyleOption( const OUString& rIn,
                                       SfxItemSet& rItemSet,
                                       SvxCSS1PropertyInfo& rPropInfo )
 {
-    pItemSet = &rItemSet;
-    pPropInfo = &rPropInfo;
+    m_pItemSet = &rItemSet;
+    m_pPropInfo = &rPropInfo;
 
     CSS1Parser::ParseStyleOption( rIn );
     rItemSet.ClearItem( aItemIds.nDirection );
 
-    pItemSet = nullptr;
-    pPropInfo = nullptr;
+    m_pItemSet = nullptr;
+    m_pPropInfo = nullptr;
 }
 
 bool SvxCSS1Parser::GetEnum( const CSS1PropertyEnum *pPropTable,
@@ -977,7 +977,7 @@ void SvxCSS1Parser::MergeStyles( const SfxItemSet& rSrcSet,
 
 void SvxCSS1Parser::SetDfltEncoding( rtl_TextEncoding eEnc )
 {
-    eDfltEnc = eEnc;
+    m_eDefaultEnc = eEnc;
 }
 
 static void ParseCSS1_font_size( const CSS1Expression *pExpr,
@@ -3160,7 +3160,7 @@ static bool CSS1PropEntryFindCompare(CSS1PropEntry const & lhs, OUString const &
 void SvxCSS1Parser::DeclarationParsed( const OUString& rProperty,
                                        std::unique_ptr<CSS1Expression> pExpr )
 {
-    OSL_ENSURE( pItemSet, "DeclarationParsed() without ItemSet" );
+    OSL_ENSURE( m_pItemSet, "DeclarationParsed() without ItemSet" );
 
     static bool bSortedPropFns = false;
 
@@ -3175,7 +3175,7 @@ void SvxCSS1Parser::DeclarationParsed( const OUString& rProperty,
                                 CSS1PropEntryFindCompare );
     if( it != std::end(aCSS1PropFnTab) && !CSS1PropEntryFindCompare(*it,rProperty)  )
     {
-        it->pFunc( pExpr.get(), *pItemSet, *pPropInfo, *this );
+        it->pFunc( pExpr.get(), *m_pItemSet, *m_pPropInfo, *this );
     }
 }
 
diff --git a/sw/source/filter/html/svxcss1.hxx b/sw/source/filter/html/svxcss1.hxx
index 5cf8140f97c3..2e0e14fd254a 100644
--- a/sw/source/filter/html/svxcss1.hxx
+++ b/sw/source/filter/html/svxcss1.hxx
@@ -194,19 +194,19 @@ class SvxCSS1Parser : public CSS1Parser
     CSS1Map m_Pages;
     CSS1Map m_Tags;
 
-    OUString sBaseURL;
+    OUString m_sBaseURL;
 
-    std::unique_ptr<SfxItemSet> pSheetItemSet;  // item set of Style-Sheet
-    SfxItemSet *pItemSet;       // current item set
+    std::unique_ptr<SfxItemSet> m_pSheetItemSet;  // item set of Style-Sheet
+    SfxItemSet *m_pItemSet;       // current item set
 
-    std::unique_ptr<SvxCSS1PropertyInfo> pSheetPropInfo;
-    SvxCSS1PropertyInfo *pPropInfo;
+    std::unique_ptr<SvxCSS1PropertyInfo> m_pSheetPropInfo;
+    SvxCSS1PropertyInfo *m_pPropInfo;
 
     static constexpr sal_uInt16 gnMinFixLineSpace = MM50/2;    // minimum spacing for fixed line spacing
 
-    rtl_TextEncoding    eDfltEnc;
-    bool bIgnoreFontFamily;
-    std::vector<sal_uInt16> aWhichMap;        // Which-Map of Parser
+    rtl_TextEncoding    m_eDefaultEnc;
+    bool m_bIgnoreFontFamily;
+    std::vector<sal_uInt16> m_aWhichMap;        // Which-Map of Parser
 
     using CSS1Parser::ParseStyleOption;
 
@@ -242,8 +242,8 @@ public:
                    sal_uInt16 const *pWhichIds, sal_uInt16 nWhichIds );
     virtual ~SvxCSS1Parser() override;
 
-    bool IsIgnoreFontFamily() const { return bIgnoreFontFamily; }
-    void SetIgnoreFontFamily( bool bSet ) { bIgnoreFontFamily = bSet; }
+    bool IsIgnoreFontFamily() const { return m_bIgnoreFontFamily; }
+    void SetIgnoreFontFamily( bool bSet ) { m_bIgnoreFontFamily = bSet; }
 
     // Parse a style sheet. For every found selector a StyleParsed with
     // according item set is called.
@@ -264,7 +264,7 @@ public:
 
     virtual const FontList *GetFontList() const;
 
-    const sal_uInt16 *GetWhichMap() const { return aWhichMap.data(); }
+    const sal_uInt16 *GetWhichMap() const { return m_aWhichMap.data(); }
 
     static void InsertMapEntry( const OUString& rKey, const SfxItemSet& rItemSet,
                          const SvxCSS1PropertyInfo& rProp, CSS1Map& rMap );
@@ -299,9 +299,9 @@ public:
     static sal_uInt16 GetMinFixLineSpace() { return gnMinFixLineSpace; }
 
     virtual void SetDfltEncoding( rtl_TextEncoding eEnc );
-    rtl_TextEncoding GetDfltEncoding() const { return eDfltEnc; }
+    rtl_TextEncoding GetDfltEncoding() const { return m_eDefaultEnc; }
 
-    const OUString& GetBaseURL() const { return sBaseURL;}
+    const OUString& GetBaseURL() const { return m_sBaseURL;}
 
 };
 
diff --git a/sw/source/filter/inc/wrtswtbl.hxx b/sw/source/filter/inc/wrtswtbl.hxx
index 98b74fa3d29f..b343f64ccb75 100644
--- a/sw/source/filter/inc/wrtswtbl.hxx
+++ b/sw/source/filter/inc/wrtswtbl.hxx
@@ -46,50 +46,50 @@ namespace editeng { class SvxBorderLine; }
 
 class SW_DLLPUBLIC SwWriteTableCell
 {
-    const SwTableBox *pBox;             // SwTableBox of the cell
-    const SvxBrushItem *pBackground;    // inherited background of a row
+    const SwTableBox *m_pBox;             // SwTableBox of the cell
+    const SvxBrushItem *m_pBackground;    // inherited background of a row
 
-    tools::Long nHeight;                   // fix/minimum height of a row
+    tools::Long m_nHeight;                   // fix/minimum height of a row
 
-    sal_uInt32 nWidthOpt;           // width from option;
+    sal_uInt32 m_nWidthOpt;           // width from option;
 
-    sal_uInt16 nRow;                // start row
-    sal_uInt16 nCol;                // start column
+    sal_uInt16 m_nRow;                // start row
+    sal_uInt16 m_nCol;                // start column
 
-    sal_uInt16 nRowSpan;            // spanned rows
-    sal_uInt16 nColSpan;            // spanned columns
+    sal_uInt16 m_nRowSpan;            // spanned rows
+    sal_uInt16 m_nColSpan;            // spanned columns
 
-    bool bPercentWidthOpt;
+    bool m_bPercentWidthOpt;
 
 public:
 
     SwWriteTableCell(const SwTableBox *pB, sal_uInt16 nR, sal_uInt16 nC, sal_uInt16 nRSpan,
         sal_uInt16 nCSpan, tools::Long nHght, const SvxBrushItem *pBGround)
-    : pBox( pB ), pBackground( pBGround ), nHeight( nHght ), nWidthOpt( 0 ),
-    nRow( nR ), nCol( nC ), nRowSpan( nRSpan ), nColSpan( nCSpan ),
-    bPercentWidthOpt( false )
+    : m_pBox( pB ), m_pBackground( pBGround ), m_nHeight( nHght ), m_nWidthOpt( 0 ),
+    m_nRow( nR ), m_nCol( nC ), m_nRowSpan( nRSpan ), m_nColSpan( nCSpan ),
+    m_bPercentWidthOpt( false )
     {}
 
-    const SwTableBox *GetBox() const { return pBox; }
+    const SwTableBox *GetBox() const { return m_pBox; }
 
-    sal_uInt16 GetRow() const { return nRow; }
-    sal_uInt16 GetCol() const { return nCol; }
+    sal_uInt16 GetRow() const { return m_nRow; }
+    sal_uInt16 GetCol() const { return m_nCol; }
 
-    sal_uInt16 GetRowSpan() const { return nRowSpan; }
-    sal_uInt16 GetColSpan() const { return nColSpan; }
+    sal_uInt16 GetRowSpan() const { return m_nRowSpan; }
+    sal_uInt16 GetColSpan() const { return m_nColSpan; }
 
-    tools::Long GetHeight() const { return nHeight; }
+    tools::Long GetHeight() const { return m_nHeight; }
     sal_Int16 GetVertOri() const;
 
-    const SvxBrushItem *GetBackground() const { return pBackground; }
+    const SvxBrushItem *GetBackground() const { return m_pBackground; }
 
     void SetWidthOpt( sal_uInt16 nWidth, bool bPercent )
     {
-        nWidthOpt = nWidth; bPercentWidthOpt = bPercent;
+        m_nWidthOpt = nWidth; m_bPercentWidthOpt = bPercent;
     }
 
-    sal_uInt32 GetWidthOpt() const { return nWidthOpt; }
-    bool HasPercentWidthOpt() const { return bPercentWidthOpt; }
+    sal_uInt32 GetWidthOpt() const { return m_nWidthOpt; }
+    bool HasPercentWidthOpt() const { return m_bPercentWidthOpt; }
 };
 
 typedef std::vector<std::unique_ptr<SwWriteTableCell>> SwWriteTableCells;
diff --git a/sw/source/filter/writer/wrtswtbl.cxx b/sw/source/filter/writer/wrtswtbl.cxx
index a504111c55f6..e32ec9cdfe1b 100644
--- a/sw/source/filter/writer/wrtswtbl.cxx
+++ b/sw/source/filter/writer/wrtswtbl.cxx
@@ -38,9 +38,9 @@ using namespace ::com::sun::star;
 sal_Int16 SwWriteTableCell::GetVertOri() const
 {
     sal_Int16 eCellVertOri = text::VertOrientation::TOP;
-    if( pBox->GetSttNd() )
+    if( m_pBox->GetSttNd() )
     {
-        const SfxItemSet& rItemSet = pBox->GetFrameFormat()->GetAttrSet();
+        const SfxItemSet& rItemSet = m_pBox->GetFrameFormat()->GetAttrSet();
         const SfxPoolItem *pItem;
         if( SfxItemState::SET == rItemSet.GetItemState( RES_VERT_ORIENT, false, &pItem ) )
         {