Kaydet (Commit) ccebc0c2 authored tarafından Miklos Vajna's avatar Miklos Vajna

sw: separate non-static and static members of SwViewOption

Change-Id: I88838983098d2421b79770acce3823bf5fe73c6a
Reviewed-on: https://gerrit.libreoffice.org/52288Reviewed-by: 's avatarMiklos Vajna <vmiklos@collabora.co.uk>
Tested-by: 's avatarJenkins <ci@libreoffice.org>
üst b9955b20
......@@ -122,29 +122,29 @@ namespace o3tl {
class SW_DLLPUBLIC SwViewOption
{
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 ViewOptFlags m_nAppearanceFlags;
static Color s_aDocColor; // color of document boundaries
static Color s_aDocBoundColor; // color of document boundaries
static Color s_aObjectBoundColor; // color of object boundaries
static Color s_aAppBackgroundColor; // application background
static Color s_aTableBoundColor; // color of table boundaries
static Color s_aFontColor;
static Color s_aIndexShadingsColor; // background color of indexes
static Color s_aLinksColor;
static Color s_aVisitedLinksColor;
static Color s_aDirectCursorColor;
static Color s_aTextGridColor;
static Color s_aSpellColor; // mark color of online spell checking
static Color s_aSmarttagColor;
static Color s_aFieldShadingsColor;
static Color s_aSectionBoundColor;
static Color s_aPageBreakColor;
static Color s_aScriptIndicatorColor;
static Color s_aShadowColor;
static Color s_aHeaderFooterMarkColor;
static ViewOptFlags s_nAppearanceFlags;
protected:
static sal_uInt16 m_nPixelTwips;// 1 Pixel == ? Twips
static sal_uInt16 s_nPixelTwips;// 1 Pixel == ? Twips
OUString m_sSymbolFont; // Symbolfont.
ViewOptFlags1 m_nCoreOptions; // Bits for SwViewShell.
......@@ -186,7 +186,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 m_bTest9; // Test-Flag "DrawingLayerNotLoading"
static bool s_bTest9; // Test-Flag "DrawingLayerNotLoading"
bool m_bTest10 :1; // Test-Flag "Format by Input"
#endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment