From 6759a5a0af782d28ae7497613cc8360951594073 Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Thu, 8 Oct 2015 21:52:46 +0200
Subject: sot: prefix members of StgCompObjStream

Change-Id: I24b7b8fba581fbc5fbe7a63a6f43ff7033e149e7
---
 sot/source/sdstor/stgole.cxx | 22 +++++++++++-----------
 sot/source/sdstor/stgole.hxx | 12 ++++++------
 2 files changed, 17 insertions(+), 17 deletions(-)

(limited to 'sot')

diff --git a/sot/source/sdstor/stgole.cxx b/sot/source/sdstor/stgole.cxx
index 67657b2fae77..ae84be6d689f 100644
--- a/sot/source/sdstor/stgole.cxx
+++ b/sot/source/sdstor/stgole.cxx
@@ -97,15 +97,15 @@ void StgInternalStream::Commit()
 StgCompObjStream::StgCompObjStream( BaseStorage& rStg, bool bWr )
     : StgInternalStream( rStg, OUString("\1CompObj"), bWr )
 {
-    memset( &aClsId, 0, sizeof( ClsId ) );
-    nCbFormat = SotClipboardFormatId::NONE;
+    memset( &m_aClsId, 0, sizeof( ClsId ) );
+    m_nCbFormat = SotClipboardFormatId::NONE;
 }
 
 bool StgCompObjStream::Load()
 {
-    memset( &aClsId, 0, sizeof( ClsId ) );
-    nCbFormat = SotClipboardFormatId::NONE;
-    aUserName.clear();
+    memset( &m_aClsId, 0, sizeof( ClsId ) );
+    m_nCbFormat = SotClipboardFormatId::NONE;
+    m_aUserName.clear();
     if( GetError() != SVSTREAM_OK )
         return false;
     Seek( 8L );     // skip the first part
@@ -113,7 +113,7 @@ bool StgCompObjStream::Load()
     ReadInt32( nMarker );
     if( nMarker == -1L )
     {
-        ReadClsId( *this, aClsId );
+        ReadClsId( *this, m_aClsId );
         sal_Int32 nLen1 = 0;
         ReadInt32( nLen1 );
         if ( nLen1 > 0 )
@@ -131,8 +131,8 @@ bool StgCompObjStream::Load()
                 //all platforms and envs
                 //https://bz.apache.org/ooo/attachment.cgi?id=68668
                 //for a good edge-case example
-                aUserName = nStrLen ? OUString( p.get(), nStrLen, RTL_TEXTENCODING_MS_1252 ) : OUString();
-                nCbFormat = ReadClipboardFormat( *this );
+                m_aUserName = nStrLen ? OUString( p.get(), nStrLen, RTL_TEXTENCODING_MS_1252 ) : OUString();
+                m_nCbFormat = ReadClipboardFormat( *this );
             }
             else
                 SetError( SVSTREAM_GENERALERROR );
@@ -146,16 +146,16 @@ bool StgCompObjStream::Store()
     if( GetError() != SVSTREAM_OK )
         return false;
     Seek( 0L );
-    OString aAsciiUserName(OUStringToOString(aUserName, RTL_TEXTENCODING_MS_1252));
+    OString aAsciiUserName(OUStringToOString(m_aUserName, RTL_TEXTENCODING_MS_1252));
     WriteInt16( 1 );          // Version?
     WriteInt16( -2 );                     // 0xFFFE = Byte Order Indicator
     WriteInt32( 0x0A03 );         // Windows 3.10
     WriteInt32( -1L );
-    WriteClsId( *this, aClsId );             // Class ID
+    WriteClsId( *this, m_aClsId );             // Class ID
     WriteInt32( aAsciiUserName.getLength() + 1 );
     WriteCharPtr( aAsciiUserName.getStr() );
     WriteUChar( 0 );             // string terminator
-    WriteClipboardFormat( *this, nCbFormat );
+    WriteClipboardFormat( *this, m_nCbFormat );
     WriteInt32( 0 );             // terminator
     Commit();
     return GetError() == SVSTREAM_OK;
diff --git a/sot/source/sdstor/stgole.hxx b/sot/source/sdstor/stgole.hxx
index c1088633be0b..6bd89147b97d 100644
--- a/sot/source/sdstor/stgole.hxx
+++ b/sot/source/sdstor/stgole.hxx
@@ -42,14 +42,14 @@ public:
 
 class StgCompObjStream : public StgInternalStream
 {
-    ClsId       aClsId;
-    OUString    aUserName;
-    SotClipboardFormatId nCbFormat;
+    ClsId       m_aClsId;
+    OUString    m_aUserName;
+    SotClipboardFormatId m_nCbFormat;
 public:
     StgCompObjStream( BaseStorage&, bool );
-    ClsId&     GetClsId()    { return aClsId;    }
-    OUString&  GetUserName() { return aUserName; }
-    SotClipboardFormatId& GetCbFormat() { return nCbFormat; }
+    ClsId&     GetClsId()    { return m_aClsId;    }
+    OUString&  GetUserName() { return m_aUserName; }
+    SotClipboardFormatId& GetCbFormat() { return m_nCbFormat; }
     bool       Load();
     bool       Store();
 };
-- 
cgit