sw: prefix members of SwViewOption

Change-Id: Ia86aac05e67990bd47400dc7aabbedde278e4fd1

sw/inc/viewopt.hxx

@@ -103,29 +103,29 @@ namespace svtools{ class ColorConfig;}
 
 class SW_DLLPUBLIC SwViewOption
 {
-    static Color    aDocColor;  // color of document boundaries
-    static Color    aDocBoundColor;  // color of document boundaries
-    static Color    aObjectBoundColor; // color of object boundaries
-    static Color    aAppBackgroundColor; // application background
-    static Color    aTableBoundColor; // color of table boundaries
-    static Color    aFontColor;
-    static Color    aIndexShadingsColor; // background color of indexes
-    static Color    aLinksColor;
-    static Color    aVisitedLinksColor;
-    static Color    aDirectCursorColor;
-    static Color    aTextGridColor;
-    static Color    aSpellColor;     // mark color of online spell checking
-    static Color    aSmarttagColor;
-    static Color    aFieldShadingsColor;
-    static Color    aSectionBoundColor;
-    static Color    aPageBreakColor;
-    static Color    aScriptIndicatorColor;
-    static Color    aShadowColor;
-    static Color    aHeaderFooterMarkColor;
-
-    static sal_Int32 nAppearanceFlags;
+    static Color    m_aDocColor;  // color of document boundaries
+    static Color    m_aDocBoundColor;  // color of document boundaries
+    static Color    m_aObjectBoundColor; // color of object boundaries
+    static Color    m_aAppBackgroundColor; // application background
+    static Color    m_aTableBoundColor; // color of table boundaries
+    static Color    m_aFontColor;
+    static Color    m_aIndexShadingsColor; // background color of indexes
+    static Color    m_aLinksColor;
+    static Color    m_aVisitedLinksColor;
+    static Color    m_aDirectCursorColor;
+    static Color    m_aTextGridColor;
+    static Color    m_aSpellColor;     // mark color of online spell checking
+    static Color    m_aSmarttagColor;
+    static Color    m_aFieldShadingsColor;
+    static Color    m_aSectionBoundColor;
+    static Color    m_aPageBreakColor;
+    static Color    m_aScriptIndicatorColor;
+    static Color    m_aShadowColor;
+    static Color    m_aHeaderFooterMarkColor;
+
+    static sal_Int32 m_nAppearanceFlags;
 protected:
-    static sal_uInt16   nPixelTwips;// 1 Pixel == ? Twips
+    static sal_uInt16   m_nPixelTwips;// 1 Pixel == ? Twips
 
     OUString        m_sSymbolFont;        // Symbolfont.
     sal_uInt32      m_nCoreOptions;       // Bits for SwViewShell.
@@ -167,7 +167,7 @@ protected:
     bool  m_bTest6        :1;     // Test-flag  "No screen adj"
     bool  m_bTest7        :1;     // Test-flag  "win format"
     bool  m_bTest8        :1;     // Test-flag  ""
-    static bool  s_bTest9;    // Test-Flag  "DrawingLayerNotLoading"
+    static bool  m_bTest9;    // Test-Flag  "DrawingLayerNotLoading"
     bool  m_bTest10       :1;     // Test-Flag  "Format by Input"
 #endif
 
@@ -178,7 +178,7 @@ public:
 
     static void Init( vcl::Window *pWin );        // Initializing of static data.
 
-    static sal_uInt16 GetPixelTwips() { return nPixelTwips; }
+    static sal_uInt16 GetPixelTwips() { return m_nPixelTwips; }
 
     inline sal_uInt32   GetCoreOptions() const {return m_nCoreOptions;}
     inline void     SetUIOptions( const SwViewOption& );

sw/source/uibase/config/viewopt.cxx

@@ -42,30 +42,30 @@
 #include <comphelper/lok.hxx>
 
 #ifdef DBG_UTIL
-bool SwViewOption::s_bTest9 = false;        //DrawingLayerNotLoading
+bool SwViewOption::m_bTest9 = false;        //DrawingLayerNotLoading
 #endif
-Color SwViewOption::aDocBoundColor(COL_LIGHTGRAY);
-Color SwViewOption::aObjectBoundColor(COL_LIGHTGRAY);
-Color SwViewOption::aDocColor(COL_LIGHTGRAY);
-Color SwViewOption::aAppBackgroundColor(COL_LIGHTGRAY);
-Color SwViewOption::aTableBoundColor(COL_LIGHTGRAY);
-Color SwViewOption::aIndexShadingsColor(COL_LIGHTGRAY);
-Color SwViewOption::aLinksColor(COL_BLUE);
-Color SwViewOption::aVisitedLinksColor(COL_RED);
-Color SwViewOption::aDirectCursorColor(COL_BLUE);
-Color SwViewOption::aTextGridColor(COL_LIGHTGRAY);
-Color SwViewOption::aSpellColor(COL_LIGHTRED);
-Color SwViewOption::aSmarttagColor(COL_LIGHTMAGENTA);
-Color SwViewOption::aFontColor(COL_BLACK);
-Color SwViewOption::aFieldShadingsColor(COL_LIGHTGRAY);
-Color SwViewOption::aSectionBoundColor(COL_LIGHTGRAY);
-Color SwViewOption::aPageBreakColor(COL_BLUE);
-Color SwViewOption::aScriptIndicatorColor(COL_GREEN);
-Color SwViewOption::aShadowColor(COL_GRAY);
-Color SwViewOption::aHeaderFooterMarkColor(COL_BLUE);
-
-sal_Int32 SwViewOption::nAppearanceFlags = VIEWOPT_DOC_BOUNDARIES|VIEWOPT_OBJECT_BOUNDARIES;
-sal_uInt16 SwViewOption::nPixelTwips = 0;   // one pixel on the screen
+Color SwViewOption::m_aDocBoundColor(COL_LIGHTGRAY);
+Color SwViewOption::m_aObjectBoundColor(COL_LIGHTGRAY);
+Color SwViewOption::m_aDocColor(COL_LIGHTGRAY);
+Color SwViewOption::m_aAppBackgroundColor(COL_LIGHTGRAY);
+Color SwViewOption::m_aTableBoundColor(COL_LIGHTGRAY);
+Color SwViewOption::m_aIndexShadingsColor(COL_LIGHTGRAY);
+Color SwViewOption::m_aLinksColor(COL_BLUE);
+Color SwViewOption::m_aVisitedLinksColor(COL_RED);
+Color SwViewOption::m_aDirectCursorColor(COL_BLUE);
+Color SwViewOption::m_aTextGridColor(COL_LIGHTGRAY);
+Color SwViewOption::m_aSpellColor(COL_LIGHTRED);
+Color SwViewOption::m_aSmarttagColor(COL_LIGHTMAGENTA);
+Color SwViewOption::m_aFontColor(COL_BLACK);
+Color SwViewOption::m_aFieldShadingsColor(COL_LIGHTGRAY);
+Color SwViewOption::m_aSectionBoundColor(COL_LIGHTGRAY);
+Color SwViewOption::m_aPageBreakColor(COL_BLUE);
+Color SwViewOption::m_aScriptIndicatorColor(COL_GREEN);
+Color SwViewOption::m_aShadowColor(COL_GRAY);
+Color SwViewOption::m_aHeaderFooterMarkColor(COL_BLUE);
+
+sal_Int32 SwViewOption::m_nAppearanceFlags = VIEWOPT_DOC_BOUNDARIES|VIEWOPT_OBJECT_BOUNDARIES;
+sal_uInt16 SwViewOption::m_nPixelTwips = 0;   // one pixel on the screen
 
 static const char aPostItStr[] = "  ";
 
@@ -147,7 +147,7 @@ void SwViewOption::PaintPostIts( OutputDevice *pOut, const SwRect &rRect, bool b
         const Point aTopLeft(  rRect.Left()  + nPix, rRect.Top()    + nPix );
         const Point aBotRight( rRect.Right() - nPix, rRect.Bottom() - nPix );
         const SwRect aRect( aTopLeft, aBotRight );
-        DrawRect( pOut, aRect, aScriptIndicatorColor.GetColor() );
+        DrawRect( pOut, aRect, m_aScriptIndicatorColor.GetColor() );
     pOut->SetLineColor( aOldLineColor );
     }
 }
