[Libreoffice-commits] .: vcl/inc vcl/source

August Sodora augsod at kemper.freedesktop.org
Sun Dec 11 10:17:12 PST 2011


 vcl/inc/vcl/outdev.hxx          |   33 -----
 vcl/source/gdi/outdev2.cxx      |   38 ------
 vcl/source/gdi/outdev3.cxx      |   27 ----
 vcl/source/gdi/outdevnative.cxx |   39 -------
 vcl/source/gdi/outmap.cxx       |  222 ----------------------------------------
 5 files changed, 359 deletions(-)

New commits:
commit bb11106e06fa47a105bd02c2281f20af147b71b6
Author: August Sodora <augsod at gmail.com>
Date:   Sun Dec 11 00:36:49 2011 -0500

    Remove unused code

diff --git a/vcl/inc/vcl/outdev.hxx b/vcl/inc/vcl/outdev.hxx
index d2d3809..9ce143d 100644
--- a/vcl/inc/vcl/outdev.hxx
+++ b/vcl/inc/vcl/outdev.hxx
@@ -416,7 +416,6 @@ public:
                                             const sal_Int32* pPixelDXArray ) const;
     SAL_DLLPRIVATE SalLayout*   ImplGlyphFallbackLayout( SalLayout*, ImplLayoutArgs& ) const;
 
-    SAL_DLLPRIVATE long         ImplGetTextWidth( const SalLayout& ) const;
     static
     SAL_DLLPRIVATE XubString    ImplGetEllipsisString( const OutputDevice& rTargetDevice, const XubString& rStr,
                                                        long nMaxWidth, sal_uInt16 nStyle, const ::vcl::ITextLayout& _rLayout );
@@ -458,10 +457,7 @@ public:
     SAL_DLLPRIVATE long         ImplLogicHeightToDevicePixel( long nHeight ) const;
     SAL_DLLPRIVATE long         ImplDevicePixelToLogicWidth( long nWidth ) const;
     SAL_DLLPRIVATE long         ImplDevicePixelToLogicHeight( long nHeight ) const;
-    SAL_DLLPRIVATE float        ImplFloatLogicWidthToDevicePixel( float ) const;
     SAL_DLLPRIVATE float        ImplFloatLogicHeightToDevicePixel( float ) const;
-    SAL_DLLPRIVATE float        ImplFloatDevicePixelToLogicWidth( float ) const;
-    SAL_DLLPRIVATE float        ImplFloatDevicePixelToLogicHeight( float ) const;
     SAL_DLLPRIVATE Point        ImplLogicToDevicePixel( const Point& rLogicPt ) const;
     SAL_DLLPRIVATE Size         ImplLogicToDevicePixel( const Size& rLogicSize ) const;
     SAL_DLLPRIVATE Rectangle    ImplLogicToDevicePixel( const Rectangle& rLogicRect ) const;
@@ -601,7 +597,6 @@ public:
                                       FontUnderline eUnderline,
                                       FontUnderline eOverline,
                                       sal_Bool bUnderlineAbove = sal_False );
-    static sal_Bool         IsTextUnderlineAbove( const Font& rFont );
 
     void                DrawText( const Point& rStartPt, const XubString& rStr,
                                   xub_StrLen nIndex = 0, xub_StrLen nLen = STRING_LEN,
@@ -830,7 +825,6 @@ public:
                                            const ::vcl::RenderGraphic& rRenderGraphic );
 
     Color               GetPixel( const Point& rPt ) const;
-    Color*              GetPixel( const Polygon& rPts ) const;
 
     Bitmap              GetBitmap( const Point& rSrcPt, const Size& rSize ) const;
 
@@ -992,9 +986,7 @@ public:
     Size                LogicToPixel( const Size& rLogicSize ) const;
     Rectangle           LogicToPixel( const Rectangle& rLogicRect ) const;
     Polygon             LogicToPixel( const Polygon& rLogicPoly ) const;
