sw: prefix members of SvxCSS1PropertyInfo

Change-Id: I9ac5e5f75e76694dd372bcafd87e84a63f61b47c
Reviewed-on: https://gerrit.libreoffice.org/30219
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>

11 files changed, 338 insertions, 338 deletions

diff --git a/sw/source/filter/html/htmlcss1.cxx b/sw/source/filter/html/htmlcss1.cxx
index c1f0fcdc93d0..1b8bc8385390 100644
--- a/sw/source/filter/html/htmlcss1.cxx
+++ b/sw/source/filter/html/htmlcss1.cxx
@@ -134,7 +134,7 @@ bool SwCSS1Parser::SetFormatBreak( SfxItemSet& rItemSet,
     bool bKeep = false;
     bool bSetKeep = false, bSetBreak = false, bSetPageDesc = false;
     const SwPageDesc *pPageDesc = nullptr;
-    switch( rPropInfo.ePageBreakBefore )
+    switch( rPropInfo.m_ePageBreakBefore )
     {
     case SVX_CSS1_PBREAK_ALWAYS:
         eBreak = SvxBreak::PageBefore;
@@ -154,7 +154,7 @@ bool SwCSS1Parser::SetFormatBreak( SfxItemSet& rItemSet,
     default:
         ;
     }
-    switch( rPropInfo.ePageBreakAfter )
+    switch( rPropInfo.m_ePageBreakAfter )
     {
     case SVX_CSS1_PBREAK_ALWAYS:
     case SVX_CSS1_PBREAK_LEFT:
@@ -279,29 +279,29 @@ static void SetTextCollAttrs( SwTextFormatColl *pColl, SfxItemSet& rItemSet,
     const SfxPoolItem *pCollItem, *pItem;
 
     // linker, rechter Rand und Erstzeilen-Einzug
-    if( (rPropInfo.bLeftMargin || rPropInfo.bRightMargin ||
-         rPropInfo.bTextIndent) &&
-        (!rPropInfo.bLeftMargin || !rPropInfo.bRightMargin ||
-         !rPropInfo.bTextIndent) &&
+    if( (rPropInfo.m_bLeftMargin || rPropInfo.m_bRightMargin ||
+         rPropInfo.m_bTextIndent) &&
+        (!rPropInfo.m_bLeftMargin || !rPropInfo.m_bRightMargin ||
+         !rPropInfo.m_bTextIndent) &&
         SfxItemState::SET == rCollItemSet.GetItemState(RES_LR_SPACE,true,&pCollItem) &&
         SfxItemState::SET == rItemSet.GetItemState(RES_LR_SPACE,false,&pItem) )
     {
         const SvxLRSpaceItem *pLRItem = static_cast<const SvxLRSpaceItem *>(pItem);
 
         SvxLRSpaceItem aLRItem( *static_cast<const SvxLRSpaceItem *>(pCollItem) );
-        if( rPropInfo.bLeftMargin )
+        if( rPropInfo.m_bLeftMargin )
             aLRItem.SetTextLeft( pLRItem->GetTextLeft() );
-        if( rPropInfo.bRightMargin )
+        if( rPropInfo.m_bRightMargin )
             aLRItem.SetRight( pLRItem->GetRight() );
-        if( rPropInfo.bTextIndent )
+        if( rPropInfo.m_bTextIndent )
             aLRItem.SetTextFirstLineOfst( pLRItem->GetTextFirstLineOfst() );
 
         rItemSet.Put( aLRItem );
     }
 
     // oberer und unterer Rand
-    if( (rPropInfo.bTopMargin || rPropInfo.bBottomMargin) &&
-        (!rPropInfo.bTopMargin || !rPropInfo.bBottomMargin) &&
+    if( (rPropInfo.m_bTopMargin || rPropInfo.m_bBottomMargin) &&
+        (!rPropInfo.m_bTopMargin || !rPropInfo.m_bBottomMargin) &&
         SfxItemState::SET == rCollItemSet.GetItemState(RES_UL_SPACE,true,
                                                   &pCollItem) &&
         SfxItemState::SET == rItemSet.GetItemState(RES_UL_SPACE,false,&pItem) )
@@ -309,9 +309,9 @@ static void SetTextCollAttrs( SwTextFormatColl *pColl, SfxItemSet& rItemSet,
         const SvxULSpaceItem *pULItem = static_cast<const SvxULSpaceItem *>(pItem);
 
         SvxULSpaceItem aULItem( *static_cast<const SvxULSpaceItem *>(pCollItem) );
-        if( rPropInfo.bTopMargin )
+        if( rPropInfo.m_bTopMargin )
             aULItem.SetUpper( pULItem->GetUpper() );
-        if( rPropInfo.bBottomMargin )
+        if( rPropInfo.m_bBottomMargin )
             aULItem.SetLower( pULItem->GetLower() );
 
         rItemSet.Put( aULItem );
@@ -458,19 +458,19 @@ void SwCSS1Parser::SetPageDescAttrs( const SwPageDesc *pPageDesc,
     bool bChanged = false;
 
     // linker, rechter Rand und Erstzeilen-Einzug
-    if( (rPropInfo.bLeftMargin || rPropInfo.bRightMargin) &&
+    if( (rPropInfo.m_bLeftMargin || rPropInfo.m_bRightMargin) &&
         SfxItemState::SET == rItemSet.GetItemState(RES_LR_SPACE,false,&pItem) )
     {
-        if( (!rPropInfo.bLeftMargin || !rPropInfo.bRightMargin) &&
+        if( (!rPropInfo.m_bLeftMargin || !rPropInfo.m_bRightMargin) &&
             SfxItemState::SET == rPageItemSet.GetItemState(RES_LR_SPACE,
                                                       true,&pPageItem) )
         {
             const SvxLRSpaceItem *pLRItem = static_cast<const SvxLRSpaceItem *>(pItem);
 
             SvxLRSpaceItem aLRItem( *static_cast<const SvxLRSpaceItem *>(pPageItem) );
-            if( rPropInfo.bLeftMargin )
+            if( rPropInfo.m_bLeftMargin )
                 aLRItem.SetLeft( pLRItem->GetLeft() );
-            if( rPropInfo.bRightMargin )
+            if( rPropInfo.m_bRightMargin )
                 aLRItem.SetRight( pLRItem->GetRight() );
 
             rMaster.SetFormatAttr( aLRItem );
@@ -483,19 +483,19 @@ void SwCSS1Parser::SetPageDescAttrs( const SwPageDesc *pPageDesc,
     }
 
     // oberer und unterer Rand
-    if( (rPropInfo.bTopMargin || rPropInfo.bBottomMargin) &&
+    if( (rPropInfo.m_bTopMargin || rPropInfo.m_bBottomMargin) &&
         SfxItemState::SET == rItemSet.GetItemState(RES_UL_SPACE,false,&pItem) )
     {
-        if( (!rPropInfo.bTopMargin || !rPropInfo.bBottomMargin) &&
+        if( (!rPropInfo.m_bTopMargin || !rPropInfo.m_bBottomMargin) &&
             SfxItemState::SET == rPageItemSet.GetItemState(RES_UL_SPACE,
                                                       true,&pPageItem) )
         {
             const SvxULSpaceItem *pULItem = static_cast<const SvxULSpaceItem *>(pItem);
 
             SvxULSpaceItem aULItem( *static_cast<const SvxULSpaceItem *>(pPageItem) );
-            if( rPropInfo.bTopMargin )
+            if( rPropInfo.m_bTopMargin )
                 aULItem.SetUpper( pULItem->GetUpper() );
-            if( rPropInfo.bBottomMargin )
+            if( rPropInfo.m_bBottomMargin )
                 aULItem.SetLower( pULItem->GetLower() );
 
             rMaster.SetFormatAttr( aULItem );
@@ -508,12 +508,12 @@ void SwCSS1Parser::SetPageDescAttrs( const SwPageDesc *pPageDesc,
     }
 
     // die Groesse
-    if( rPropInfo.eSizeType != SVX_CSS1_STYPE_NONE )
+    if( rPropInfo.m_eSizeType != SVX_CSS1_STYPE_NONE )
     {
-        if( rPropInfo.eSizeType == SVX_CSS1_STYPE_TWIP )
+        if( rPropInfo.m_eSizeType == SVX_CSS1_STYPE_TWIP )
         {
-            rMaster.SetFormatAttr( SwFormatFrameSize( ATT_FIX_SIZE, rPropInfo.nWidth,
-                                           rPropInfo.nHeight ) );
+            rMaster.SetFormatAttr( SwFormatFrameSize( ATT_FIX_SIZE, rPropInfo.m_nWidth,
+                                           rPropInfo.m_nHeight ) );
             bChanged = true;
         }
         else
@@ -525,9 +525,9 @@ void SwCSS1Parser::SetPageDescAttrs( const SwPageDesc *pPageDesc,
             SwFormatFrameSize aFrameSz( rMaster.GetFrameSize() );
             bool bLandscape = aNewPageDesc.GetLandscape();
             if( ( bLandscape &&
-                  rPropInfo.eSizeType == SVX_CSS1_STYPE_PORTRAIT ) ||
+                  rPropInfo.m_eSizeType == SVX_CSS1_STYPE_PORTRAIT ) ||
                 ( !bLandscape &&
-                  rPropInfo.eSizeType == SVX_CSS1_STYPE_LANDSCAPE ) )
+                  rPropInfo.m_eSizeType == SVX_CSS1_STYPE_LANDSCAPE ) )
             {
                 SwTwips nTmp = aFrameSz.GetHeight();
                 aFrameSz.SetHeight( aFrameSz.GetWidth() );
@@ -979,7 +979,7 @@ void SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector,
         if( !pNext ||
             (CSS1_SELTYPE_PSEUDO==eNextType &&
              pNext->GetString().equalsIgnoreAsciiCase( "first-letter" ) &&
-             SVX_ADJUST_LEFT == rPropInfo.eFloat) )
+             SVX_ADJUST_LEFT == rPropInfo.m_eFloat) )
         {
             // Entweder kein zusammengesetzter Selektor oder
             // ein X:first-line { float: left; ... }
@@ -1063,7 +1063,7 @@ void SwCSS1Parser::StyleParsed( const CSS1Selector *pSelector,
                 // ggf. angelegte Zeichen-Vorlage spaeter ueber den Namen
                 // gesucht und gesetzt.
                 if( aDrop.GetLines() > 1 &&
-                    (SVX_ADJUST_LEFT == rPropInfo.eFloat  ||
+                    (SVX_ADJUST_LEFT == rPropInfo.m_eFloat  ||
                      CSS1_SCRIPT_ALL == nScript) )
                 {
                     pColl->SetFormatAttr( aDrop );
@@ -1441,15 +1441,15 @@ bool SwCSS1Parser::MayBePositioned( const SvxCSS1PropertyInfo& rPropInfo,
     //   gegeben und enthalten auch keine %-Angabe, oder
     // - das Tag soll fliessen, und
     // - es wurde eine Breite angegeben (in beiden Faellen noetig)
-    return ( ( SVX_CSS1_POS_ABSOLUTE     == rPropInfo.ePosition &&
-               SVX_CSS1_LTYPE_PERCENTAGE != rPropInfo.eLeftType &&
-               SVX_CSS1_LTYPE_PERCENTAGE != rPropInfo.eTopType &&
-              (SVX_CSS1_LTYPE_TWIP       == rPropInfo.eLeftType ||
-               SVX_CSS1_LTYPE_TWIP       != rPropInfo.eTopType) ) ||
-             ( SVX_ADJUST_END            != rPropInfo.eFloat  ) ) &&
+    return ( ( SVX_CSS1_POS_ABSOLUTE     == rPropInfo.m_ePosition &&
+               SVX_CSS1_LTYPE_PERCENTAGE != rPropInfo.m_eLeftType &&
+               SVX_CSS1_LTYPE_PERCENTAGE != rPropInfo.m_eTopType &&
+              (SVX_CSS1_LTYPE_TWIP       == rPropInfo.m_eLeftType ||
+               SVX_CSS1_LTYPE_TWIP       != rPropInfo.m_eTopType) ) ||
+             ( SVX_ADJUST_END            != rPropInfo.m_eFloat  ) ) &&
            ( bAutoWidth ||
-             SVX_CSS1_LTYPE_TWIP         == rPropInfo.eWidthType ||
-             SVX_CSS1_LTYPE_PERCENTAGE   == rPropInfo.eWidthType );
+             SVX_CSS1_LTYPE_TWIP         == rPropInfo.m_eWidthType ||
+             SVX_CSS1_LTYPE_PERCENTAGE   == rPropInfo.m_eWidthType );
 }
 
 void SwCSS1Parser::AddClassName( OUString& rFormatName, const OUString& rClass )
@@ -1887,7 +1887,7 @@ bool SwHTMLParser::ParseStyleOptions( const OUString &rStyle,
             SvxCSS1Parser::MergeStyles( pId->GetItemSet(),
                                       pId->GetPropertyInfo(),
                                       rItemSet, rPropInfo, !rClass.isEmpty() );
-        rPropInfo.aId = rId;
+        rPropInfo.m_aId = rId;
         bRet = true;
     }
 
@@ -1948,10 +1948,10 @@ void SwHTMLParser::SetAnchorAndAdjustment( const SfxItemSet & /*rItemSet*/,
     sal_Int16 eVertRel = text::RelOrientation::FRAME;
     SwTwips nHoriPos = 0, nVertPos = 0;
     SwSurround eSurround = SURROUND_THROUGHT;
-    if( SVX_CSS1_POS_ABSOLUTE == rPropInfo.ePosition )
+    if( SVX_CSS1_POS_ABSOLUTE == rPropInfo.m_ePosition )
     {
-        if( SVX_CSS1_LTYPE_TWIP == rPropInfo.eLeftType &&
-            SVX_CSS1_LTYPE_TWIP == rPropInfo.eTopType )
+        if( SVX_CSS1_LTYPE_TWIP == rPropInfo.m_eLeftType &&
+            SVX_CSS1_LTYPE_TWIP == rPropInfo.m_eTopType )
         {
             // Absolut positionierte Objekte sind seitengebunden, wenn
             // sie nicht schon in einem Rahmen stehen und sonst
@@ -1969,8 +1969,8 @@ void SwHTMLParser::SetAnchorAndAdjustment( const SfxItemSet & /*rItemSet*/,
                 aAnchor.SetType( FLY_AT_PAGE );
                 aAnchor.SetPageNum( 1 );
             }
-            nHoriPos = rPropInfo.nLeft;
-            nVertPos = rPropInfo.nTop;
+            nHoriPos = rPropInfo.m_nLeft;
+            nVertPos = rPropInfo.m_nTop;
         }
         else
         {
@@ -1978,11 +1978,11 @@ void SwHTMLParser::SetAnchorAndAdjustment( const SfxItemSet & /*rItemSet*/,
             aAnchor.SetAnchor( m_pPam->GetPoint() );
             eVertOri = text::VertOrientation::TOP;
             eVertRel = text::RelOrientation::CHAR;
-            if( SVX_CSS1_LTYPE_TWIP == rPropInfo.eLeftType )
+            if( SVX_CSS1_LTYPE_TWIP == rPropInfo.m_eLeftType )
             {
                 eHoriOri = text::HoriOrientation::NONE;
                 eHoriRel = text::RelOrientation::PAGE_FRAME;
-                nHoriPos = rPropInfo.nLeft;
+                nHoriPos = rPropInfo.m_nLeft;
             }
             else
             {
@@ -2021,7 +2021,7 @@ void SwHTMLParser::SetAnchorAndAdjustment( const SfxItemSet & /*rItemSet*/,
         short nIndent = 0;
         GetMarginsFromContextWithNumBul( nLeftSpace, nRightSpace, nIndent );
 
-        if( SVX_ADJUST_RIGHT==rPropInfo.eFloat )
+        if( SVX_ADJUST_RIGHT==rPropInfo.m_eFloat )
         {
             eHoriOri = text::HoriOrientation::RIGHT;
             eHoriRel = nRightSpace ? text::RelOrientation::PRINT_AREA : text::RelOrientation::FRAME;
@@ -2050,28 +2050,28 @@ void SwHTMLParser::SetVarSize( SfxItemSet & /*rItemSet*/,
     SwFrameSize eSize = ATT_MIN_SIZE;
     SwTwips nWidth = nDfltWidth, nHeight = MINFLY;
     sal_uInt8 nPrcWidth = nDfltPrcWidth, nPrcHeight = 0;
-    switch( rPropInfo.eWidthType )
+    switch( rPropInfo.m_eWidthType )
     {
     case SVX_CSS1_LTYPE_PERCENTAGE:
-        nPrcWidth = rPropInfo.nWidth > 0 ? (sal_uInt8)rPropInfo.nWidth : 1;
+        nPrcWidth = rPropInfo.m_nWidth > 0 ? (sal_uInt8)rPropInfo.m_nWidth : 1;
         nWidth = MINFLY;
         break;
     case SVX_CSS1_LTYPE_TWIP:
-        nWidth = rPropInfo.nWidth > MINFLY ? rPropInfo.nWidth : MINFLY;
+        nWidth = rPropInfo.m_nWidth > MINFLY ? rPropInfo.m_nWidth : MINFLY;
         nPrcWidth = 0;
         break;
     default:
         ;
     }
-    switch( rPropInfo.eHeightType )
+    switch( rPropInfo.m_eHeightType )
     {
     case SVX_CSS1_LTYPE_PERCENTAGE:
-        nPrcHeight = rPropInfo.nHeight > 0 ? (sal_uInt8)rPropInfo.nHeight : 1;
+        nPrcHeight = rPropInfo.m_nHeight > 0 ? (sal_uInt8)rPropInfo.m_nHeight : 1;
         break;
     case SVX_CSS1_LTYPE_TWIP:
         // Netscape und MS-IE interpretieren die Hoehe regelwiedrig
         // als Mindest-Hoehe, also machwn wir das auch so.
-        nHeight = rPropInfo.nHeight > MINFLY ? rPropInfo.nHeight : MINFLY;
+        nHeight = rPropInfo.m_nHeight > MINFLY ? rPropInfo.m_nHeight : MINFLY;
         break;
     default:
         ;
diff --git a/sw/source/filter/html/htmlctxt.cxx b/sw/source/filter/html/htmlctxt.cxx
index dee8fc7a6908..afdf468bec81 100644
--- a/sw/source/filter/html/htmlctxt.cxx
+++ b/sw/source/filter/html/htmlctxt.cxx
@@ -443,9 +443,9 @@ bool SwHTMLParser::DoPositioning( SfxItemSet &rItemSet,
                         HtmlFrameFormatFlags::Box|HtmlFrameFormatFlags::Padding|HtmlFrameFormatFlags::Background|HtmlFrameFormatFlags::Direction,
                         aFrameItemSet );
 
-        InsertFlyFrame(aFrameItemSet, pContext, rPropInfo.aId);
+        InsertFlyFrame(aFrameItemSet, pContext, rPropInfo.m_aId);
         pContext->SetPopStack( true );
-        rPropInfo.aId.clear();
+        rPropInfo.m_aId.clear();
         bRet = true;
     }
 
@@ -489,7 +489,7 @@ void SwHTMLParser::InsertAttrs( SfxItemSet &rItemSet,
     // Ein DropCap-Attribut basteln, wenn auf Zeichen-Ebene vor dem
     // ersten Zeichen ein float: left vorkommt
     if( bCharLvl && !m_pPam->GetPoint()->nContent.GetIndex() &&
-        SVX_ADJUST_LEFT == rPropInfo.eFloat )
+        SVX_ADJUST_LEFT == rPropInfo.m_eFloat )
     {
         SwFormatDrop aDrop;
         aDrop.GetChars() = 1;
@@ -554,29 +554,29 @@ void SwHTMLParser::InsertAttrs( SfxItemSet &rItemSet,
                 // Abfrage ueber das Item funktioniert aber trotzdem, denn
                 // fuer negative Werte wird das Item (mit Wert 0) auch
                 // eingefuegt.
-                if( rPropInfo.bLeftMargin )
+                if( rPropInfo.m_bLeftMargin )
                 {
-                    OSL_ENSURE( rPropInfo.nLeftMargin < 0 ||
-                            rPropInfo.nLeftMargin == pLRItem->GetTextLeft(),
+                    OSL_ENSURE( rPropInfo.m_nLeftMargin < 0 ||
+                            rPropInfo.m_nLeftMargin == pLRItem->GetTextLeft(),
                             "linker Abstand stimmt nicht mit Item ueberein" );
-                    if( rPropInfo.nLeftMargin < 0 &&
-                        -rPropInfo.nLeftMargin > nOldLeft )
+                    if( rPropInfo.m_nLeftMargin < 0 &&
+                        -rPropInfo.m_nLeftMargin > nOldLeft )
                         nLeft = 0;
                     else
-                        nLeft = nOldLeft + static_cast< sal_uInt16 >(rPropInfo.nLeftMargin);
+                        nLeft = nOldLeft + static_cast< sal_uInt16 >(rPropInfo.m_nLeftMargin);
                 }
-                if( rPropInfo.bRightMargin )
+                if( rPropInfo.m_bRightMargin )
                 {
-                    OSL_ENSURE( rPropInfo.nRightMargin < 0 ||
-                            rPropInfo.nRightMargin == pLRItem->GetRight(),
+                    OSL_ENSURE( rPropInfo.m_nRightMargin < 0 ||
+                            rPropInfo.m_nRightMargin == pLRItem->GetRight(),
                             "rechter Abstand stimmt nicht mit Item ueberein" );
-                    if( rPropInfo.nRightMargin < 0 &&
-                        -rPropInfo.nRightMargin > nOldRight )
+                    if( rPropInfo.m_nRightMargin < 0 &&
+                        -rPropInfo.m_nRightMargin > nOldRight )
                         nRight = 0;
                     else
-                        nRight = nOldRight + static_cast< sal_uInt16 >(rPropInfo.nRightMargin);
+                        nRight = nOldRight + static_cast< sal_uInt16 >(rPropInfo.m_nRightMargin);
                 }
-                if( rPropInfo.bTextIndent )
+                if( rPropInfo.m_bTextIndent )
                     nIndent = pLRItem->GetTextFirstLineOfst();
 
                 // und die Werte fuer nachfolgende Absaetze merken
@@ -593,14 +593,14 @@ void SwHTMLParser::InsertAttrs( SfxItemSet &rItemSet,
             break;
 
         case RES_UL_SPACE:
-            if( !rPropInfo.bTopMargin || !rPropInfo.bBottomMargin )
+            if( !rPropInfo.m_bTopMargin || !rPropInfo.m_bBottomMargin )
             {
                 sal_uInt16 nUpper = 0, nLower = 0;
                 GetULSpaceFromContext( nUpper, nLower );
                 SvxULSpaceItem aULSpace( *static_cast<const SvxULSpaceItem *>(pItem) );
-                if( !rPropInfo.bTopMargin )
+                if( !rPropInfo.m_bTopMargin )
                     aULSpace.SetUpper( nUpper );
-                if( !rPropInfo.bBottomMargin )
+                if( !rPropInfo.m_bBottomMargin )
                     aULSpace.SetLower( nLower );
 
                 NewAttr( &m_aAttrTab.pULSpace, aULSpace );
@@ -690,8 +690,8 @@ void SwHTMLParser::InsertAttrs( SfxItemSet &rItemSet,
         pItem = aIter.NextItem();
     }
 
-    if( !rPropInfo.aId.isEmpty() )
-        InsertBookmark( rPropInfo.aId );
+    if( !rPropInfo.m_aId.isEmpty() )
+        InsertBookmark( rPropInfo.m_aId );
 }
 
 void SwHTMLParser::InsertAttr( HTMLAttr **ppAttr, const SfxPoolItem & rItem,
diff --git a/sw/source/filter/html/htmldrawreader.cxx b/sw/source/filter/html/htmldrawreader.cxx
index db0fae6876d2..61b69da31619 100644
--- a/sw/source/filter/html/htmldrawreader.cxx
+++ b/sw/source/filter/html/htmldrawreader.cxx
@@ -106,15 +106,15 @@ void SwHTMLParser::InsertDrawObject( SdrObject* pNewDrawObj,
         const SvxLRSpaceItem *pLRItem = static_cast<const SvxLRSpaceItem *>(pItem);
         SvxLRSpaceItem aLRItem( *pLRItem );
         aLRItem.SetTextFirstLineOfst( 0 );
-        if( rCSS1PropInfo.bLeftMargin )
+        if( rCSS1PropInfo.m_bLeftMargin )
         {
             nLeftSpace = static_cast< sal_uInt16 >(aLRItem.GetLeft());
-            rCSS1PropInfo.bLeftMargin = false;
+            rCSS1PropInfo.m_bLeftMargin = false;
         }
-        if( rCSS1PropInfo.bRightMargin )
+        if( rCSS1PropInfo.m_bRightMargin )
         {
             nRightSpace = static_cast< sal_uInt16 >(aLRItem.GetRight());
-            rCSS1PropInfo.bRightMargin = false;
+            rCSS1PropInfo.m_bRightMargin = false;
         }
         rCSS1ItemSet.ClearItem( RES_LR_SPACE );
     }
@@ -131,15 +131,15 @@ void SwHTMLParser::InsertDrawObject( SdrObject* pNewDrawObj,
     {
         // Ggf. den Erstzeilen-Einzug noch plaetten
         const SvxULSpaceItem *pULItem = static_cast<const SvxULSpaceItem *>(pItem);
-        if( rCSS1PropInfo.bTopMargin )
+        if( rCSS1PropInfo.m_bTopMargin )
         {
             nUpperSpace = pULItem->GetUpper();
-            rCSS1PropInfo.bTopMargin = false;
+            rCSS1PropInfo.m_bTopMargin = false;
         }
-        if( rCSS1PropInfo.bBottomMargin )
+        if( rCSS1PropInfo.m_bBottomMargin )
         {
             nLowerSpace = pULItem->GetLower();
-            rCSS1PropInfo.bBottomMargin = false;
+            rCSS1PropInfo.m_bBottomMargin = false;
         }
 
         rCSS1ItemSet.ClearItem( RES_UL_SPACE );
@@ -153,9 +153,9 @@ void SwHTMLParser::InsertDrawObject( SdrObject* pNewDrawObj,
     }
 
     SwFormatAnchor aAnchor( FLY_AS_CHAR );
-    if( SVX_CSS1_POS_ABSOLUTE == rCSS1PropInfo.ePosition &&
-        SVX_CSS1_LTYPE_TWIP == rCSS1PropInfo.eLeftType &&
-        SVX_CSS1_LTYPE_TWIP == rCSS1PropInfo.eTopType )
+    if( SVX_CSS1_POS_ABSOLUTE == rCSS1PropInfo.m_ePosition &&
+        SVX_CSS1_LTYPE_TWIP == rCSS1PropInfo.m_eLeftType &&
+        SVX_CSS1_LTYPE_TWIP == rCSS1PropInfo.m_eTopType )
     {
         const SwStartNode *pFlySttNd =
             m_pPam->GetPoint()->nNode.GetNode().FindFlyStartNode();
@@ -171,11 +171,11 @@ void SwHTMLParser::InsertDrawObject( SdrObject* pNewDrawObj,
             aAnchor.SetType( FLY_AT_PAGE );
         }
         // #i26791# - direct positioning for <SwDoc::Insert(..)>
-        pNewDrawObj->SetRelativePos( Point(rCSS1PropInfo.nLeft + nLeftSpace,
-                                           rCSS1PropInfo.nTop + nUpperSpace) );
+        pNewDrawObj->SetRelativePos( Point(rCSS1PropInfo.m_nLeft + nLeftSpace,
+                                           rCSS1PropInfo.m_nTop + nUpperSpace) );
         aFrameSet.Put( SwFormatSurround(SURROUND_THROUGHT) );
     }
-    else if( SVX_ADJUST_LEFT == rCSS1PropInfo.eFloat ||
+    else if( SVX_ADJUST_LEFT == rCSS1PropInfo.m_eFloat ||
              text::HoriOrientation::LEFT == eHoriOri )
     {
         aAnchor.SetType( FLY_AT_PARA );
@@ -468,14 +468,14 @@ void SwHTMLParser::NewMarquee( HTMLTable *pCurTable )
                     ->PixelToLogic( aTwipSz, MapMode( MapUnit::MapTwip ) );
     }
 
-    if( SVX_CSS1_LTYPE_TWIP== aPropInfo.eWidthType )
+    if( SVX_CSS1_LTYPE_TWIP== aPropInfo.m_eWidthType )
     {
-        aTwipSz.Width() = aPropInfo.nWidth;
+        aTwipSz.Width() = aPropInfo.m_nWidth;
         nWidth = 1; // != 0;
         bPrcWidth = false;
     }
-    if( SVX_CSS1_LTYPE_TWIP== aPropInfo.eHeightType )
-        aTwipSz.Height() = aPropInfo.nHeight;
+    if( SVX_CSS1_LTYPE_TWIP== aPropInfo.m_eHeightType )
+        aTwipSz.Height() = aPropInfo.m_nHeight;
 
     m_bFixMarqueeWidth = false;
     if( !nWidth || bPrcWidth )
diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx
index 9d233891db18..0dceef8cc4de 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -914,15 +914,15 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl(
             const SvxLRSpaceItem *pLRItem = static_cast<const SvxLRSpaceItem *>(pItem);
             SvxLRSpaceItem aLRItem( *pLRItem );
             aLRItem.SetTextFirstLineOfst( 0 );
-            if( rCSS1PropInfo.bLeftMargin )
+            if( rCSS1PropInfo.m_bLeftMargin )
             {
                 nLeftSpace = convertTwipToMm100( aLRItem.GetLeft() );
-                rCSS1PropInfo.bLeftMargin = false;
+                rCSS1PropInfo.m_bLeftMargin = false;
             }
-            if( rCSS1PropInfo.bRightMargin )
+            if( rCSS1PropInfo.m_bRightMargin )
             {
                 nRightSpace = convertTwipToMm100( aLRItem.GetRight() );
-                rCSS1PropInfo.bRightMargin = false;
+                rCSS1PropInfo.m_bRightMargin = false;
             }
             rCSS1ItemSet.ClearItem( RES_LR_SPACE );
         }
@@ -942,15 +942,15 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl(
         {
             // Ggf. den Erstzeilen-Einzug noch plaetten
             const SvxULSpaceItem *pULItem = static_cast<const SvxULSpaceItem *>(pItem);
-            if( rCSS1PropInfo.bTopMargin )
+            if( rCSS1PropInfo.m_bTopMargin )
             {
                 nUpperSpace = convertTwipToMm100( pULItem->GetUpper() );
-                rCSS1PropInfo.bTopMargin = false;
+                rCSS1PropInfo.m_bTopMargin = false;
             }
-            if( rCSS1PropInfo.bBottomMargin )
+            if( rCSS1PropInfo.m_bBottomMargin )
             {
                 nLowerSpace = convertTwipToMm100( pULItem->GetLower() );
-                rCSS1PropInfo.bBottomMargin = false;
+                rCSS1PropInfo.m_bBottomMargin = false;
             }
 
             rCSS1ItemSet.ClearItem( RES_UL_SPACE );
@@ -1083,9 +1083,9 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl(
         bool bSetPos = false, bSetSurround = false;
         sal_Int32 nXPos = 0, nYPos = 0;
         sal_Int16 nSurround = text::WrapTextMode_NONE;
-        if( SVX_CSS1_POS_ABSOLUTE == rCSS1PropInfo.ePosition &&
-            SVX_CSS1_LTYPE_TWIP == rCSS1PropInfo.eLeftType &&
-            SVX_CSS1_LTYPE_TWIP == rCSS1PropInfo.eTopType )
+        if( SVX_CSS1_POS_ABSOLUTE == rCSS1PropInfo.m_ePosition &&
+            SVX_CSS1_LTYPE_TWIP == rCSS1PropInfo.m_eLeftType &&
+            SVX_CSS1_LTYPE_TWIP == rCSS1PropInfo.m_eTopType )
         {
             const SwStartNode *pFlySttNd =
                 m_pPam->GetPoint()->nNode.GetNode().FindFlyStartNode();
@@ -1102,14 +1102,14 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl(
             {
                 nAnchorType = text::TextContentAnchorType_AT_PAGE;
             }
-            nXPos = convertTwipToMm100( rCSS1PropInfo.nLeft ) + nLeftSpace;
-            nYPos = convertTwipToMm100( rCSS1PropInfo.nTop ) + nUpperSpace;
+            nXPos = convertTwipToMm100( rCSS1PropInfo.m_nLeft ) + nLeftSpace;
+            nYPos = convertTwipToMm100( rCSS1PropInfo.m_nTop ) + nUpperSpace;
             bSetPos = true;
 
             nSurround = text::WrapTextMode_THROUGHT;
             bSetSurround = true;
         }
-        else if( SVX_ADJUST_LEFT == rCSS1PropInfo.eFloat ||
+        else if( SVX_ADJUST_LEFT == rCSS1PropInfo.m_eFloat ||
                  text::HoriOrientation::LEFT == eHoriOri )
         {
             nAnchorType = text::TextContentAnchorType_AT_PARAGRAPH;
@@ -1798,15 +1798,15 @@ void SwHTMLParser::InsertInput()
             InsertBookmark( aId );
     }
 
-    if( SVX_CSS1_LTYPE_TWIP== aCSS1PropInfo.eWidthType )
+    if( SVX_CSS1_LTYPE_TWIP== aCSS1PropInfo.m_eWidthType )
     {
-        aSz.Width() = convertTwipToMm100( aCSS1PropInfo.nWidth );
+        aSz.Width() = convertTwipToMm100( aCSS1PropInfo.m_nWidth );
         aTextSz.Width() = 0;
         bMinWidth = false;
     }
-    if( SVX_CSS1_LTYPE_TWIP== aCSS1PropInfo.eHeightType )
+    if( SVX_CSS1_LTYPE_TWIP== aCSS1PropInfo.m_eHeightType )
     {
-        aSz.Height() = convertTwipToMm100( aCSS1PropInfo.nHeight );
+        aSz.Height() = convertTwipToMm100( aCSS1PropInfo.m_nHeight );
         aTextSz.Height() = 0;
         bMinHeight = false;
     }
@@ -2062,14 +2062,14 @@ void SwHTMLParser::NewTextArea()
     }
 
     Size aSz( MINFLY, MINFLY );
-    if( SVX_CSS1_LTYPE_TWIP== aCSS1PropInfo.eWidthType )
+    if( SVX_CSS1_LTYPE_TWIP== aCSS1PropInfo.m_eWidthType )
     {
-        aSz.Width() = convertTwipToMm100( aCSS1PropInfo.nWidth );
+        aSz.Width() = convertTwipToMm100( aCSS1PropInfo.m_nWidth );
         aTextSz.Width() = 0;
     }
-    if( SVX_CSS1_LTYPE_TWIP== aCSS1PropInfo.eHeightType )
+    if( SVX_CSS1_LTYPE_TWIP== aCSS1PropInfo.m_eHeightType )
     {
-        aSz.Height() = convertTwipToMm100( aCSS1PropInfo.nHeight );
+        aSz.Height() = convertTwipToMm100( aCSS1PropInfo.m_nHeight );
         aTextSz.Height() = 0;
     }
     if( aSz.Width() < MINFLY )
@@ -2331,15 +2331,15 @@ void SwHTMLParser::NewSelect()
 
     Size aSz( MINFLY, MINFLY );
     m_bFixSelectWidth = m_bFixSelectHeight = true;
-    if( SVX_CSS1_LTYPE_TWIP== aCSS1PropInfo.eWidthType )
+    if( SVX_CSS1_LTYPE_TWIP== aCSS1PropInfo.m_eWidthType )
     {
-        aSz.Width() = convertTwipToMm100( aCSS1PropInfo.nWidth );
+        aSz.Width() = convertTwipToMm100( aCSS1PropInfo.m_nWidth );
         m_bFixSelectWidth = false;
         bMinWidth = false;
     }
-    if( SVX_CSS1_LTYPE_TWIP== aCSS1PropInfo.eHeightType )
+    if( SVX_CSS1_LTYPE_TWIP== aCSS1PropInfo.m_eHeightType )
     {
-        aSz.Height() = convertTwipToMm100( aCSS1PropInfo.nHeight );
+        aSz.Height() = convertTwipToMm100( aCSS1PropInfo.m_nHeight );
         aTextSz.Height() = 0;
         bMinHeight = false;
     }
diff --git a/sw/source/filter/html/htmlgrin.cxx b/sw/source/filter/html/htmlgrin.cxx
index 44e68132bc16..2485f1123c95 100644
--- a/sw/source/filter/html/htmlgrin.cxx
+++ b/sw/source/filter/html/htmlgrin.cxx
@@ -557,31 +557,31 @@ IMAGE_SETEVENT:
     }
 
     // CSS1-Groesse auf "normale" Groesse umrechnen
-    switch( aPropInfo.eWidthType )
+    switch( aPropInfo.m_eWidthType )
     {
         case SVX_CSS1_LTYPE_TWIP:
-            aTwipSz.Width() = aPropInfo.nWidth;
+            aTwipSz.Width() = aPropInfo.m_nWidth;
             nWidth = 1; // != 0
             bPrcWidth = false;
             break;
         case SVX_CSS1_LTYPE_PERCENTAGE:
             aTwipSz.Width() = 0;
-            nWidth = aPropInfo.nWidth;
+            nWidth = aPropInfo.m_nWidth;
             bPrcWidth = true;
             break;
         default:
             ;
     }
-    switch( aPropInfo.eHeightType )
+    switch( aPropInfo.m_eHeightType )
     {
         case SVX_CSS1_LTYPE_TWIP:
-            aTwipSz.Height() = aPropInfo.nHeight;
+            aTwipSz.Height() = aPropInfo.m_nHeight;
             nHeight = 1;    // != 0
             bPrcHeight = false;
             break;
         case SVX_CSS1_LTYPE_PERCENTAGE:
             aTwipSz.Height() = 0;
-            nHeight = aPropInfo.nHeight;
+            nHeight = aPropInfo.m_nHeight;
             bPrcHeight = true;
             break;
         default:
diff --git a/sw/source/filter/html/htmlnumreader.cxx b/sw/source/filter/html/htmlnumreader.cxx
index bdbef48e5043..5140ac2d8097 100644
--- a/sw/source/filter/html/htmlnumreader.cxx
+++ b/sw/source/filter/html/htmlnumreader.cxx
@@ -268,25 +268,25 @@ void SwHTMLParser::NewNumBulList( int nToken )
         {
             if( bNewNumFormat )
             {
-                if( aPropInfo.bLeftMargin )
+                if( aPropInfo.m_bLeftMargin )
                 {
                     // Der Der Default-Einzug wurde schon eingefuegt.
                     sal_uInt16 nAbsLSpace =
                         aNumFormat.GetAbsLSpace() - HTML_NUMBUL_MARGINLEFT;
-                    if( aPropInfo.nLeftMargin < 0 &&
-                        nAbsLSpace < -aPropInfo.nLeftMargin )
+                    if( aPropInfo.m_nLeftMargin < 0 &&
+                        nAbsLSpace < -aPropInfo.m_nLeftMargin )
                         nAbsLSpace = 0U;
-                    else if( aPropInfo.nLeftMargin > USHRT_MAX ||
+                    else if( aPropInfo.m_nLeftMargin > USHRT_MAX ||
                              (long)nAbsLSpace +
-                                            aPropInfo.nLeftMargin > USHRT_MAX )
+                                            aPropInfo.m_nLeftMargin > USHRT_MAX )
                         nAbsLSpace = USHRT_MAX;
                     else
-                        nAbsLSpace = nAbsLSpace + (sal_uInt16)aPropInfo.nLeftMargin;
+                        nAbsLSpace = nAbsLSpace + (sal_uInt16)aPropInfo.m_nLeftMargin;
 
                     aNumFormat.SetAbsLSpace( nAbsLSpace );
                     bChangeNumFormat = true;
                 }
-                if( aPropInfo.bTextIndent )
+                if( aPropInfo.m_bTextIndent )
                 {
                     short nTextIndent =
                         static_cast<const SvxLRSpaceItem &>(aItemSet.Get( RES_LR_SPACE ))
@@ -295,8 +295,8 @@ void SwHTMLParser::NewNumBulList( int nToken )
                     bChangeNumFormat = true;
                 }
             }
-            aPropInfo.bLeftMargin = aPropInfo.bTextIndent = false;
-            if( !aPropInfo.bRightMargin )
+            aPropInfo.m_bLeftMargin = aPropInfo.m_bTextIndent = false;
+            if( !aPropInfo.m_bRightMargin )
                 aItemSet.ClearItem( RES_LR_SPACE );
 
             // #i89812# - Perform change to list style before calling <DoPositioning(..)>,
diff --git a/sw/source/filter/html/htmlplug.cxx b/sw/source/filter/html/htmlplug.cxx
index fc5ba47e2d2b..a4a24b3014ab 100644
--- a/sw/source/filter/html/htmlplug.cxx
+++ b/sw/source/filter/html/htmlplug.cxx
@@ -142,14 +142,14 @@ void SwHTMLParser::SetFixSize( const Size& rPixSize,
     }
 
     // die Breite bearbeiten
-    if( SVX_CSS1_LTYPE_PERCENTAGE == rCSS1PropInfo.eWidthType )
+    if( SVX_CSS1_LTYPE_PERCENTAGE == rCSS1PropInfo.m_eWidthType )
     {
-        nPrcWidth = (sal_uInt8)rCSS1PropInfo.nWidth;
+        nPrcWidth = (sal_uInt8)rCSS1PropInfo.m_nWidth;
         aTwipSz.Width() = rTwipDfltSize.Width();
     }
-    else if( SVX_CSS1_LTYPE_TWIP== rCSS1PropInfo.eWidthType )
+    else if( SVX_CSS1_LTYPE_TWIP== rCSS1PropInfo.m_eWidthType )
     {
-        aTwipSz.Width() = rCSS1PropInfo.nWidth;
+        aTwipSz.Width() = rCSS1PropInfo.m_nWidth;
     }
     else if( bPrcWidth && rPixSize.Width() )
     {
@@ -169,14 +169,14 @@ void SwHTMLParser::SetFixSize( const Size& rPixSize,
     }
 
     // Hoehe bearbeiten
-    if( SVX_CSS1_LTYPE_PERCENTAGE == rCSS1PropInfo.eHeightType )
+    if( SVX_CSS1_LTYPE_PERCENTAGE == rCSS1PropInfo.m_eHeightType )
     {
-        nPrcHeight = (sal_uInt8)rCSS1PropInfo.nHeight;
+        nPrcHeight = (sal_uInt8)rCSS1PropInfo.m_nHeight;
         aTwipSz.Height() = rTwipDfltSize.Height();
     }
-    else if( SVX_CSS1_LTYPE_TWIP== rCSS1PropInfo.eHeightType )
+    else if( SVX_CSS1_LTYPE_TWIP== rCSS1PropInfo.m_eHeightType )
     {
-        aTwipSz.Height() = rCSS1PropInfo.nHeight;
+        aTwipSz.Height() = rCSS1PropInfo.m_nHeight;
     }
     else if( bPrcHeight && rPixSize.Height() )
     {
@@ -227,15 +227,15 @@ void SwHTMLParser::SetSpace( const Size& rPixSpace,
         const SvxLRSpaceItem *pLRItem = static_cast<const SvxLRSpaceItem *>(pItem);
         SvxLRSpaceItem aLRItem( *pLRItem );
         aLRItem.SetTextFirstLineOfst( 0 );
-        if( rCSS1PropInfo.bLeftMargin )
+        if( rCSS1PropInfo.m_bLeftMargin )
         {
             nLeftSpace = aLRItem.GetLeft();
-            rCSS1PropInfo.bLeftMargin = false;
+            rCSS1PropInfo.m_bLeftMargin = false;
         }
-        if( rCSS1PropInfo.bRightMargin )
+        if( rCSS1PropInfo.m_bRightMargin )
         {
             nRightSpace = aLRItem.GetRight();
-            rCSS1PropInfo.bRightMargin = false;
+            rCSS1PropInfo.m_bRightMargin = false;
         }
         rCSS1ItemSet.ClearItem( RES_LR_SPACE );
     }
@@ -263,15 +263,15 @@ void SwHTMLParser::SetSpace( const Size& rPixSpace,
     {
         // Ggf. den Erstzeilen-Einzug noch plaetten
         const SvxULSpaceItem *pULItem = static_cast<const SvxULSpaceItem *>(pItem);
-        if( rCSS1PropInfo.bTopMargin )
+        if( rCSS1PropInfo.m_bTopMargin )
         {
             nUpperSpace = pULItem->GetUpper();
-            rCSS1PropInfo.bTopMargin = false;
+            rCSS1PropInfo.m_bTopMargin = false;
         }
-        if( rCSS1PropInfo.bBottomMargin )
+        if( rCSS1PropInfo.m_bBottomMargin )
         {
             nLowerSpace = pULItem->GetLower();
-            rCSS1PropInfo.bBottomMargin = false;
+            rCSS1PropInfo.m_bBottomMargin = false;
         }
         rCSS1ItemSet.ClearItem( RES_UL_SPACE );
     }
diff --git a/sw/source/filter/html/htmlsect.cxx b/sw/source/filter/html/htmlsect.cxx
index 767d86378e26..cbcfce1458ca 100644
--- a/sw/source/filter/html/htmlsect.cxx
+++ b/sw/source/filter/html/htmlsect.cxx
@@ -123,10 +123,10 @@ void SwHTMLParser::NewDivision( int nToken )
                                           aItemSet, aPropInfo, &aLang, &aDir );
         if( bStyleParsed )
         {
-            if ( aPropInfo.nColumnCount >= 2 )
+            if ( aPropInfo.m_nColumnCount >= 2 )
             {
                 delete pCntxt;
-                NewMultiCol( aPropInfo.nColumnCount );
+                NewMultiCol( aPropInfo.m_nColumnCount );
                 return;
             }
             bPositioned = HTML_DIVISION_ON == nToken && !aClass.isEmpty() &&
@@ -230,7 +230,7 @@ void SwHTMLParser::NewDivision( int nToken )
                 SwPosition aNewPos( aTmpSwNodeIndex, SwIndex( pCNd, 0 ) );
                 SaveDocContext( pCntxt, HtmlContextFlags::MultiColMask, &aNewPos );
                 aId.clear();
-                aPropInfo.aId.clear();
+                aPropInfo.m_aId.clear();
             }
         }
     }
@@ -359,8 +359,8 @@ void SwHTMLParser::NewDivision( int nToken )
         pCntxt->SetSpansSection( true );
 
         // keine text::Bookmarks mit dem gleichen Namen wie Bereiche einfuegen
-        if( !aPropInfo.aId.isEmpty() && aPropInfo.aId==aName )
-            aPropInfo.aId.clear();
+        if( !aPropInfo.m_aId.isEmpty() && aPropInfo.m_aId==aName )
+            aPropInfo.m_aId.clear();
     }
     else
     {
@@ -640,7 +640,7 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss )
         if( nCols < 2 )
         {
             aFlyName = aId;
-            aPropInfo.aId.clear();
+            aPropInfo.m_aId.clear();
         }
 
         InsertFlyFrame(aFrameItemSet, pCntxt, aFlyName);
@@ -746,8 +746,8 @@ void SwHTMLParser::NewMultiCol( sal_uInt16 columnsFromCss )
         pCntxt->SetSpansSection( true );
 
         // Insert a bookmark if its name differs from the section's name only.
-        if( !aPropInfo.aId.isEmpty() && aPropInfo.aId==aName )
-            aPropInfo.aId.clear();
+        if( !aPropInfo.m_aId.isEmpty() && aPropInfo.m_aId==aName )
+            aPropInfo.m_aId.clear();
     }
 
     // Additional attributes must be set as hard ones.
diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx
index 26fd9cec82e8..ca43c6a71a1a 100644
--- a/sw/source/filter/html/svxcss1.cxx
+++ b/sw/source/filter/html/svxcss1.cxx
@@ -341,43 +341,43 @@ void SvxCSS1BorderInfo::SetBorderLine( SvxBoxItemLine nLine, SvxBoxItem &rBoxIte
 
 SvxCSS1PropertyInfo::SvxCSS1PropertyInfo()
 {
-    for(SvxCSS1BorderInfo* & rp : aBorderInfos)
+    for(SvxCSS1BorderInfo* & rp : m_aBorderInfos)
         rp = nullptr;
 
     Clear();
 }
 
 SvxCSS1PropertyInfo::SvxCSS1PropertyInfo( const SvxCSS1PropertyInfo& rProp ) :
-    aId( rProp.aId ),
-    bTopMargin( rProp.bTopMargin ),
-    bBottomMargin( rProp.bBottomMargin ),
-    bLeftMargin( rProp.bLeftMargin ),
-    bRightMargin( rProp.bRightMargin ),
-    bTextIndent( rProp.bTextIndent ),
-    eFloat( rProp.eFloat ),
-    ePosition( rProp.ePosition ),
-    nTopBorderDistance( rProp.nTopBorderDistance ),
-    nBottomBorderDistance( rProp.nBottomBorderDistance ),
-    nLeftBorderDistance( rProp.nLeftBorderDistance ),
-    nRightBorderDistance( rProp.nRightBorderDistance ),
-    nColumnCount( rProp.nColumnCount ),
-    nLeft( rProp.nLeft ),
-    nTop( rProp.nTop ),
-    nWidth( rProp.nWidth ),
-    nHeight( rProp.nHeight ),
-    nLeftMargin( rProp.nLeftMargin ),
-    nRightMargin( rProp.nRightMargin ),
-    eLeftType( rProp.eLeftType ),
-    eTopType( rProp.eTopType ),
-    eWidthType( rProp.eWidthType ),
-    eHeightType( rProp.eHeightType ),
-    eSizeType( rProp.eSizeType ),
-    ePageBreakBefore( rProp.ePageBreakBefore ),
-    ePageBreakAfter( rProp.ePageBreakAfter )
-{
-    for( size_t i=0; i<SAL_N_ELEMENTS(aBorderInfos); ++i )
-        aBorderInfos[i] = rProp.aBorderInfos[i]
-                            ? new SvxCSS1BorderInfo( *rProp.aBorderInfos[i] )
+    m_aId( rProp.m_aId ),
+    m_bTopMargin( rProp.m_bTopMargin ),
+    m_bBottomMargin( rProp.m_bBottomMargin ),
+    m_bLeftMargin( rProp.m_bLeftMargin ),
+    m_bRightMargin( rProp.m_bRightMargin ),
+    m_bTextIndent( rProp.m_bTextIndent ),
+    m_eFloat( rProp.m_eFloat ),
+    m_ePosition( rProp.m_ePosition ),
+    m_nTopBorderDistance( rProp.m_nTopBorderDistance ),
+    m_nBottomBorderDistance( rProp.m_nBottomBorderDistance ),
+    m_nLeftBorderDistance( rProp.m_nLeftBorderDistance ),
+    m_nRightBorderDistance( rProp.m_nRightBorderDistance ),
+    m_nColumnCount( rProp.m_nColumnCount ),
+    m_nLeft( rProp.m_nLeft ),
+    m_nTop( rProp.m_nTop ),
+    m_nWidth( rProp.m_nWidth ),
+    m_nHeight( rProp.m_nHeight ),
+    m_nLeftMargin( rProp.m_nLeftMargin ),
+    m_nRightMargin( rProp.m_nRightMargin ),
+    m_eLeftType( rProp.m_eLeftType ),
+    m_eTopType( rProp.m_eTopType ),
+    m_eWidthType( rProp.m_eWidthType ),
+    m_eHeightType( rProp.m_eHeightType ),
+    m_eSizeType( rProp.m_eSizeType ),
+    m_ePageBreakBefore( rProp.m_ePageBreakBefore ),
+    m_ePageBreakAfter( rProp.m_ePageBreakAfter )
+{
+    for( size_t i=0; i<SAL_N_ELEMENTS(m_aBorderInfos); ++i )
+        m_aBorderInfos[i] = rProp.m_aBorderInfos[i]
+                            ? new SvxCSS1BorderInfo( *rProp.m_aBorderInfos[i] )
                             : nullptr;
 }
 
@@ -388,7 +388,7 @@ SvxCSS1PropertyInfo::~SvxCSS1PropertyInfo()
 
 void SvxCSS1PropertyInfo::DestroyBorderInfos()
 {
-    for(SvxCSS1BorderInfo* & rp : aBorderInfos)
+    for(SvxCSS1BorderInfo* & rp : m_aBorderInfos)
     {
         delete rp;
         rp = nullptr;
@@ -397,113 +397,113 @@ void SvxCSS1PropertyInfo::DestroyBorderInfos()
 
 void SvxCSS1PropertyInfo::Clear()
 {
-    aId.clear();
-    bTopMargin = bBottomMargin = false;
-    bLeftMargin = bRightMargin = bTextIndent = false;
-    nLeftMargin = nRightMargin = 0;
-    eFloat = SVX_ADJUST_END;
+    m_aId.clear();
+    m_bTopMargin = m_bBottomMargin = false;
+    m_bLeftMargin = m_bRightMargin = m_bTextIndent = false;
+    m_nLeftMargin = m_nRightMargin = 0;
+    m_eFloat = SVX_ADJUST_END;
 
-    ePosition = SVX_CSS1_POS_NONE;
-    nTopBorderDistance = nBottomBorderDistance =
-    nLeftBorderDistance = nRightBorderDistance = USHRT_MAX;
+    m_ePosition = SVX_CSS1_POS_NONE;
+    m_nTopBorderDistance = m_nBottomBorderDistance =
+    m_nLeftBorderDistance = m_nRightBorderDistance = USHRT_MAX;
 
-    nColumnCount = 0;
+    m_nColumnCount = 0;
 
-    nLeft = nTop = nWidth = nHeight = 0;
-    eLeftType = eTopType = eWidthType = eHeightType = SVX_CSS1_LTYPE_NONE;
+    m_nLeft = m_nTop = m_nWidth = m_nHeight = 0;
+    m_eLeftType = m_eTopType = m_eWidthType = m_eHeightType = SVX_CSS1_LTYPE_NONE;
 
 // Feature: PrintExt
-    eSizeType = SVX_CSS1_STYPE_NONE;
-    ePageBreakBefore = SVX_CSS1_PBREAK_NONE;
-    ePageBreakAfter = SVX_CSS1_PBREAK_NONE;
+    m_eSizeType = SVX_CSS1_STYPE_NONE;
+    m_ePageBreakBefore = SVX_CSS1_PBREAK_NONE;
+    m_ePageBreakAfter = SVX_CSS1_PBREAK_NONE;
 
     DestroyBorderInfos();
 }
 
 void SvxCSS1PropertyInfo::Merge( const SvxCSS1PropertyInfo& rProp )
 {
-    if( rProp.bTopMargin )
-        bTopMargin = true;
-    if( rProp.bBottomMargin )
-        bBottomMargin = true;
+    if( rProp.m_bTopMargin )
+        m_bTopMargin = true;
+    if( rProp.m_bBottomMargin )
+        m_bBottomMargin = true;
 
-    if( rProp.bLeftMargin )
+    if( rProp.m_bLeftMargin )
     {
-        bLeftMargin = true;
-        nLeftMargin = rProp.nLeftMargin;
+        m_bLeftMargin = true;
+        m_nLeftMargin = rProp.m_nLeftMargin;
     }
-    if( rProp.bRightMargin )
+    if( rProp.m_bRightMargin )
     {
-        bRightMargin = true;
-        nRightMargin = rProp.nRightMargin;
+        m_bRightMargin = true;
+        m_nRightMargin = rProp.m_nRightMargin;
     }
-    if( rProp.bTextIndent )
-        bTextIndent = true;
+    if( rProp.m_bTextIndent )
+        m_bTextIndent = true;
 
-    for( size_t i=0; i<SAL_N_ELEMENTS(aBorderInfos); ++i )
+    for( size_t i=0; i<SAL_N_ELEMENTS(m_aBorderInfos); ++i )
     {
-        if( rProp.aBorderInfos[i] )
+        if( rProp.m_aBorderInfos[i] )
         {
-            if( aBorderInfos[i] )
-                delete aBorderInfos[i];
+            if( m_aBorderInfos[i] )
+                delete m_aBorderInfos[i];
 
-            aBorderInfos[i] = new SvxCSS1BorderInfo( *rProp.aBorderInfos[i] );
+            m_aBorderInfos[i] = new SvxCSS1BorderInfo( *rProp.m_aBorderInfos[i] );
         }
     }
 
-    if( USHRT_MAX != rProp.nTopBorderDistance )
-        nTopBorderDistance = rProp.nTopBorderDistance;
-    if( USHRT_MAX != rProp.nBottomBorderDistance )
-        nBottomBorderDistance = rProp.nBottomBorderDistance;
-    if( USHRT_MAX != rProp.nLeftBorderDistance )
-        nLeftBorderDistance = rProp.nLeftBorderDistance;
-    if( USHRT_MAX != rProp.nRightBorderDistance )
-        nRightBorderDistance = rProp.nRightBorderDistance;
+    if( USHRT_MAX != rProp.m_nTopBorderDistance )
+        m_nTopBorderDistance = rProp.m_nTopBorderDistance;
+    if( USHRT_MAX != rProp.m_nBottomBorderDistance )
+        m_nBottomBorderDistance = rProp.m_nBottomBorderDistance;
+    if( USHRT_MAX != rProp.m_nLeftBorderDistance )
+        m_nLeftBorderDistance = rProp.m_nLeftBorderDistance;
+    if( USHRT_MAX != rProp.m_nRightBorderDistance )
+        m_nRightBorderDistance = rProp.m_nRightBorderDistance;
 
-    nColumnCount = rProp.nColumnCount;
+    m_nColumnCount = rProp.m_nColumnCount;
 
-    if( rProp.eFloat != SVX_ADJUST_END )
-        eFloat = rProp.eFloat;
+    if( rProp.m_eFloat != SVX_ADJUST_END )
+        m_eFloat = rProp.m_eFloat;
 
-    if( rProp.ePosition != SVX_CSS1_POS_NONE )
-        ePosition = rProp.ePosition;
+    if( rProp.m_ePosition != SVX_CSS1_POS_NONE )
+        m_ePosition = rProp.m_ePosition;
 
 // Feature: PrintExt
-    if( rProp.eSizeType != SVX_CSS1_STYPE_NONE )
+    if( rProp.m_eSizeType != SVX_CSS1_STYPE_NONE )
     {
-        eSizeType = rProp.eSizeType;
-        nWidth = rProp.nWidth;
-        nHeight = rProp.nHeight;
+        m_eSizeType = rProp.m_eSizeType;
+        m_nWidth = rProp.m_nWidth;
+        m_nHeight = rProp.m_nHeight;
     }
 
-    if( rProp.ePageBreakBefore != SVX_CSS1_PBREAK_NONE )
-        ePageBreakBefore = rProp.ePageBreakBefore;
+    if( rProp.m_ePageBreakBefore != SVX_CSS1_PBREAK_NONE )
+        m_ePageBreakBefore = rProp.m_ePageBreakBefore;
 
-    if( rProp.ePageBreakAfter != SVX_CSS1_PBREAK_NONE )
-        ePageBreakAfter = rProp.ePageBreakAfter;
+    if( rProp.m_ePageBreakAfter != SVX_CSS1_PBREAK_NONE )
+        m_ePageBreakAfter = rProp.m_ePageBreakAfter;
 
-    if( rProp.eLeftType != SVX_CSS1_LTYPE_NONE )
+    if( rProp.m_eLeftType != SVX_CSS1_LTYPE_NONE )
     {
-        eLeftType = rProp.eLeftType;
-        nLeft = rProp.nLeft;
+        m_eLeftType = rProp.m_eLeftType;
+        m_nLeft = rProp.m_nLeft;
     }
 
-    if( rProp.eTopType != SVX_CSS1_LTYPE_NONE )
+    if( rProp.m_eTopType != SVX_CSS1_LTYPE_NONE )
     {
-        eTopType = rProp.eTopType;
-        nTop = rProp.nTop;
+        m_eTopType = rProp.m_eTopType;
+        m_nTop = rProp.m_nTop;
     }
 
-    if( rProp.eWidthType != SVX_CSS1_LTYPE_NONE )
+    if( rProp.m_eWidthType != SVX_CSS1_LTYPE_NONE )
     {
-        eWidthType = rProp.eWidthType;
-        nWidth = rProp.nWidth;
+        m_eWidthType = rProp.m_eWidthType;
+        m_nWidth = rProp.m_nWidth;
     }
 
-    if( rProp.eHeightType != SVX_CSS1_LTYPE_NONE )
+    if( rProp.m_eHeightType != SVX_CSS1_LTYPE_NONE )
     {
-        eHeightType = rProp.eHeightType;
-        nHeight = rProp.nHeight;
+        m_eHeightType = rProp.m_eHeightType;
+        m_nHeight = rProp.m_nHeight;
     }
 }
 
@@ -518,10 +518,10 @@ SvxCSS1BorderInfo *SvxCSS1PropertyInfo::GetBorderInfo( SvxBoxItemLine nLine, boo
     case SvxBoxItemLine::RIGHT:    nPos = 3;   break;
     }
 
-    if( !aBorderInfos[nPos] && bCreate )
-        aBorderInfos[nPos] = new SvxCSS1BorderInfo;
+    if( !m_aBorderInfos[nPos] && bCreate )
+        m_aBorderInfos[nPos] = new SvxCSS1BorderInfo;
 
-    return aBorderInfos[nPos];
+    return m_aBorderInfos[nPos];
 }
 
 void SvxCSS1PropertyInfo::CopyBorderInfo( SvxBoxItemLine nSrcLine, SvxBoxItemLine nDstLine,
@@ -562,13 +562,13 @@ void SvxCSS1PropertyInfo::SetBoxItem( SfxItemSet& rItemSet,
                                       sal_uInt16 nMinBorderDist,
                                       const SvxBoxItem *pDfltItem )
 {
-    bool bChg = nTopBorderDistance != USHRT_MAX ||
-                nBottomBorderDistance != USHRT_MAX ||
-                nLeftBorderDistance != USHRT_MAX ||
-                nRightBorderDistance != USHRT_MAX;
+    bool bChg = m_nTopBorderDistance != USHRT_MAX ||
+                m_nBottomBorderDistance != USHRT_MAX ||
+                m_nLeftBorderDistance != USHRT_MAX ||
+                m_nRightBorderDistance != USHRT_MAX;
 
-    for( size_t i=0; !bChg && i<SAL_N_ELEMENTS(aBorderInfos); ++i )
-        bChg = aBorderInfos[i]!=nullptr;
+    for( size_t i=0; !bChg && i<SAL_N_ELEMENTS(m_aBorderInfos); ++i )
+        bChg = m_aBorderInfos[i]!=nullptr;
 
     if( !bChg )
         return;
@@ -593,27 +593,27 @@ void SvxCSS1PropertyInfo::SetBoxItem( SfxItemSet& rItemSet,
     if( pInfo )
         pInfo->SetBorderLine( SvxBoxItemLine::RIGHT, aBoxItem );
 
-    for( size_t i=0; i<SAL_N_ELEMENTS(aBorderInfos); ++i )
+    for( size_t i=0; i<SAL_N_ELEMENTS(m_aBorderInfos); ++i )
     {
         SvxBoxItemLine nLine = SvxBoxItemLine::TOP;
         sal_uInt16 nDist = 0;
         switch( i )
         {
         case 0: nLine = SvxBoxItemLine::TOP;
-                nDist = nTopBorderDistance;
-                nTopBorderDistance = USHRT_MAX;
+                nDist = m_nTopBorderDistance;
+                m_nTopBorderDistance = USHRT_MAX;
                 break;
         case 1: nLine = SvxBoxItemLine::BOTTOM;
-                nDist = nBottomBorderDistance;
-                nBottomBorderDistance = USHRT_MAX;
+                nDist = m_nBottomBorderDistance;
+                m_nBottomBorderDistance = USHRT_MAX;
                 break;
         case 2: nLine = SvxBoxItemLine::LEFT;
-                nDist = nLeftBorderDistance;
-                nLeftBorderDistance = USHRT_MAX;
+                nDist = m_nLeftBorderDistance;
+                m_nLeftBorderDistance = USHRT_MAX;
                 break;
         case 3: nLine = SvxBoxItemLine::RIGHT;
-                nDist = nRightBorderDistance;
-                nRightBorderDistance = USHRT_MAX;
+                nDist = m_nRightBorderDistance;
+                m_nRightBorderDistance = USHRT_MAX;
                 break;
         }
 
@@ -941,30 +941,30 @@ void SvxCSS1Parser::MergeStyles( const SfxItemSet& rSrcSet,
 
         rTargetSet.Put( rSrcSet );
 
-        if( rSrcInfo.bLeftMargin || rSrcInfo.bRightMargin ||
-            rSrcInfo.bTextIndent )
+        if( rSrcInfo.m_bLeftMargin || rSrcInfo.m_bRightMargin ||
+            rSrcInfo.m_bTextIndent )
         {
             const SvxLRSpaceItem& rNewLRSpace =
                 static_cast<const SvxLRSpaceItem&>(rSrcSet.Get( aItemIds.nLRSpace ));
 
-            if( rSrcInfo.bLeftMargin )
+            if( rSrcInfo.m_bLeftMargin )
                 aLRSpace.SetLeft( rNewLRSpace.GetLeft() );
-            if( rSrcInfo.bRightMargin )
+            if( rSrcInfo.m_bRightMargin )
                 aLRSpace.SetRight( rNewLRSpace.GetRight() );
-            if( rSrcInfo.bTextIndent )
+            if( rSrcInfo.m_bTextIndent )
                 aLRSpace.SetTextFirstLineOfst( rNewLRSpace.GetTextFirstLineOfst() );
 
             rTargetSet.Put( aLRSpace );
         }
 
-        if( rSrcInfo.bTopMargin || rSrcInfo.bBottomMargin )
+        if( rSrcInfo.m_bTopMargin || rSrcInfo.m_bBottomMargin )
         {
             const SvxULSpaceItem& rNewULSpace =
                 static_cast<const SvxULSpaceItem&>(rSrcSet.Get( aItemIds.nULSpace ));
 
-            if( rSrcInfo.bTopMargin )
+            if( rSrcInfo.m_bTopMargin )
                 aULSpace.SetUpper( rNewULSpace.GetUpper() );
-            if( rSrcInfo.bBottomMargin )
+            if( rSrcInfo.m_bBottomMargin )
                 aULSpace.SetLower( rNewULSpace.GetLower() );
 
             rTargetSet.Put( aULSpace );
@@ -1335,7 +1335,7 @@ static void ParseCSS1_column_count( const CSS1Expression *pExpr,
         double columnCount = pExpr->GetNumber();
         if ( columnCount >= 2 )
         {
-            rPropInfo.nColumnCount = columnCount;
+            rPropInfo.m_nColumnCount = columnCount;
         }
     }
 }
@@ -1998,7 +1998,7 @@ static void ParseCSS1_text_indent( const CSS1Expression *pExpr,
             aLRItem.SetTextFirstLineOfst( nIndent );
             rItemSet.Put( aLRItem );
         }
-        rPropInfo.bTextIndent = true;
+        rPropInfo.m_bTextIndent = true;
     }
 }
 
@@ -2036,7 +2036,7 @@ static void ParseCSS1_margin_left( const CSS1Expression *pExpr,
 
     if( bSet )
     {
-        rPropInfo.nLeftMargin = nLeft;
+        rPropInfo.m_nLeftMargin = nLeft;
         if( nLeft < 0 )
             nLeft = 0;
         const SfxPoolItem* pItem;
@@ -2053,7 +2053,7 @@ static void ParseCSS1_margin_left( const CSS1Expression *pExpr,
             aLRItem.SetTextLeft( (sal_uInt16)nLeft );
             rItemSet.Put( aLRItem );
         }
-        rPropInfo.bLeftMargin = true;
+        rPropInfo.m_bLeftMargin = true;
     }
 }
 
@@ -2091,7 +2091,7 @@ static void ParseCSS1_margin_right( const CSS1Expression *pExpr,
 
     if( bSet )
     {
-        rPropInfo.nRightMargin = nRight;
+        rPropInfo.m_nRightMargin = nRight;
         if( nRight < 0 )
             nRight = 0;
         const SfxPoolItem* pItem;
@@ -2108,7 +2108,7 @@ static void ParseCSS1_margin_right( const CSS1Expression *pExpr,
             aLRItem.SetRight( (sal_uInt16)nRight );
             rItemSet.Put( aLRItem );
         }
-        rPropInfo.bRightMargin = true;
+        rPropInfo.m_bRightMargin = true;
     }
 }
 
@@ -2166,7 +2166,7 @@ static void ParseCSS1_margin_top( const CSS1Expression *pExpr,
             aULItem.SetUpper( nUpper );
             rItemSet.Put( aULItem );
         }
-        rPropInfo.bTopMargin = true;
+        rPropInfo.m_bTopMargin = true;
     }
 }
 
@@ -2224,7 +2224,7 @@ static void ParseCSS1_margin_bottom( const CSS1Expression *pExpr,
             aULItem.SetLower( nLower );
             rItemSet.Put( aULItem );
         }
-        rPropInfo.bBottomMargin = true;
+        rPropInfo.m_bBottomMargin = true;
     }
 }
 
@@ -2300,15 +2300,15 @@ static void ParseCSS1_margin( const CSS1Expression *pExpr,
     {
         if( bSetMargins[3] )
         {
-            rPropInfo.bLeftMargin = true;
-            rPropInfo.nLeftMargin = nMargins[3];
+            rPropInfo.m_bLeftMargin = true;
+            rPropInfo.m_nLeftMargin = nMargins[3];
             if( nMargins[3] < 0 )
                 nMargins[3] = 0;
         }
         if( bSetMargins[1] )
         {
-            rPropInfo.bRightMargin = true;
-            rPropInfo.nRightMargin = nMargins[1];
+            rPropInfo.m_bRightMargin = true;
+            rPropInfo.m_nRightMargin = nMargins[1];
             if( nMargins[1] < 0 )
                 nMargins[1] = 0;
         }
@@ -2363,8 +2363,8 @@ static void ParseCSS1_margin( const CSS1Expression *pExpr,
             rItemSet.Put( aULItem );
         }
 
-        rPropInfo.bTopMargin |= bSetMargins[0];
-        rPropInfo.bBottomMargin |= bSetMargins[2];
+        rPropInfo.m_bTopMargin |= bSetMargins[0];
+        rPropInfo.m_bBottomMargin |= bSetMargins[2];
     }
 }
 
@@ -2416,10 +2416,10 @@ static bool ParseCSS1_padding_xxx( const CSS1Expression *pExpr,
     {
         switch( nWhichLine )
         {
-        case SvxBoxItemLine::TOP:      rPropInfo.nTopBorderDistance = nDist;   break;
-        case SvxBoxItemLine::BOTTOM:   rPropInfo.nBottomBorderDistance = nDist;break;
-        case SvxBoxItemLine::LEFT:     rPropInfo.nLeftBorderDistance = nDist;  break;
-        case SvxBoxItemLine::RIGHT:    rPropInfo.nRightBorderDistance = nDist; break;
+        case SvxBoxItemLine::TOP:      rPropInfo.m_nTopBorderDistance = nDist;   break;
+        case SvxBoxItemLine::BOTTOM:   rPropInfo.m_nBottomBorderDistance = nDist;break;
+        case SvxBoxItemLine::LEFT:     rPropInfo.m_nLeftBorderDistance = nDist;  break;
+        case SvxBoxItemLine::RIGHT:    rPropInfo.m_nRightBorderDistance = nDist; break;
         }
     }
 
@@ -2474,11 +2474,11 @@ static void ParseCSS1_padding( const CSS1Expression *pExpr,
         {
             if( n==0 )
             {
-                rPropInfo.nTopBorderDistance = rPropInfo.nBottomBorderDistance;
-                rPropInfo.nLeftBorderDistance = rPropInfo.nTopBorderDistance;
+                rPropInfo.m_nTopBorderDistance = rPropInfo.m_nBottomBorderDistance;
+                rPropInfo.m_nLeftBorderDistance = rPropInfo.m_nTopBorderDistance;
             }
             if( n <= 1 )
-                rPropInfo.nRightBorderDistance = rPropInfo.nLeftBorderDistance;
+                rPropInfo.m_nRightBorderDistance = rPropInfo.m_nLeftBorderDistance;
         }
 
         pExpr = pExpr->GetNext();
@@ -2780,7 +2780,7 @@ static void ParseCSS1_float( const CSS1Expression *pExpr,
     {
         sal_uInt16 nFloat;
         if( SvxCSS1Parser::GetEnum( aFloatTable, pExpr->GetString(), nFloat ) )
-            rPropInfo.eFloat = (SvxAdjust)nFloat;
+            rPropInfo.m_eFloat = (SvxAdjust)nFloat;
     }
 }
 
@@ -2795,7 +2795,7 @@ static void ParseCSS1_position( const CSS1Expression *pExpr,
     {
         sal_uInt16 nPos;
         if( SvxCSS1Parser::GetEnum( aPositionTable, pExpr->GetString(), nPos ) )
-            rPropInfo.ePosition = (SvxCSS1Position)nPos;
+            rPropInfo.m_ePosition = (SvxCSS1Position)nPos;
     }
 }
 
@@ -2848,7 +2848,7 @@ static void ParseCSS1_width( const CSS1Expression *pExpr,
                              SvxCSS1PropertyInfo& rPropInfo,
                              const SvxCSS1Parser& /*rParser*/ )
 {
-    ParseCSS1_length( pExpr, rPropInfo.nWidth, rPropInfo.eWidthType, true );
+    ParseCSS1_length( pExpr, rPropInfo.m_nWidth, rPropInfo.m_eWidthType, true );
 }
 
 static void ParseCSS1_height( const CSS1Expression *pExpr,
@@ -2856,7 +2856,7 @@ static void ParseCSS1_height( const CSS1Expression *pExpr,
                               SvxCSS1PropertyInfo& rPropInfo,
                               const SvxCSS1Parser& /*rParser*/ )
 {
-    ParseCSS1_length( pExpr, rPropInfo.nHeight, rPropInfo.eHeightType, false );
+    ParseCSS1_length( pExpr, rPropInfo.m_nHeight, rPropInfo.m_eHeightType, false );
 }
 
 static void ParseCSS1_left( const CSS1Expression *pExpr,
@@ -2864,7 +2864,7 @@ static void ParseCSS1_left( const CSS1Expression *pExpr,
                              SvxCSS1PropertyInfo& rPropInfo,
                              const SvxCSS1Parser& /*rParser*/ )
 {
-    ParseCSS1_length( pExpr, rPropInfo.nLeft, rPropInfo.eLeftType, true );
+    ParseCSS1_length( pExpr, rPropInfo.m_nLeft, rPropInfo.m_eLeftType, true );
 }
 
 static void ParseCSS1_top( const CSS1Expression *pExpr,
@@ -2872,7 +2872,7 @@ static void ParseCSS1_top( const CSS1Expression *pExpr,
                            SvxCSS1PropertyInfo& rPropInfo,
                            const SvxCSS1Parser& /*rParser*/ )
 {
-    ParseCSS1_length( pExpr, rPropInfo.nTop, rPropInfo.eTopType, false );
+    ParseCSS1_length( pExpr, rPropInfo.m_nTop, rPropInfo.m_eTopType, false );
 }
 
 // Feature: PrintExt
@@ -2892,16 +2892,16 @@ static void ParseCSS1_size( const CSS1Expression *pExpr,
                 if( SvxCSS1Parser::GetEnum( aSizeTable, pExpr->GetString(),
                                             nValue ) )
                 {
-                    rPropInfo.eSizeType = (SvxCSS1SizeType)nValue;
+                    rPropInfo.m_eSizeType = (SvxCSS1SizeType)nValue;
                 }
             }
             break;
 
         case CSS1_LENGTH:
-            rPropInfo.nHeight = pExpr->GetSLength();
+            rPropInfo.m_nHeight = pExpr->GetSLength();
             if( n==0 )
-                rPropInfo.nWidth = rPropInfo.nHeight;
-            rPropInfo.eSizeType = SVX_CSS1_STYPE_TWIP;
+                rPropInfo.m_nWidth = rPropInfo.m_nHeight;
+            rPropInfo.m_eSizeType = SVX_CSS1_STYPE_TWIP;
             break;
 
         case CSS1_PIXLENGTH:
@@ -2909,10 +2909,10 @@ static void ParseCSS1_size( const CSS1Expression *pExpr,
                 long nPHeight = (long)pExpr->GetNumber();
                 long nPWidth = n==0 ? nPHeight : 0;
                 SvxCSS1Parser::PixelToTwip( nPWidth, nPHeight );
-                rPropInfo.nHeight = nPHeight;
+                rPropInfo.m_nHeight = nPHeight;
                 if( n==0 )
-                    rPropInfo.nWidth = nPWidth;
-                rPropInfo.eSizeType = SVX_CSS1_STYPE_TWIP;
+                    rPropInfo.m_nWidth = nPWidth;
+                rPropInfo.m_eSizeType = SVX_CSS1_STYPE_TWIP;
             }
             break;
 
@@ -2944,7 +2944,7 @@ static void ParseCSS1_page_break_before( const CSS1Expression *pExpr,
                                          SvxCSS1PropertyInfo& rPropInfo,
                                          const SvxCSS1Parser& /*rParser*/ )
 {
-    ParseCSS1_page_break_xxx( pExpr, rPropInfo.ePageBreakBefore );
+    ParseCSS1_page_break_xxx( pExpr, rPropInfo.m_ePageBreakBefore );
 }
 
 static void ParseCSS1_page_break_after( const CSS1Expression *pExpr,
@@ -2952,7 +2952,7 @@ static void ParseCSS1_page_break_after( const CSS1Expression *pExpr,
                                         SvxCSS1PropertyInfo& rPropInfo,
                                         const SvxCSS1Parser& /*rParser*/ )
 {
-    ParseCSS1_page_break_xxx( pExpr, rPropInfo.ePageBreakAfter );
+    ParseCSS1_page_break_xxx( pExpr, rPropInfo.m_ePageBreakAfter );
 }
 
 static void ParseCSS1_page_break_inside( const CSS1Expression *pExpr,
diff --git a/sw/source/filter/html/svxcss1.hxx b/sw/source/filter/html/svxcss1.hxx
index 34b6bd798615..36e6a16b1627 100644
--- a/sw/source/filter/html/svxcss1.hxx
+++ b/sw/source/filter/html/svxcss1.hxx
@@ -93,43 +93,43 @@ namespace editeng { class SvxBorderLine; }
 struct SvxCSS1BorderInfo;
 class SvxCSS1PropertyInfo
 {
-    SvxCSS1BorderInfo *aBorderInfos[4];
+    SvxCSS1BorderInfo *m_aBorderInfos[4];
 
     void DestroyBorderInfos();
 
 public:
 
-    OUString aId;             // ID fuer Bookmarks, Rahmen etc.
+    OUString m_aId;             // ID fuer Bookmarks, Rahmen etc.
 
-    bool bTopMargin : 1;
-    bool bBottomMargin : 1;
+    bool m_bTopMargin : 1;
+    bool m_bBottomMargin : 1;
 
-    bool bLeftMargin : 1;
-    bool bRightMargin : 1;
-    bool bTextIndent : 1;
+    bool m_bLeftMargin : 1;
+    bool m_bRightMargin : 1;
+    bool m_bTextIndent : 1;
 
-    SvxAdjust eFloat;
+    SvxAdjust m_eFloat;
 
-    SvxCSS1Position ePosition;
+    SvxCSS1Position m_ePosition;
 
-    sal_uInt16 nTopBorderDistance;
-    sal_uInt16 nBottomBorderDistance;
-    sal_uInt16 nLeftBorderDistance;
-    sal_uInt16 nRightBorderDistance;
+    sal_uInt16 m_nTopBorderDistance;
+    sal_uInt16 m_nBottomBorderDistance;
+    sal_uInt16 m_nLeftBorderDistance;
+    sal_uInt16 m_nRightBorderDistance;
 
-    sal_uInt16 nColumnCount;
+    sal_uInt16 m_nColumnCount;
 
-    long nLeft, nTop;
-    long nWidth, nHeight;
-    long nLeftMargin, nRightMargin;
+    long m_nLeft, m_nTop;
+    long m_nWidth, m_nHeight;
+    long m_nLeftMargin, m_nRightMargin;
 
-    SvxCSS1LengthType eLeftType, eTopType;
-    SvxCSS1LengthType eWidthType, eHeightType;
+    SvxCSS1LengthType m_eLeftType, m_eTopType;
+    SvxCSS1LengthType m_eWidthType, m_eHeightType;
 
-    SvxCSS1SizeType eSizeType;
+    SvxCSS1SizeType m_eSizeType;
 
-    SvxCSS1PageBreak ePageBreakBefore;
-    SvxCSS1PageBreak ePageBreakAfter;
+    SvxCSS1PageBreak m_ePageBreakBefore;
+    SvxCSS1PageBreak m_ePageBreakAfter;
 
     SvxCSS1PropertyInfo();
     SvxCSS1PropertyInfo( const SvxCSS1PropertyInfo& rProp );
diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx
index c790123b3b24..7d81018855be 100644
--- a/sw/source/filter/html/swhtml.cxx
+++ b/sw/source/filter/html/swhtml.cxx
@@ -5146,8 +5146,8 @@ void SwHTMLParser::InsertLineBreak()
                 aBreakItem = static_cast<const SvxFormatBreakItem &>(aItemSet.Get( RES_BREAK ));
                 bBreakItem = true;
             }
-            if( !aPropInfo.aId.isEmpty() )
-                InsertBookmark( aPropInfo.aId );
+            if( !aPropInfo.m_aId.isEmpty() )
+                InsertBookmark( aPropInfo.m_aId );
         }
     }