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 --- toolkit/source/controls/tabpagemodel.cxx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'toolkit/source/controls/tabpagemodel.cxx') diff --git a/toolkit/source/controls/tabpagemodel.cxx b/toolkit/source/controls/tabpagemodel.cxx index c2353f0a7cd7..488d72a325ed 100644 --- a/toolkit/source/controls/tabpagemodel.cxx +++ b/toolkit/source/controls/tabpagemodel.cxx @@ -234,7 +234,7 @@ void UnoControlTabPage::createPeer( const Reference< XToolkit > & rxToolkit, con static ::Size ImplMapPixelToAppFont( OutputDevice* pOutDev, const ::Size& aSize ) { - ::Size aTmp = pOutDev->PixelToLogic( aSize, MAP_APPFONT ); + ::Size aTmp = pOutDev->PixelToLogic( aSize, MapUnit::MapAppFont ); return aTmp; } // css::awt::XWindowListener @@ -245,7 +245,7 @@ throw (css::uno::RuntimeException, std::exception) DBG_ASSERT( pOutDev, "Missing Default Device!" ); if ( pOutDev && !mbSizeModified ) { - // Currentley we are simply using MAP_APPFONT + // Currentley we are simply using MapUnit::MapAppFont ::Size aAppFontSize( e.Width, e.Height ); Reference< XControl > xDialogControl( *this, UNO_QUERY_THROW ); @@ -283,7 +283,7 @@ throw (css::uno::RuntimeException, std::exception) DBG_ASSERT( pOutDev, "Missing Default Device!" ); if ( pOutDev && !mbPosModified ) { - // Currentley we are simply using MAP_APPFONT + // Currentley we are simply using MapUnit::MapAppFont ::Size aTmp( e.X, e.Y ); aTmp = ImplMapPixelToAppFont( pOutDev, aTmp ); -- cgit