-    basegfx::B2DPolygon LogicToPixel( const basegfx::B2DPolygon& rLogicPolyPoly ) const;
     PolyPolygon         LogicToPixel( const PolyPolygon& rLogicPolyPoly ) const;
-    basegfx::B2DPolyPolygon LogicToPixel( const basegfx::B2DPolyPolygon& rLogicPolyPoly ) const;
     Region              LogicToPixel( const Region& rLogicRegion )const;
     Point               LogicToPixel( const Point& rLogicPt,
                                       const MapMode& rMapMode ) const;
@@ -1004,21 +996,15 @@ public:
                                       const MapMode& rMapMode ) const;
     Polygon             LogicToPixel( const Polygon& rLogicPoly,
                                       const MapMode& rMapMode ) const;
-    basegfx::B2DPolygon LogicToPixel( const basegfx::B2DPolygon& rLogicPoly,
-                                          const MapMode& rMapMode ) const;
     PolyPolygon         LogicToPixel( const PolyPolygon& rLogicPolyPoly,
                                       const MapMode& rMapMode ) const;
     basegfx::B2DPolyPolygon LogicToPixel( const basegfx::B2DPolyPolygon& rLogicPolyPoly,
                                           const MapMode& rMapMode ) const;
-    Region              LogicToPixel( const Region& rLogicRegion,
-                                      const MapMode& rMapMode ) const;
     Point               PixelToLogic( const Point& rDevicePt ) const;
     Size                PixelToLogic( const Size& rDeviceSize ) const;
     Rectangle           PixelToLogic( const Rectangle& rDeviceRect ) const;
     Polygon             PixelToLogic( const Polygon& rDevicePoly ) const;
-    basegfx::B2DPolygon PixelToLogic( const basegfx::B2DPolygon& rDevicePoly ) const;
     PolyPolygon         PixelToLogic( const PolyPolygon& rDevicePolyPoly ) const;
-    basegfx::B2DPolyPolygon PixelToLogic( const basegfx::B2DPolyPolygon& rDevicePolyPoly ) const;
     Region              PixelToLogic( const Region& rDeviceRegion ) const;
     Point               PixelToLogic( const Point& rDevicePt,
                                       const MapMode& rMapMode ) const;
@@ -1034,9 +1020,6 @@ public:
                                       const MapMode& rMapMode ) const;
     basegfx::B2DPolyPolygon PixelToLogic( const basegfx::B2DPolyPolygon& rDevicePolyPoly,
                                           const MapMode& rMapMode ) const;
-    Region              PixelToLogic( const Region& rDeviceRegion,
-                                      const MapMode& rMapMode ) const;
-
     Point               LogicToLogic( const Point&      rPtSource,
                                       const MapMode*    pMapModeSource,
                                       const MapMode*    pMapModeDest ) const;
@@ -1046,10 +1029,6 @@ public:
     Rectangle           LogicToLogic( const Rectangle&  rRectSource,
                                       const MapMode*    pMapModeSource,
                                       const MapMode*    pMapModeDest ) const;
-    long*               LogicToLogic( long*             pX,
-                                      sal_uInt16            nCount,
-                                      const MapMode*    pMapModeSource,
-                                      const MapMode*    pMapModeDest ) const;
     static Point        LogicToLogic( const Point&      rPtSource,
                                       const MapMode&    rMapModeSource,
                                       const MapMode&    rMapModeDest );
@@ -1066,9 +1045,6 @@ public:
     static basegfx::B2DPolygon LogicToLogic( const basegfx::B2DPolygon& rPoly,
                                              const MapMode&    rMapModeSource,
                                              const MapMode&    rMapModeDest );
-    static basegfx::B2DPolyPolygon LogicToLogic( const basegfx::B2DPolyPolygon& rPolyPoly,
-                                                 const MapMode&    rMapModeSource,
-                                                 const MapMode&    rMapModeDest );
 
     Size                GetOutputSizePixel() const
                             { return Size( mnOutWidth, mnOutHeight ); }
@@ -1099,7 +1075,6 @@ public:
                             xub_StrLen nIndex = 0, xub_StrLen nLen = STRING_LEN ) const;
 
     long                GetMinKashida() const;
-    long                GetMinKashida( const Font& rFont ) const;
 
     // i60594
     // validate kashida positions against the current font
@@ -1212,14 +1187,6 @@ public:
                                             const ImplControlValue& aValue,
                                             ::rtl::OUString aCaption );
 
-     // Request rendering of a caption string for a control
-    sal_Bool                DrawNativeControlText(  ControlType nType,
-                                                ControlPart nPart,
-                                                const Rectangle& rControlRegion,
-                                                ControlState nState,
-                                                const ImplControlValue& aValue,
-                                                ::rtl::OUString aCaption );
-
     // Query the native control's actual drawing region (including adornment)
     sal_Bool                GetNativeControlRegion( ControlType nType,
                                                 ControlPart nPart,
diff --git a/vcl/source/gdi/outdev2.cxx b/vcl/source/gdi/outdev2.cxx
index d405367..3ee7254 100644
--- a/vcl/source/gdi/outdev2.cxx
+++ b/vcl/source/gdi/outdev2.cxx
@@ -1405,44 +1405,6 @@ Color OutputDevice::GetPixel( const Point& rPt ) const
 
 // ------------------------------------------------------------------
 
-Color* OutputDevice::GetPixel( const Polygon& rPts ) const
-{
-    DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
-
-    Color*          pColors = NULL;
-    const sal_uInt16    nSize = rPts.GetSize();
-
-    if( nSize )
-    {
-        if ( mpGraphics || ((OutputDevice*)this)->ImplGetGraphics() )
-        {
-            if ( mbInitClipRegion )
-                ((OutputDevice*)this)->ImplInitClipRegion();
-
-            if ( !mbOutputClipped )
-            {
-                pColors = new Color[ nSize ];
-
-                for( sal_uInt16 i = 0; i < nSize; i++ )
-                {
-                    Color&          rCol = pColors[ i ];
-                    const Point&    rPt = rPts[ i ];
-                    const SalColor  aSalCol( mpGraphics->GetPixel( ImplLogicXToDevicePixel( rPt.X() ),
-                                                                   ImplLogicYToDevicePixel( rPt.Y() ) , this) );
-
-                    rCol.SetRed( SALCOLOR_RED( aSalCol ) );
-                    rCol.SetGreen( SALCOLOR_GREEN( aSalCol ) );
-                    rCol.SetBlue( SALCOLOR_BLUE( aSalCol ) );
-                }
-            }
-        }
-    }
-
-    return pColors;
-}
-
-// -----------------------------------------------------------------------
-
 void OutputDevice::DrawPixel( const Point& rPt )
 {
     OSL_TRACE( "OutputDevice::DrawPixel()" );
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx
index e359281..bf2628c 100755
--- a/vcl/source/gdi/outdev3.cxx
+++ b/vcl/source/gdi/outdev3.cxx
@@ -3147,15 +3147,6 @@ bool OutputDevice::ImplNewFont() const
 
 // -----------------------------------------------------------------------
 
-long OutputDevice::ImplGetTextWidth( const SalLayout& rSalLayout ) const
-{
-    long nWidth = rSalLayout.GetTextWidth();
-    nWidth /= rSalLayout.GetUnitsPerPixel();
-    return nWidth;
-}
-
-// -----------------------------------------------------------------------
-
 void OutputDevice::ImplDrawTextRect( long nBaseX, long nBaseY,
                                      long nDistX, long nDistY, long nWidth, long nHeight )
 {
@@ -5481,13 +5472,6 @@ void OutputDevice::DrawTextLine( const Point& rPos, long nWidth,
 
 // ------------------------------------------------------------------------
 
-sal_Bool OutputDevice::IsTextUnderlineAbove( const Font& rFont )
-{
-    return ImplIsUnderlineAbove( rFont );
-}
-
-// ------------------------------------------------------------------------
-
 void OutputDevice::DrawWaveLine( const Point& rStartPos, const Point& rEndPos,
                                  sal_uInt16 nStyle )
 {
@@ -7467,17 +7451,6 @@ long OutputDevice::GetMinKashida() const
     ImplFontMetricData* pMetric = &(pEntry->maMetric);
     return ImplDevicePixelToLogicWidth( pMetric->mnMinKashida );
 }
-// -----------------------------------------------------------------------
-
-long OutputDevice::GetMinKashida( const Font& rFont ) const
-{
-    // select font, query Kashida, select original font again
-    Font aOldFont = GetFont();
-    const_cast<OutputDevice*>(this)->SetFont( rFont );
-    long aKashida = GetMinKashida();
-    const_cast<OutputDevice*>(this)->SetFont( aOldFont );
-    return aKashida;
-}
 
 // -----------------------------------------------------------------------
 xub_StrLen OutputDevice::ValidateKashidas ( const String& rTxt,
diff --git a/vcl/source/gdi/outdevnative.cxx b/vcl/source/gdi/outdevnative.cxx
index 620566b..50c2ac0 100644
--- a/vcl/source/gdi/outdevnative.cxx
+++ b/vcl/source/gdi/outdevnative.cxx
@@ -258,45 +258,6 @@ sal_Bool OutputDevice::DrawNativeControl( ControlType nType,
     return bRet;
 }
 
-
-// -----------------------------------------------------------------------
-
-sal_Bool OutputDevice::DrawNativeControlText(ControlType nType,
-                            ControlPart nPart,
-                            const Rectangle& rControlRegion,
-                            ControlState nState,
-                            const ImplControlValue& aValue,
-                            ::rtl::OUString aCaption )
-{
-    if( !lcl_enableNativeWidget( *this ) )
-        return sal_False;
-
-    // make sure the current clip region is initialized correctly
-    if ( !mpGraphics )
-        if ( !ImplGetGraphics() )
-            return false;
-
-    if ( mbInitClipRegion )
-        ImplInitClipRegion();
-    if ( mbOutputClipped )
-        return true;
-
-    if ( mbInitLineColor )
-        ImplInitLineColor();
-    if ( mbInitFillColor )
-        ImplInitFillColor();
-
-    // Convert the coordinates from relative to Window-absolute, so we draw
-    // in the correct place in platform code
-    boost::shared_ptr< ImplControlValue > aScreenCtrlValue( lcl_transformControlValue( aValue, *this ) );
-    Rectangle screenRegion( ImplLogicToDevicePixel( rControlRegion ) );
-
-    sal_Bool bRet = mpGraphics->DrawNativeControlText(nType, nPart, screenRegion, nState, *aScreenCtrlValue, aCaption, this );
-
-    return bRet;
-}
-
-
 // -----------------------------------------------------------------------
 
 sal_Bool OutputDevice::GetNativeControlRegion(  ControlType nType,
diff --git a/vcl/source/gdi/outmap.cxx b/vcl/source/gdi/outmap.cxx
index 740d5ad..c4d03ca 100644
--- a/vcl/source/gdi/outmap.cxx
+++ b/vcl/source/gdi/outmap.cxx
@@ -466,15 +466,6 @@ long OutputDevice::ImplLogicWidthToDevicePixel( long nWidth ) const
                              maThresRes.mnThresLogToPixX );
 }
 
-float OutputDevice::ImplFloatLogicWidthToDevicePixel( float fLogicWidth) const
-{
-    if( !mbMap)
-        return fLogicWidth;
-    // TODO: consolidate the calculation into one multiplication
-    float fPixelWidth = (fLogicWidth * mnDPIX * maMapRes.mnMapScNumX) / maMapRes.mnMapScDenomX;
-    return fPixelWidth;
-}
-
 // -----------------------------------------------------------------------
 
 long OutputDevice::ImplLogicHeightToDevicePixel( long nHeight ) const
@@ -507,14 +498,6 @@ long OutputDevice::ImplDevicePixelToLogicWidth( long nWidth ) const
                              maThresRes.mnThresPixToLogX );
 }
 
-float OutputDevice::ImplFloatDevicePixelToLogicWidth( float fPixelWidth) const
-{
-    if( !mbMap)
-        return fPixelWidth;
-    float fLogicHeight = (fPixelWidth * maMapRes.mnMapScDenomX) / (mnDPIX * maMapRes.mnMapScNumX);
-    return fLogicHeight;
-}
-
 // -----------------------------------------------------------------------
 
 long OutputDevice::ImplDevicePixelToLogicHeight( long nHeight ) const
@@ -527,15 +510,6 @@ long OutputDevice::ImplDevicePixelToLogicHeight( long nHeight ) const
                              maThresRes.mnThresPixToLogY );
 }
 
