[Libreoffice-commits] core.git: include/tools toolkit/source vcl/source

[Tor Lillqvist]

 include/tools/mapunit.hxx              |    2 +-
 toolkit/source/helper/vclunohelper.cxx |    3 ---
 vcl/source/gdi/outmap.cxx              |    6 +-----
 3 files changed, 2 insertions(+), 9 deletions(-)

New commits:
commit 4bdd530984959ba0d0cacb43f7441d9a217dfd1f
Author: Tor Lillqvist <tml at collabora.com>
Date:   Sun Apr 6 17:29:51 2014 +0300

    Bin unused MAP_REALAPPFONT MapUnit enum value
    
    Change-Id: I759a981c68a899ba314f5b77efa450aa57528433

diff --git a/include/tools/mapunit.hxx b/include/tools/mapunit.hxx
index b844017..0076b68 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 420992c..cf3efb7 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 1d5ffdb..24e929c 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;