sw: prefix members of SwDateTimeField and SwFormatDrop

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

1 files changed, 35 insertions, 35 deletions

diff --git a/sw/source/core/para/paratr.cxx b/sw/source/core/para/paratr.cxx
index dc030a631b74..8a26d2f0780c 100644
--- a/sw/source/core/para/paratr.cxx
+++ b/sw/source/core/para/paratr.cxx
@@ -40,22 +40,22 @@ SfxPoolItem* SwNumRuleItem::CreateDefault() { return new SwNumRuleItem; }
 SwFormatDrop::SwFormatDrop()
     : SfxPoolItem( RES_PARATR_DROP ),
     SwClient( nullptr ),
-    pDefinedIn( nullptr ),
-    nDistance( 0 ),
-    nLines( 0 ),
-    nChars( 0 ),
-    bWholeWord( false )
+    m_pDefinedIn( nullptr ),
+    m_nDistance( 0 ),
+    m_nLines( 0 ),
+    m_nChars( 0 ),
+    m_bWholeWord( false )
 {
 }
 
 SwFormatDrop::SwFormatDrop( const SwFormatDrop &rCpy )
     : SfxPoolItem( RES_PARATR_DROP ),
     SwClient( rCpy.GetRegisteredInNonConst() ),
-    pDefinedIn( nullptr ),
-    nDistance( rCpy.GetDistance() ),
-    nLines( rCpy.GetLines() ),
-    nChars( rCpy.GetChars() ),
-    bWholeWord( rCpy.GetWholeWord() )
+    m_pDefinedIn( nullptr ),
+    m_nDistance( rCpy.GetDistance() ),
+    m_nLines( rCpy.GetLines() ),
+    m_nChars( rCpy.GetChars() ),
+    m_bWholeWord( rCpy.GetWholeWord() )
 {
 }
 
@@ -74,16 +74,16 @@ void SwFormatDrop::SetCharFormat( SwCharFormat *pNew )
 
 void SwFormatDrop::Modify( const SfxPoolItem*, const SfxPoolItem * )
 {
-    if( pDefinedIn )
+    if( m_pDefinedIn )
     {
-        if( dynamic_cast< const SwFormat *>( pDefinedIn ) ==  nullptr)
-            pDefinedIn->ModifyNotification( this, this );
-        else if( pDefinedIn->HasWriterListeners() &&
-                !pDefinedIn->IsModifyLocked() )
+        if( dynamic_cast< const SwFormat *>( m_pDefinedIn ) ==  nullptr)
+            m_pDefinedIn->ModifyNotification( this, this );
+        else if( m_pDefinedIn->HasWriterListeners() &&
+                !m_pDefinedIn->IsModifyLocked() )
         {
             // Notify those who are dependent on the format on our own.
             // The format itself wouldn't pass on the notify as it does not get past the check.
-            pDefinedIn->ModifyBroadcast( this, this );
+            m_pDefinedIn->ModifyBroadcast( this, this );
         }
     }
 }
@@ -96,12 +96,12 @@ bool SwFormatDrop::GetInfo( SfxPoolItem& ) const
 bool SwFormatDrop::operator==( const SfxPoolItem& rAttr ) const
 {
     assert(SfxPoolItem::operator==(rAttr));
-    return ( nLines == static_cast<const SwFormatDrop&>(rAttr).GetLines() &&
-             nChars == static_cast<const SwFormatDrop&>(rAttr).GetChars() &&
-             nDistance ==  static_cast<const SwFormatDrop&>(rAttr).GetDistance() &&
-             bWholeWord == static_cast<const SwFormatDrop&>(rAttr).GetWholeWord() &&
+    return ( m_nLines == static_cast<const SwFormatDrop&>(rAttr).GetLines() &&
+             m_nChars == static_cast<const SwFormatDrop&>(rAttr).GetChars() &&
+             m_nDistance ==  static_cast<const SwFormatDrop&>(rAttr).GetDistance() &&
+             m_bWholeWord == static_cast<const SwFormatDrop&>(rAttr).GetWholeWord() &&
              GetCharFormat() == static_cast<const SwFormatDrop&>(rAttr).GetCharFormat() &&
-             pDefinedIn == static_cast<const SwFormatDrop&>(rAttr).pDefinedIn );
+             m_pDefinedIn == static_cast<const SwFormatDrop&>(rAttr).m_pDefinedIn );
 }
 
 SfxPoolItem* SwFormatDrop::Clone( SfxItemPool* ) const
@@ -113,20 +113,20 @@ bool SwFormatDrop::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
 {
     switch(nMemberId&~CONVERT_TWIPS)
     {
-        case MID_DROPCAP_LINES : rVal <<= static_cast<sal_Int16>(nLines); break;
-        case MID_DROPCAP_COUNT : rVal <<= static_cast<sal_Int16>(nChars); break;
-        case MID_DROPCAP_DISTANCE : rVal <<= static_cast<sal_Int16>(convertTwipToMm100(nDistance)); break;
+        case MID_DROPCAP_LINES : rVal <<= static_cast<sal_Int16>(m_nLines); break;
+        case MID_DROPCAP_COUNT : rVal <<= static_cast<sal_Int16>(m_nChars); break;
+        case MID_DROPCAP_DISTANCE : rVal <<= static_cast<sal_Int16>(convertTwipToMm100(m_nDistance)); break;
         case MID_DROPCAP_FORMAT:
         {
              style::DropCapFormat aDrop;
-            aDrop.Lines = nLines   ;
-            aDrop.Count = nChars   ;
-            aDrop.Distance  = convertTwipToMm100(nDistance);
+            aDrop.Lines = m_nLines   ;
+            aDrop.Count = m_nChars   ;
+            aDrop.Distance  = convertTwipToMm100(m_nDistance);
             rVal <<= aDrop;
         }
         break;
         case MID_DROPCAP_WHOLE_WORD:
-            rVal <<= bWholeWord;
+            rVal <<= m_bWholeWord;
         break;
         case MID_DROPCAP_CHAR_STYLE_NAME :
         {
@@ -150,7 +150,7 @@ bool SwFormatDrop::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
             sal_Int8 nTemp = 0;
             rVal >>= nTemp;
             if(nTemp >=1 && nTemp < 0x7f)
-                nLines = static_cast<sal_uInt8>(nTemp);
+                m_nLines = static_cast<sal_uInt8>(nTemp);
         }
         break;
         case MID_DROPCAP_COUNT :
@@ -158,14 +158,14 @@ bool SwFormatDrop::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
             sal_Int16 nTemp = 0;
             rVal >>= nTemp;
             if(nTemp >=1 && nTemp < 0x7f)
-                nChars = static_cast<sal_uInt8>(nTemp);
+                m_nChars = static_cast<sal_uInt8>(nTemp);
         }
         break;
         case MID_DROPCAP_DISTANCE :
         {
             sal_Int16 nVal = 0;
             if ( rVal >>= nVal )
-                nDistance = static_cast<sal_Int16>(convertMm100ToTwip(static_cast<sal_Int32>(nVal)));
+                m_nDistance = static_cast<sal_Int16>(convertMm100ToTwip(static_cast<sal_Int32>(nVal)));
             else
                 return false;
             break;
@@ -175,14 +175,14 @@ bool SwFormatDrop::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
             if(rVal.getValueType()  == ::cppu::UnoType<style::DropCapFormat>::get())
             {
                 auto pDrop = o3tl::doAccess<style::DropCapFormat>(rVal);
-                nLines      = pDrop->Lines;
-                nChars      = pDrop->Count;
-                nDistance   = convertMm100ToTwip(pDrop->Distance);
+                m_nLines      = pDrop->Lines;
+                m_nChars      = pDrop->Count;
+                m_nDistance   = convertMm100ToTwip(pDrop->Distance);
             }
         }
         break;
         case MID_DROPCAP_WHOLE_WORD:
-            bWholeWord = *o3tl::doAccess<bool>(rVal);
+            m_bWholeWord = *o3tl::doAccess<bool>(rVal);
         break;
         case MID_DROPCAP_CHAR_STYLE_NAME :
             OSL_FAIL("char format cannot be set in PutValue()!");