[Libreoffice-commits] .: oox/inc oox/source unusedcode.easy

[Joseph Powers]

 oox/inc/oox/helper/graphichelper.hxx |    5 -----
 oox/source/helper/graphichelper.cxx  |   26 --------------------------
 unusedcode.easy                      |    3 ---
 3 files changed, 34 deletions(-)

New commits:
commit 180ffa7c8505ac03a2637a995f1b7f12c8ef2202
Author: Joseph Powers <jpowers27 at cox.net>
Date:   Sun Aug 21 22:17:03 2011 -0700

    unusedcode.easy: Cleanup GraphicHelper
    
    Note: getDeviceInfo() is used in oox/source/xls/unitconverter.cxx
    (UnitConverter::UnitConverter)

diff --git a/oox/inc/oox/helper/graphichelper.hxx b/oox/inc/oox/helper/graphichelper.hxx
index 2d5d711..f144cd1 100644
--- a/oox/inc/oox/helper/graphichelper.hxx
+++ b/oox/inc/oox/helper/graphichelper.hxx
@@ -105,11 +105,6 @@ public:
     /** Converts the passed size from 1/100 mm to screen pixels. */
     ::com::sun::star::awt::Size convertHmmToScreenPixel( const ::com::sun::star::awt::Size& rHmm ) const;
 
-    /** Converts the passed point from AppFont units to 1/100 mm. */
-    ::com::sun::star::awt::Point convertAppFontToHmm( const ::com::sun::star::awt::Point& rAppFont ) const;
-    /** Converts the passed point from AppFont units to 1/100 mm. */
-    ::com::sun::star::awt::Size convertAppFontToHmm( const ::com::sun::star::awt::Size& rAppFont ) const;
-
     /** Converts the passed point from 1/100 mm to AppFont units. */
     ::com::sun::star::awt::Point convertHmmToAppFont( const ::com::sun::star::awt::Point& rHmm ) const;
     /** Converts the passed size from 1/100 mm to AppFont units. */
diff --git a/oox/source/helper/graphichelper.cxx b/oox/source/helper/graphichelper.cxx
index aa7e6f0..e331ff9 100644
--- a/oox/source/helper/graphichelper.cxx
+++ b/oox/source/helper/graphichelper.cxx
@@ -216,32 +216,6 @@ Size GraphicHelper::convertHmmToScreenPixel( const Size& rHmm ) const
         static_cast< sal_Int32 >( convertHmmToScreenPixelY( rHmm.Height ) + 0.5 ) );
 }
 
-Point GraphicHelper::convertAppFontToHmm( const Point& rAppFont ) const
-{
-    if( mxUnitConversion.is() ) try
-    {
-        Point aPixel = mxUnitConversion->convertPointToPixel( rAppFont, ::com::sun::star::util::MeasureUnit::APPFONT );
-        return convertScreenPixelToHmm( aPixel );
-    }
-    catch( Exception& )
-    {
-    }
-    return Point( 0, 0 );
-}
-
-Size GraphicHelper::convertAppFontToHmm( const Size& rAppFont ) const
-{
-    if( mxUnitConversion.is() ) try
-    {
-        Size aPixel = mxUnitConversion->convertSizeToPixel( rAppFont, ::com::sun::star::util::MeasureUnit::APPFONT );
-        return convertScreenPixelToHmm( aPixel );
-    }
-    catch( Exception& )
-    {
-    }
-    return Size( 0, 0 );
-}
-
 Point GraphicHelper::convertHmmToAppFont( const Point& rHmm ) const
 {
     if( mxUnitConversion.is() ) try
diff --git a/unusedcode.easy b/unusedcode.easy
index 91b6e56..c27f463 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -245,9 +245,6 @@ Graphic::GetGraphicsCompressMode(SvStream&)
 Graphic::StartAnimation(OutputDevice*, Point const&, long, OutputDevice*)
 Graphic::WriteEmbedded(SvStream&)
 GraphicConverter::ImplConvert(unsigned long, void*, unsigned long, void**, unsigned long)
-GraphicHelper::convertAppFontToHmm(com::sun::star::awt::Point const&) const
-GraphicHelper::convertAppFontToHmm(com::sun::star::awt::Size const&) const
-GraphicHelper::getDeviceInfo() const
 GraphicReader::IsPreviewModeEnabled() const
 GroupTable::SkipCurrentGroup()
 HTMLControls::Insert(HTMLControl const*&, unsigned short&)