diff options
author | Noel Grandin <noel@peralex.com> | 2014-10-14 09:36:33 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2014-10-15 10:13:04 +0000 |
commit | d9fa1247be9d3a3d559adbbf9e1ed12395744738 (patch) | |
tree | 20fb4e43af4c94760b290d62ad3a6ac581665bf1 /svtools | |
parent | d7a0916e68238d619d74cbab72e66980e24d2f48 (diff) |
fdo#84938: replace SYMBOL_TYPE constants with enum
Change-Id: Ib3763f20d74c22e28d519a9ac47f6f3ab4e31f51
Reviewed-on: https://gerrit.libreoffice.org/11983
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/source/control/tabbar.cxx | 8 | ||||
-rw-r--r-- | svtools/source/control/toolbarmenu.cxx | 4 | ||||
-rw-r--r-- | svtools/source/table/gridtablerenderer.cxx | 2 | ||||
-rw-r--r-- | svtools/source/toolpanel/paneltabbar.cxx | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/svtools/source/control/tabbar.cxx b/svtools/source/control/tabbar.cxx index dc4b1997a1c2..2e8fa764f6b8 100644 --- a/svtools/source/control/tabbar.cxx +++ b/svtools/source/control/tabbar.cxx @@ -717,7 +717,7 @@ void TabBar::ImplInitControls() mpPrevBtn = new ImplTabButton( this, WB_REPEAT ); mpPrevBtn->SetClickHdl( aLink ); } - mpPrevBtn->SetSymbol( mbMirrored ? SYMBOL_NEXT : SYMBOL_PREV ); + mpPrevBtn->SetSymbol( mbMirrored ? SymbolType::NEXT : SymbolType::PREV ); mpPrevBtn->Show(); if ( !mpNextBtn ) @@ -725,7 +725,7 @@ void TabBar::ImplInitControls() mpNextBtn = new ImplTabButton( this, WB_REPEAT ); mpNextBtn->SetClickHdl( aLink ); } - mpNextBtn->SetSymbol( mbMirrored ? SYMBOL_PREV : SYMBOL_NEXT ); + mpNextBtn->SetSymbol( mbMirrored ? SymbolType::PREV : SymbolType::NEXT ); mpNextBtn->Show(); } else @@ -741,7 +741,7 @@ void TabBar::ImplInitControls() mpFirstBtn = new ImplTabButton( this ); mpFirstBtn->SetClickHdl( aLink ); } - mpFirstBtn->SetSymbol( mbMirrored ? SYMBOL_LAST : SYMBOL_FIRST ); + mpFirstBtn->SetSymbol( mbMirrored ? SymbolType::LAST : SymbolType::FIRST ); mpFirstBtn->Show(); if ( !mpLastBtn ) @@ -749,7 +749,7 @@ void TabBar::ImplInitControls() mpLastBtn = new ImplTabButton( this ); mpLastBtn->SetClickHdl( aLink ); } - mpLastBtn->SetSymbol( mbMirrored ? SYMBOL_FIRST : SYMBOL_LAST ); + mpLastBtn->SetSymbol( mbMirrored ? SymbolType::FIRST : SymbolType::LAST ); mpLastBtn->Show(); } else diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx index f72eb40c3d8b..d59603a4a959 100644 --- a/svtools/source/control/toolbarmenu.cxx +++ b/svtools/source/control/toolbarmenu.cxx @@ -1435,12 +1435,12 @@ void ToolbarMenu::implPaint( ToolbarMenuEntry* pThisOnly, bool bHighlighted ) Size aSymbolSize; if ( pEntry->mnBits & MIB_RADIOCHECK ) { - eSymbol = SYMBOL_RADIOCHECKMARK; + eSymbol = SymbolType::RADIOCHECKMARK; aSymbolSize = Size( nFontHeight/2, nFontHeight/2 ); } else { - eSymbol = SYMBOL_CHECKMARK; + eSymbol = SymbolType::CHECKMARK; aSymbolSize = Size( (nFontHeight*25)/40, nFontHeight/2 ); } aTmpPos.X() = aOuterCheckRect.Left() + (aOuterCheckRect.GetWidth() - aSymbolSize.Width())/2; diff --git a/svtools/source/table/gridtablerenderer.cxx b/svtools/source/table/gridtablerenderer.cxx index e1eeec061d76..e350a2237c12 100644 --- a/svtools/source/table/gridtablerenderer.cxx +++ b/svtools/source/table/gridtablerenderer.cxx @@ -92,7 +92,7 @@ namespace svt { namespace table DecorationView aDecoView( &aDevice ); aDecoView.DrawSymbol( Rectangle( aBitmapPos, aBitmapSize ), - i_sortAscending ? SYMBOL_SPIN_UP : SYMBOL_SPIN_DOWN, + i_sortAscending ? SymbolType::SPIN_UP : SymbolType::SPIN_DOWN, i_style.GetActiveColor() ); diff --git a/svtools/source/toolpanel/paneltabbar.cxx b/svtools/source/toolpanel/paneltabbar.cxx index 7570adf0ce4e..3dc375124bb6 100644 --- a/svtools/source/toolpanel/paneltabbar.cxx +++ b/svtools/source/toolpanel/paneltabbar.cxx @@ -527,13 +527,13 @@ namespace svt m_rPanelDeck.AddListener( *this ); - m_aScrollBack.SetSymbol( IsVertical() ? SYMBOL_ARROW_UP : SYMBOL_ARROW_LEFT ); + m_aScrollBack.SetSymbol( IsVertical() ? SymbolType::ARROW_UP : SymbolType::ARROW_LEFT ); m_aScrollBack.Show(); m_aScrollBack.SetClickHdl( LINK( this, PanelTabBar_Impl, OnScroll ) ); m_aScrollBack.SetAccessibleDescription( SvtResId( STR_SVT_TOOL_PANEL_BUTTON_FWD ).toString() ); m_aScrollBack.SetAccessibleName( m_aScrollBack.GetAccessibleDescription() ); - m_aScrollForward.SetSymbol( IsVertical() ? SYMBOL_ARROW_DOWN : SYMBOL_ARROW_RIGHT ); + m_aScrollForward.SetSymbol( IsVertical() ? SymbolType::ARROW_DOWN : SymbolType::ARROW_RIGHT ); m_aScrollForward.Show(); m_aScrollForward.SetClickHdl( LINK( this, PanelTabBar_Impl, OnScroll ) ); m_aScrollForward.SetAccessibleDescription( SvtResId( STR_SVT_TOOL_PANEL_BUTTON_BACK ).toString() ); |