-float OutputDevice::ImplFloatDevicePixelToLogicHeight( float fPixelHeight) const
-{
-    if( !mbMap)
-        return fPixelHeight;
-    float fLogicHeight = (fPixelHeight * maMapRes.mnMapScDenomY) / (mnDPIY * maMapRes.mnMapScNumY);
-    return fLogicHeight;
-}
-
-
 // -----------------------------------------------------------------------
 
 Point OutputDevice::ImplLogicToDevicePixel( const Point& rLogicPt ) const
@@ -1166,26 +1140,6 @@ PolyPolygon OutputDevice::LogicToPixel( const PolyPolygon& rLogicPolyPoly ) cons
 
 // -----------------------------------------------------------------------
 
-basegfx::B2DPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolygon& rLogicPoly ) const
-{
-    basegfx::B2DPolygon aTransformedPoly = rLogicPoly;
-    const ::basegfx::B2DHomMatrix& rTransformationMatrix = GetViewTransformation();
-    aTransformedPoly.transform( rTransformationMatrix );
-    return aTransformedPoly;
-}
-
-// -----------------------------------------------------------------------
-
-basegfx::B2DPolyPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolyPolygon& rLogicPolyPoly ) const
-{
-    basegfx::B2DPolyPolygon aTransformedPoly = rLogicPolyPoly;
-    const ::basegfx::B2DHomMatrix& rTransformationMatrix = GetViewTransformation();
-    aTransformedPoly.transform( rTransformationMatrix );
-    return aTransformedPoly;
-}
-
-// -----------------------------------------------------------------------
-
 Region OutputDevice::LogicToPixel( const Region& rLogicRegion ) const
 {
     DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
@@ -1381,58 +1335,6 @@ basegfx::B2DPolyPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolyPolygo
 
 // -----------------------------------------------------------------------
 
-basegfx::B2DPolygon OutputDevice::LogicToPixel( const basegfx::B2DPolygon& rLogicPoly,
-                                                const MapMode& rMapMode ) const
-{
-    basegfx::B2DPolygon aTransformedPoly = rLogicPoly;
-    const ::basegfx::B2DHomMatrix& rTransformationMatrix = GetViewTransformation( rMapMode );
-    aTransformedPoly.transform( rTransformationMatrix );
-    return aTransformedPoly;
-}
-
-// -----------------------------------------------------------------------
-
-Region OutputDevice::LogicToPixel( const Region& rLogicRegion,
-                                   const MapMode& rMapMode ) const
-{
-    DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
-    DBG_CHKOBJ( &rLogicRegion, Region, ImplDbgTestRegion );
-
-    RegionType eType = rLogicRegion.GetType();
-
-    if ( rMapMode.IsDefault() || (eType == REGION_EMPTY) || (eType == REGION_NULL) )
-        return rLogicRegion;
-
-    Region          aRegion;
-    PolyPolygon*    pPolyPoly = rLogicRegion.ImplGetImplRegion()->mpPolyPoly;
-
-    if( pPolyPoly )
-        aRegion = Region( LogicToPixel( *pPolyPoly, rMapMode ) );
-    else
-    {
-        long                nX;
-        long                nY;
-        long                nWidth;
-        long                nHeight;
-        ImplRegionInfo      aInfo;
-        sal_Bool                bRegionRect;
-
-        aRegion.ImplBeginAddRect();
-        bRegionRect = rLogicRegion.ImplGetFirstRect( aInfo, nX, nY, nWidth, nHeight );
-        while ( bRegionRect )
-        {
-            Rectangle aRect( Point( nX, nY ), Size( nWidth, nHeight ) );
-            aRegion.ImplAddRect( LogicToPixel( aRect, rMapMode ) );
-            bRegionRect = rLogicRegion.ImplGetNextRect( aInfo, nX, nY, nWidth, nHeight );
-        }
-        aRegion.ImplEndAddRect();
-    }
-
-    return aRegion;
-}
-
-// -----------------------------------------------------------------------
-
 Point OutputDevice::PixelToLogic( const Point& rDevicePt ) const
 {
     DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
@@ -1543,26 +1445,6 @@ PolyPolygon OutputDevice::PixelToLogic( const PolyPolygon& rDevicePolyPoly ) con
 
 // -----------------------------------------------------------------------
 
-basegfx::B2DPolygon OutputDevice::PixelToLogic( const basegfx::B2DPolygon& rPixelPoly ) const
-{
-    basegfx::B2DPolygon aTransformedPoly = rPixelPoly;
-    const ::basegfx::B2DHomMatrix& rTransformationMatrix = GetInverseViewTransformation();
-    aTransformedPoly.transform( rTransformationMatrix );
-    return aTransformedPoly;
-}
-
-// -----------------------------------------------------------------------
-
-basegfx::B2DPolyPolygon OutputDevice::PixelToLogic( const basegfx::B2DPolyPolygon& rPixelPolyPoly ) const
-{
-    basegfx::B2DPolyPolygon aTransformedPoly = rPixelPolyPoly;
-    const ::basegfx::B2DHomMatrix& rTransformationMatrix = GetInverseViewTransformation();
-    aTransformedPoly.transform( rTransformationMatrix );
-    return aTransformedPoly;
-}
-
-// -----------------------------------------------------------------------
-
 Region OutputDevice::PixelToLogic( const Region& rDeviceRegion ) const
 {
     DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
@@ -1764,47 +1646,6 @@ basegfx::B2DPolyPolygon OutputDevice::PixelToLogic( const basegfx::B2DPolyPolygo
 
 // -----------------------------------------------------------------------
 
-Region OutputDevice::PixelToLogic( const Region& rDeviceRegion,
-                                   const MapMode& rMapMode ) const
-{
-    DBG_CHKTHIS( OutputDevice, ImplDbgCheckOutputDevice );
-    DBG_CHKOBJ( &rDeviceRegion, Region, ImplDbgTestRegion );
-
-    RegionType eType = rDeviceRegion.GetType();
-
-    if ( rMapMode.IsDefault() || (eType == REGION_EMPTY) || (eType == REGION_NULL) )
-        return rDeviceRegion;
-
-    Region          aRegion;
-    PolyPolygon*    pPolyPoly = rDeviceRegion.ImplGetImplRegion()->mpPolyPoly;
-
-    if ( pPolyPoly )
-        aRegion = Region( PixelToLogic( *pPolyPoly, rMapMode ) );
-    else
-    {
-        long                nX;
-        long                nY;
-        long                nWidth;
-        long                nHeight;
-        ImplRegionInfo      aInfo;
-        sal_Bool                bRegionRect;
-
-        aRegion.ImplBeginAddRect();
-        bRegionRect = rDeviceRegion.ImplGetFirstRect( aInfo, nX, nY, nWidth, nHeight );
-        while ( bRegionRect )
-        {
-            Rectangle aRect( Point( nX, nY ), Size( nWidth, nHeight ) );
-            aRegion.ImplAddRect( PixelToLogic( aRect, rMapMode ) );
-            bRegionRect = rDeviceRegion.ImplGetNextRect( aInfo, nX, nY, nWidth, nHeight );
-        }
-        aRegion.ImplEndAddRect();
-    }
-
-    return aRegion;
-}
-
-// -----------------------------------------------------------------------
-
 #define ENTER0( rSource, pMapModeSource, pMapModeDest )                 \
     if ( !pMapModeSource )                                              \
         pMapModeSource = &maMapMode;                                    \
@@ -2103,24 +1944,6 @@ Rectangle OutputDevice::LogicToLogic( const Rectangle& rRectSource,
 
 // -----------------------------------------------------------------------
 
-long* OutputDevice::LogicToLogic( long* pX, sal_uInt16 nCount,
-                                  const MapMode* pMapModeSource,
-                                  const MapMode* pMapModeDest ) const
-{
-    ENTER1( pX, pMapModeSource, pMapModeDest );
-
-    for( ; nCount; nCount--, pX++ )
-    {
-        *pX = fn5( *pX,
-                   aMapResSource.mnMapScNumX, aMapResDest.mnMapScDenomX,
-                   aMapResSource.mnMapScDenomX, aMapResDest.mnMapScNumX );
-    }
-
-    return NULL;
-}
-
-// -----------------------------------------------------------------------
-
 Point OutputDevice::LogicToLogic( const Point& rPtSource,
                                   const MapMode& rMapModeSource,
                                   const MapMode& rMapModeDest )
@@ -2236,51 +2059,6 @@ basegfx::B2DPolygon OutputDevice::LogicToLogic( const basegfx::B2DPolygon& rPoly
 
 // -----------------------------------------------------------------------
 
-basegfx::B2DPolyPolygon OutputDevice::LogicToLogic( const basegfx::B2DPolyPolygon& rPolySource,
-                                                    const MapMode& rMapModeSource,
-                                                    const MapMode& rMapModeDest )
-{
-    if ( rMapModeSource == rMapModeDest )
-        return rPolySource;
-
-    MapUnit eUnitSource = rMapModeSource.GetMapUnit();
-    MapUnit eUnitDest   = rMapModeDest.GetMapUnit();
-    ENTER2( eUnitSource, eUnitDest );
-
-    basegfx::B2DHomMatrix aTransform;
-
-    if ( rMapModeSource.mpImplMapMode->mbSimple &&
-         rMapModeDest.mpImplMapMode->mbSimple )
-    {
-        ENTER3( eUnitSource, eUnitDest );
-
-        const double fScaleFactor((double)nNumerator / (double)nDenominator);
-        aTransform.set(0, 0, fScaleFactor);
-        aTransform.set(1, 1, fScaleFactor);
-    }
-    else
-    {
-        ENTER4( rMapModeSource, rMapModeDest );
-
-        const double fScaleFactorX(  (double(aMapResSource.mnMapScNumX) *  double(aMapResDest.mnMapScDenomX))
-                                   / (double(aMapResSource.mnMapScDenomX) * double(aMapResDest.mnMapScNumX)) );
-        const double fScaleFactorY(  (double(aMapResSource.mnMapScNumY) *  double(aMapResDest.mnMapScDenomY))
-                                   / (double(aMapResSource.mnMapScDenomY) * double(aMapResDest.mnMapScNumY)) );
-        const double fZeroPointX(double(aMapResSource.mnMapOfsX) * fScaleFactorX - double(aMapResDest.mnMapOfsX));
-        const double fZeroPointY(double(aMapResSource.mnMapOfsY) * fScaleFactorY - double(aMapResDest.mnMapOfsY));
-
-        aTransform.set(0, 0, fScaleFactorX);
-        aTransform.set(1, 1, fScaleFactorY);
-        aTransform.set(0, 2, fZeroPointX);
-        aTransform.set(1, 2, fZeroPointY);
-    }
-    basegfx::B2DPolyPolygon aPoly( rPolySource );
-    aPoly.transform( aTransform );
-    return aPoly;
-}
-
-// -----------------------------------------------------------------------
-
 Rectangle OutputDevice::LogicToLogic( const Rectangle& rRectSource,
                                       const MapMode& rMapModeSource,
                                       const MapMode& rMapModeDest )


More information about the Libreoffice-commits mailing list