diff options
| author | Tor Lillqvist <tml@collabora.com> | 2014-04-06 17:29:51 +0300 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2014-04-06 18:23:32 +0300 |
| commit | 4bdd530984959ba0d0cacb43f7441d9a217dfd1f (patch) | |
| tree | 7c84b6b54a4004eac4c405914c85feeee64a15f5 | |
| parent | b10ed913ddf1cc049f4ceb689e2bf0e34d7ddea7 (diff) | |
Bin unused MAP_REALAPPFONT MapUnit enum value
Change-Id: I759a981c68a899ba314f5b77efa450aa57528433
| -rw-r--r-- | include/tools/mapunit.hxx | 2 | ||||
| -rw-r--r-- | toolkit/source/helper/vclunohelper.cxx | 3 | ||||
| -rw-r--r-- | vcl/source/gdi/outmap.cxx | 6 |
3 files changed, 2 insertions, 9 deletions
diff --git a/include/tools/mapunit.hxx b/include/tools/mapunit.hxx index b8440177db66..0076b685ddcb 100644 --- a/include/tools/mapunit.hxx +++ b/include/tools/mapunit.hxx @@ -23,7 +23,7 @@ enum MapUnit { MAP_100TH_MM, MAP_10TH_MM, MAP_MM, MAP_CM, MAP_1000TH_INCH, MAP_100TH_INCH, MAP_10TH_INCH, MAP_INCH, MAP_POINT, MAP_TWIP, MAP_PIXEL, MAP_SYSFONT, MAP_APPFONT, - MAP_RELATIVE, MAP_REALAPPFONT, MAP_LASTENUMDUMMY }; + MAP_RELATIVE, MAP_LASTENUMDUMMY }; #endif diff --git a/toolkit/source/helper/vclunohelper.cxx b/toolkit/source/helper/vclunohelper.cxx index 420992c0c2c7..cf3efb7a05dd 100644 --- a/toolkit/source/helper/vclunohelper.cxx +++ b/toolkit/source/helper/vclunohelper.cxx @@ -608,9 +608,6 @@ MapUnit /* MapModeUnit */ VCLUnoHelper::ConvertToMapModeUnit(sal_Int16 /* com.su case com::sun::star::util::MeasureUnit::RELATIVE: eMode = MAP_RELATIVE; break; - case com::sun::star::util::MeasureUnit::REALAPPFONT: - eMode = MAP_REALAPPFONT; - break; */ default: diff --git a/vcl/source/gdi/outmap.cxx b/vcl/source/gdi/outmap.cxx index 1d5ffdbe9b90..24e929c1b371 100644 --- a/vcl/source/gdi/outmap.cxx +++ b/vcl/source/gdi/outmap.cxx @@ -230,7 +230,6 @@ static void ImplCalcMapResolution( const MapMode& rMapMode, break; case MAP_SYSFONT: case MAP_APPFONT: - case MAP_REALAPPFONT: { ImplSVData* pSVData = ImplGetSVData(); if ( !pSVData->maGDIData.mnAppFontX ) @@ -244,10 +243,7 @@ static void ImplCalcMapResolution( const MapMode& rMapMode, delete pWin; } } - if ( rMapMode.GetMapUnit() == MAP_REALAPPFONT ) - rMapRes.mnMapScNumX = pSVData->maGDIData.mnRealAppFontX; - else - rMapRes.mnMapScNumX = pSVData->maGDIData.mnAppFontX; + rMapRes.mnMapScNumX = pSVData->maGDIData.mnAppFontX; rMapRes.mnMapScDenomX = nDPIX * 40; rMapRes.mnMapScNumY = pSVData->maGDIData.mnAppFontY; rMapRes.mnMapScDenomY = nDPIY * 80; |