[Libreoffice-commits] .: svx/source

Thorsten Behrens thorsten at kemper.freedesktop.org
Fri Feb 17 16:33:32 PST 2012


 svx/source/dialog/_contdlg.cxx |   65 -----------------------------------------
 1 file changed, 65 deletions(-)

New commits:
commit 600c27470380f80445fecb4b5691e0d11060494d
Author: Björgvin Ragnarsson <nifgraup at gmail.com>
Date:   Fri Feb 17 23:19:28 2012 +0000

    Remove unused code in core/svx/source/dialog/_contdlg.cxx

diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx
index 576d06e..c96bbf7 100644
--- a/svx/source/dialog/_contdlg.cxx
+++ b/svx/source/dialog/_contdlg.cxx
@@ -195,64 +195,9 @@ PolyPolygon SvxContourDlg::CreateAutoContour( const Graphic& rGraphic,
     return PolyPolygon( XOutBitmap::GetCountour( aBmp, nContourFlags, 128, pRect ) );
 }
 
-void SvxContourDlg::ScaleContour( PolyPolygon& rContour, const Graphic& rGraphic,
-                                  const MapUnit eUnit, const Size& rDisplaySize )
-{
-    DBG_ASSERT( rGraphic.GetType() != GRAPHIC_NONE, "Graphic is not valid!" );
-
-    OutputDevice*   pOutDev = Application::GetDefaultDevice();
-    const MapMode   aDispMap( eUnit );
-    const MapMode   aGrfMap( rGraphic.GetPrefMapMode() );
-    const Size      aGrfSize( rGraphic.GetPrefSize() );
-    Size            aOrgSize;
-    Point           aNewPoint;
-    sal_Bool            bPixelMap = aGrfMap.GetMapUnit() == MAP_PIXEL;
-
-    if ( bPixelMap )
-        aOrgSize = pOutDev->PixelToLogic( aGrfSize, aDispMap );
-    else
-        aOrgSize = pOutDev->LogicToLogic( aGrfSize, aGrfMap, aDispMap );
-
-    if ( aOrgSize.Width() && aOrgSize.Height() )
-    {
-        double fScaleX = (double) rDisplaySize.Width() / aOrgSize.Width();
-        double fScaleY = (double) rDisplaySize.Height() / aOrgSize.Height();
-
-        for ( sal_uInt16 j = 0, nPolyCount = rContour.Count(); j < nPolyCount; j++ )
-        {
-            Polygon& rPoly = rContour[ j ];
-
-            for ( sal_uInt16 i = 0, nCount = rPoly.GetSize(); i < nCount; i++ )
-            {
-                if ( bPixelMap )
-                    aNewPoint = pOutDev->PixelToLogic( rPoly[ i ], aDispMap  );
-                else
-                    aNewPoint = pOutDev->LogicToLogic( rPoly[ i ], aGrfMap, aDispMap  );
-
-                rPoly[ i ] = Point( FRound( aNewPoint.X() * fScaleX ), FRound( aNewPoint.Y() * fScaleY ) );
-            }
-        }
-    }
-}
-
 // Loop through to super class, no virtual Methods to not become incompatible
 // due to IF changes
 
-void SvxContourDlg::SetExecState( sal_Bool bEnable )
-{
-    pSuperClass->SetExecState( bEnable );
-}
-
-void SvxContourDlg::SetGraphic( const Graphic& rGraphic )
-{
-    pSuperClass->SetGraphic( rGraphic );
-}
-
-void SvxContourDlg::SetGraphicLinked( sal_Bool bGraphicLinked )
-{
-    pSuperClass->SetGraphicLinked( bGraphicLinked );
-}
-
 const Graphic& SvxContourDlg::GetGraphic() const
 {
     return pSuperClass->GetGraphic();
@@ -263,21 +208,11 @@ sal_Bool SvxContourDlg::IsGraphicChanged() const
     return pSuperClass->IsGraphicChanged();
 }
 
-void SvxContourDlg::SetPolyPolygon( const PolyPolygon& rPolyPoly )
-{
-    pSuperClass->SetPolyPolygon( rPolyPoly );
-}
-
 PolyPolygon SvxContourDlg::GetPolyPolygon()
 {
     return pSuperClass->GetPolyPolygon( sal_True );
 }
 
-void SvxContourDlg::SetEditingObject( void* pObj )
-{
-    pSuperClass->SetEditingObject( pObj );
-}
-
 const void* SvxContourDlg::GetEditingObject() const
 {
     return pSuperClass->GetEditingObject();


More information about the Libreoffice-commits mailing list