@@ -211,7 +211,7 @@ SwViewOption::SwViewOption() :
              m_bTest5 = m_bTest6 = m_bTest7 = m_bTest8 = m_bTest10 = false;
 #endif
     if (comphelper::LibreOfficeKit::isActive())
-        aAppBackgroundColor = COL_TRANSPARENT;
+        m_aAppBackgroundColor = COL_TRANSPARENT;
 }
 
 SwViewOption::SwViewOption(const SwViewOption& rVOpt)
@@ -305,9 +305,9 @@ SwViewOption::~SwViewOption()
 
 void SwViewOption::Init( vcl::Window *pWin )
 {
-    if( !nPixelTwips && pWin )
+    if( !m_nPixelTwips && pWin )
     {
-        nPixelTwips = (sal_uInt16)pWin->PixelToLogic( Size(1,1) ).Height();
+        m_nPixelTwips = (sal_uInt16)pWin->PixelToLogic( Size(1,1) ).Height();
     }
 }
 
@@ -357,171 +357,171 @@ sal_uInt16      GetHtmlMode(const SwDocShell* pShell)
 
 Color&   SwViewOption::GetDocColor()
 {
-    return aDocColor;
+    return m_aDocColor;
 }
 
 Color&   SwViewOption::GetDocBoundariesColor()
 {
-    return aDocBoundColor;
+    return m_aDocBoundColor;
 }
 
 Color&   SwViewOption::GetObjectBoundariesColor()
 {
-    return aObjectBoundColor;
+    return m_aObjectBoundColor;
 }
 
 Color& SwViewOption::GetAppBackgroundColor()
 {
-    return aAppBackgroundColor;
+    return m_aAppBackgroundColor;
 }
 
 Color&   SwViewOption::GetTableBoundariesColor()
 {
-    return aTableBoundColor;
+    return m_aTableBoundColor;
 }
 
 Color&   SwViewOption::GetIndexShadingsColor()
 {
-    return aIndexShadingsColor;
+    return m_aIndexShadingsColor;
 }
 
 Color&   SwViewOption::GetLinksColor()
 {
-    return aLinksColor;
+    return m_aLinksColor;
 }
 
 Color&   SwViewOption::GetVisitedLinksColor()
 {
-    return aVisitedLinksColor;
+    return m_aVisitedLinksColor;
 }
 
 Color&   SwViewOption::GetDirectCursorColor()
 {
-    return aDirectCursorColor;
+    return m_aDirectCursorColor;
 }
 
 Color&   SwViewOption::GetTextGridColor()
 {
-    return aTextGridColor;
+    return m_aTextGridColor;
 }
 
 Color&   SwViewOption::GetSpellColor()
 {
-    return aSpellColor;
+    return m_aSpellColor;
 }
 
 Color&   SwViewOption::GetSmarttagColor()
 {
-    return aSmarttagColor;
+    return m_aSmarttagColor;
 }
 
 Color&   SwViewOption::GetShadowColor()
 {
-    return aShadowColor;
+    return m_aShadowColor;
 }
 
 Color&   SwViewOption::GetFontColor()
 {
-    return aFontColor;
+    return m_aFontColor;
 }
 
 Color&   SwViewOption::GetFieldShadingsColor()
 {
-    return aFieldShadingsColor;
+    return m_aFieldShadingsColor;
 }
 
 Color&   SwViewOption::GetSectionBoundColor()
 {
-    return aSectionBoundColor;
+    return m_aSectionBoundColor;
 }
 
 Color& SwViewOption::GetPageBreakColor()
 {
-    return aPageBreakColor;
+    return m_aPageBreakColor;
 }
 
 Color& SwViewOption::GetHeaderFooterMarkColor()
 {
-    return aHeaderFooterMarkColor;
+    return m_aHeaderFooterMarkColor;
 }
 
 void SwViewOption::ApplyColorConfigValues(const svtools::ColorConfig& rConfig )
 {
-    aDocColor.SetColor(rConfig.GetColorValue(svtools::DOCCOLOR).nColor);
+    m_aDocColor.SetColor(rConfig.GetColorValue(svtools::DOCCOLOR).nColor);
 
     svtools::ColorConfigValue aValue = rConfig.GetColorValue(svtools::DOCBOUNDARIES);
-    aDocBoundColor.SetColor(aValue.nColor);
-    nAppearanceFlags = 0;
+    m_aDocBoundColor.SetColor(aValue.nColor);
+    m_nAppearanceFlags = 0;
     if(aValue.bIsVisible)
-        nAppearanceFlags |= VIEWOPT_DOC_BOUNDARIES;
+        m_nAppearanceFlags |= VIEWOPT_DOC_BOUNDARIES;
 
-    aAppBackgroundColor.SetColor(rConfig.GetColorValue(svtools::APPBACKGROUND).nColor);
+    m_aAppBackgroundColor.SetColor(rConfig.GetColorValue(svtools::APPBACKGROUND).nColor);
 
     aValue = rConfig.GetColorValue(svtools::OBJECTBOUNDARIES);
-    aObjectBoundColor.SetColor(aValue.nColor);
+    m_aObjectBoundColor.SetColor(aValue.nColor);
     if(aValue.bIsVisible)
-        nAppearanceFlags |= VIEWOPT_OBJECT_BOUNDARIES;
+        m_nAppearanceFlags |= VIEWOPT_OBJECT_BOUNDARIES;
 
     aValue = rConfig.GetColorValue(svtools::TABLEBOUNDARIES);
-    aTableBoundColor.SetColor(aValue.nColor);
+    m_aTableBoundColor.SetColor(aValue.nColor);
     if(aValue.bIsVisible)
-        nAppearanceFlags |= VIEWOPT_TABLE_BOUNDARIES;
+        m_nAppearanceFlags |= VIEWOPT_TABLE_BOUNDARIES;
 
     aValue = rConfig.GetColorValue(svtools::WRITERIDXSHADINGS);
-    aIndexShadingsColor.SetColor(aValue.nColor);
+    m_aIndexShadingsColor.SetColor(aValue.nColor);
     if(aValue.bIsVisible)
-        nAppearanceFlags |= VIEWOPT_INDEX_SHADINGS;
+        m_nAppearanceFlags |= VIEWOPT_INDEX_SHADINGS;
 
     aValue = rConfig.GetColorValue(svtools::LINKS);
-    aLinksColor.SetColor(aValue.nColor);
+    m_aLinksColor.SetColor(aValue.nColor);
     if(aValue.bIsVisible)
-        nAppearanceFlags |= VIEWOPT_LINKS;
+        m_nAppearanceFlags |= VIEWOPT_LINKS;
 
     aValue = rConfig.GetColorValue(svtools::LINKSVISITED);
-    aVisitedLinksColor.SetColor(aValue.nColor);
+    m_aVisitedLinksColor.SetColor(aValue.nColor);
     if(aValue.bIsVisible)
-        nAppearanceFlags |= VIEWOPT_VISITED_LINKS;
+        m_nAppearanceFlags |= VIEWOPT_VISITED_LINKS;
 
     aValue = rConfig.GetColorValue(svtools::SHADOWCOLOR);
-    aShadowColor.SetColor(aValue.nColor);
+    m_aShadowColor.SetColor(aValue.nColor);
     if(aValue.bIsVisible)
-        nAppearanceFlags |= VIEWOPT_SHADOW;
+        m_nAppearanceFlags |= VIEWOPT_SHADOW;
 
-    aDirectCursorColor.SetColor(rConfig.GetColorValue(svtools::WRITERDIRECTCURSOR).nColor);
+    m_aDirectCursorColor.SetColor(rConfig.GetColorValue(svtools::WRITERDIRECTCURSOR).nColor);
 
-    aTextGridColor.SetColor(rConfig.GetColorValue(svtools::WRITERTEXTGRID).nColor);
+    m_aTextGridColor.SetColor(rConfig.GetColorValue(svtools::WRITERTEXTGRID).nColor);
 
-    aSpellColor.SetColor(rConfig.GetColorValue(svtools::SPELL).nColor);
+    m_aSpellColor.SetColor(rConfig.GetColorValue(svtools::SPELL).nColor);
 
-    aSmarttagColor.SetColor(rConfig.GetColorValue(svtools::SMARTTAGS).nColor);
+    m_aSmarttagColor.SetColor(rConfig.GetColorValue(svtools::SMARTTAGS).nColor);
 
-    aFontColor.SetColor(rConfig.GetColorValue(svtools::FONTCOLOR).nColor);
+    m_aFontColor.SetColor(rConfig.GetColorValue(svtools::FONTCOLOR).nColor);
 
     aValue = rConfig.GetColorValue(svtools::WRITERFIELDSHADINGS);
-    aFieldShadingsColor.SetColor(aValue.nColor);
+    m_aFieldShadingsColor.SetColor(aValue.nColor);
     if(aValue.bIsVisible)
-        nAppearanceFlags |= VIEWOPT_FIELD_SHADINGS;
+        m_nAppearanceFlags |= VIEWOPT_FIELD_SHADINGS;
 
     aValue = rConfig.GetColorValue(svtools::WRITERSECTIONBOUNDARIES);
-    aSectionBoundColor.SetColor(aValue.nColor);
+    m_aSectionBoundColor.SetColor(aValue.nColor);
     if(aValue.bIsVisible)
-        nAppearanceFlags |= VIEWOPT_SECTION_BOUNDARIES;
+        m_nAppearanceFlags |= VIEWOPT_SECTION_BOUNDARIES;
 
     aValue = rConfig.GetColorValue(svtools::WRITERPAGEBREAKS);
-    aPageBreakColor.SetColor(aValue.nColor);
+    m_aPageBreakColor.SetColor(aValue.nColor);
 
     aValue = rConfig.GetColorValue(svtools::WRITERHEADERFOOTERMARK);
-    aHeaderFooterMarkColor.SetColor(aValue.nColor);
+    m_aHeaderFooterMarkColor.SetColor(aValue.nColor);
 
-    aScriptIndicatorColor.SetColor(rConfig.GetColorValue(svtools::WRITERSCRIPTINDICATOR).nColor);
+    m_aScriptIndicatorColor.SetColor(rConfig.GetColorValue(svtools::WRITERSCRIPTINDICATOR).nColor);
 }
 
 void SwViewOption::SetAppearanceFlag(sal_Int32 nFlag, bool bSet, bool bSaveInConfig )
 {
     if(bSet)
-        nAppearanceFlags |= nFlag;
+        m_nAppearanceFlags |= nFlag;
     else
-        nAppearanceFlags &= ~nFlag;
+        m_nAppearanceFlags &= ~nFlag;
     if(bSaveInConfig)
     {
         //create an editable svtools::ColorConfig and store the change
@@ -560,7 +560,7 @@ void SwViewOption::SetAppearanceFlag(sal_Int32 nFlag, bool bSet, bool bSaveInCon
 
 bool SwViewOption::IsAppearanceFlag(sal_Int32 nFlag)
 {
-    return 0 != (nAppearanceFlags & nFlag);
+    return 0 != (m_nAppearanceFlags & nFlag);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */