Skip to content

C
core
Kaydet (Commit) 4bdd5309 authored tarafından Tor Lillqvist's avatar Tor Lillqvist
Dosyalara gözat
Seçenekler

Bin unused MAP_REALAPPFONT MapUnit enum value 

Change-Id: I759a981c68a899ba314f5b77efa450aa57528433
üst b10ed913
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 9 deletions
include/tools/mapunit.hxx
Dosyayı görüntüle @ 4bdd5309
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
enum MapUnit { MAP_100TH_MM, MAP_10TH_MM, MAP_MM, MAP_CM, enum MapUnit { MAP_100TH_MM, MAP_10TH_MM, MAP_MM, MAP_CM,
MAP_1000TH_INCH, MAP_100TH_INCH, MAP_10TH_INCH, MAP_INCH, MAP_1000TH_INCH, MAP_100TH_INCH, MAP_10TH_INCH, MAP_INCH,
MAP_POINT, MAP_TWIP, MAP_PIXEL, MAP_SYSFONT, MAP_APPFONT, MAP_POINT, MAP_TWIP, MAP_PIXEL, MAP_SYSFONT, MAP_APPFONT,
MAP_RELATIVE, MAP_REALAPPFONT, MAP_LASTENUMDUMMY }; MAP_RELATIVE, MAP_LASTENUMDUMMY };
#endif #endif
......
toolkit/source/helper/vclunohelper.cxx
Dosyayı görüntüle @ 4bdd5309
...@@ -608,9 +608,6 @@ MapUnit /* MapModeUnit */ VCLUnoHelper::ConvertToMapModeUnit(sal_Int16 /* com.su ...@@ -608,9 +608,6 @@ MapUnit /* MapModeUnit */ VCLUnoHelper::ConvertToMapModeUnit(sal_Int16 /* com.su
case com::sun::star::util::MeasureUnit::RELATIVE: case com::sun::star::util::MeasureUnit::RELATIVE:
eMode = MAP_RELATIVE; eMode = MAP_RELATIVE;
break; break;
case com::sun::star::util::MeasureUnit::REALAPPFONT:
eMode = MAP_REALAPPFONT;
break;
*/ */
default: default:
......
vcl/source/gdi/outmap.cxx
Dosyayı görüntüle @ 4bdd5309
...@@ -230,7 +230,6 @@ static void ImplCalcMapResolution( const MapMode& rMapMode, ...@@ -230,7 +230,6 @@ static void ImplCalcMapResolution( const MapMode& rMapMode,
break; break;
case MAP_SYSFONT: case MAP_SYSFONT:
case MAP_APPFONT: case MAP_APPFONT:
case MAP_REALAPPFONT:
{ {
ImplSVData* pSVData = ImplGetSVData(); ImplSVData* pSVData = ImplGetSVData();
if ( !pSVData->maGDIData.mnAppFontX ) if ( !pSVData->maGDIData.mnAppFontX )
...@@ -244,10 +243,7 @@ static void ImplCalcMapResolution( const MapMode& rMapMode, ...@@ -244,10 +243,7 @@ static void ImplCalcMapResolution( const MapMode& rMapMode,
delete pWin; delete pWin;
} }
} }
if ( rMapMode.GetMapUnit() == MAP_REALAPPFONT ) rMapRes.mnMapScNumX = pSVData->maGDIData.mnAppFontX;
rMapRes.mnMapScNumX = pSVData->maGDIData.mnRealAppFontX;
else
rMapRes.mnMapScNumX = pSVData->maGDIData.mnAppFontX;
rMapRes.mnMapScDenomX = nDPIX * 40; rMapRes.mnMapScDenomX = nDPIX * 40;
rMapRes.mnMapScNumY = pSVData->maGDIData.mnAppFontY; rMapRes.mnMapScNumY = pSVData->maGDIData.mnAppFontY;
rMapRes.mnMapScDenomY = nDPIY * 80; rMapRes.mnMapScDenomY = nDPIY * 80;
......
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