[Libreoffice-commits] .: canvas/source unusedcode.easy

[Julien Nabet]

 canvas/source/null/null_canvasfont.cxx   |    5 -----
 canvas/source/null/null_canvasfont.hxx   |    2 --
 canvas/source/null/null_canvashelper.cxx |   10 ----------
 canvas/source/null/null_canvashelper.hxx |    5 -----
 unusedcode.easy                          |    2 --
 5 files changed, 24 deletions(-)

New commits:
commit 0992e5111fcac424e3b0e944a077716428ab4f84
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Mon Apr 30 19:50:19 2012 +0200

    Some removing in cairocanvas
    
    Change-Id: Idd08fd733670f4410349a45de882710b19a31f67

diff --git a/canvas/source/null/null_canvasfont.cxx b/canvas/source/null/null_canvasfont.cxx
index 8c5cb37..838e925 100644
--- a/canvas/source/null/null_canvasfont.cxx
+++ b/canvas/source/null/null_canvasfont.cxx
@@ -112,11 +112,6 @@ namespace nullcanvas
 
         return aRet;
     }
-
-    const ::com::sun::star::geometry::Matrix2D& CanvasFont::getFontMatrix() const
-    {
-        return maFontMatrix;
-    }
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/canvas/source/null/null_canvasfont.hxx b/canvas/source/null/null_canvasfont.hxx
index 8e3a0f3..0712e2b 100644
--- a/canvas/source/null/null_canvasfont.hxx
+++ b/canvas/source/null/null_canvasfont.hxx
@@ -84,8 +84,6 @@ namespace nullcanvas
         virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException );
         virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames()  throw( ::com::sun::star::uno::RuntimeException );
 
-        const ::com::sun::star::geometry::Matrix2D& getFontMatrix() const;
-
     private:
         ::com::sun::star::rendering::FontRequest    maFontRequest;
         ::com::sun::star::geometry::Matrix2D        maFontMatrix;
diff --git a/canvas/source/null/null_canvashelper.cxx b/canvas/source/null/null_canvashelper.cxx
index 40ac91c..75bcc35 100644
--- a/canvas/source/null/null_canvashelper.cxx
+++ b/canvas/source/null/null_canvashelper.cxx
@@ -312,21 +312,11 @@ namespace nullcanvas
         return uno::Sequence< sal_Int8 >();
     }
 
-    uno::Reference< rendering::XBitmapPalette > CanvasHelper::getPalette()
-    {
-        // TODO(F1): Palette bitmaps NYI
-        return uno::Reference< rendering::XBitmapPalette >();
-    }
-
     rendering::IntegerBitmapLayout CanvasHelper::getMemoryLayout()
     {
         return ::canvas::tools::getStdMemoryLayout(getSize());
     }
 
-    void CanvasHelper::flush() const
-    {
-    }
-
     bool CanvasHelper::hasAlpha() const
     {
         return mbHaveAlpha;
diff --git a/canvas/source/null/null_canvashelper.hxx b/canvas/source/null/null_canvashelper.hxx
index 383e47c..a3e8ad5 100644
--- a/canvas/source/null/null_canvashelper.hxx
+++ b/canvas/source/null/null_canvashelper.hxx
@@ -240,13 +240,8 @@ namespace nullcanvas
             getPixel( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout,
                       const ::com::sun::star::geometry::IntegerPoint2D& pos );
 
-        ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapPalette > getPalette();
-
         ::com::sun::star::rendering::IntegerBitmapLayout getMemoryLayout();
 
-        // Flush drawing queue to screen
-        void                    flush() const;
-
         /** Called from XCanvas base classes, to notify that content
             is _about_ to change
         */
diff --git a/unusedcode.easy b/unusedcode.easy
index 17feed2..8377f93 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -652,8 +652,6 @@ binfilter::_ZSortFlys::Remove(binfilter::_ZSortFly const&, unsigned short)
 binfilter::_ZSortFlys_SAR::Replace(binfilter::_ZSortFly const&, unsigned short)
 binfilter::_ZSortFlys_SAR::Replace(binfilter::_ZSortFly const*, unsigned short, unsigned short)
 binfilter::_ZSortFlys_SAR::_ForEach(unsigned short, unsigned short, unsigned char (*)(binfilter::_ZSortFly const&, void*), void*)
-cairocanvas::CanvasHelper::flush() const
-cairocanvas::CanvasHelper::getPalette()
 cairocanvas::SpriteDeviceHelper::getSurface()
 cairocanvas::TextLayout::draw(_cairo*)
 canvas::PropertySetHelper::PropertySetHelper(std::__debug::vector<canvas::tools::ValueMap<canvas::PropertySetHelper::Callbacks>::MapEntry, std::allocator<canvas::tools::ValueMap<canvas::PropertySetHelper::Callbacks>::MapEntry> > const&)