From 954f752cf10fc6a8777af2a6a93e496688464687 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 20 Sep 2016 16:41:39 +0200 Subject: convert MapUnit to scoped enum I left a prefix on the names "Map" so that I would not have to re-arrange each name too much, since I can't start identifiers with digits like "100thMM" And remove RSC_EXTRAMAPUNIT, which doesn't seem to be doing anything anymore. Change-Id: I5187824aa87e30caf5357b51b5384b5ab919d224 Reviewed-on: https://gerrit.libreoffice.org/29096 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- framework/source/uielement/comboboxtoolbarcontroller.cxx | 2 +- framework/source/uielement/complextoolbarcontroller.cxx | 2 +- framework/source/uielement/dropdownboxtoolbarcontroller.cxx | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'framework') diff --git a/framework/source/uielement/comboboxtoolbarcontroller.cxx b/framework/source/uielement/comboboxtoolbarcontroller.cxx index eef9ac9bf288..416c2f86e7da 100644 --- a/framework/source/uielement/comboboxtoolbarcontroller.cxx +++ b/framework/source/uielement/comboboxtoolbarcontroller.cxx @@ -139,7 +139,7 @@ ComboboxToolbarController::ComboboxToolbarController( // default dropdown size ::Size aLogicalSize( 8, 160 ); - ::Size aPixelSize = m_pComboBox->LogicToPixel( aLogicalSize, MAP_APPFONT ); + ::Size aPixelSize = m_pComboBox->LogicToPixel( aLogicalSize, MapUnit::MapAppFont ); m_pComboBox->SetSizePixel( ::Size( nWidth, aPixelSize.Height() )); m_pToolbar->SetItemWindow( m_nID, m_pComboBox ); diff --git a/framework/source/uielement/complextoolbarcontroller.cxx b/framework/source/uielement/complextoolbarcontroller.cxx index 0831d254237a..fc8003ce58dd 100644 --- a/framework/source/uielement/complextoolbarcontroller.cxx +++ b/framework/source/uielement/complextoolbarcontroller.cxx @@ -271,7 +271,7 @@ sal_Int32 ComplexToolbarController::getFontSizePixel( const vcl::Window* pWindow // Calculate height of the application font used by window sal_Int32 nHeight = sal_Int32( rFont.GetFontHeight() ); - ::Size aPixelSize = pWindow->LogicToPixel( ::Size( 0, nHeight ), MAP_APPFONT ); + ::Size aPixelSize = pWindow->LogicToPixel( ::Size( 0, nHeight ), MapUnit::MapAppFont ); return aPixelSize.Height(); } diff --git a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx index e0de120fd08b..dc66c3a93e03 100644 --- a/framework/source/uielement/dropdownboxtoolbarcontroller.cxx +++ b/framework/source/uielement/dropdownboxtoolbarcontroller.cxx @@ -130,7 +130,7 @@ DropdownToolbarController::DropdownToolbarController( // default dropdown size ::Size aLogicalSize( 0, 160 ); - ::Size aPixelSize = m_pListBoxControl->LogicToPixel( aLogicalSize, MAP_APPFONT ); + ::Size aPixelSize = m_pListBoxControl->LogicToPixel( aLogicalSize, MapUnit::MapAppFont ); m_pListBoxControl->SetSizePixel( ::Size( nWidth, aPixelSize.Height() )); m_pToolbar->SetItemWindow( m_nID, m_pListBoxControl ); -- cgit