[Libreoffice-commits] .: canvas/source

[Libreoffice Gerrit user]

 canvas/source/cairo/cairo_canvashelper.cxx       |   10 ---------
 canvas/source/cairo/cairo_canvashelper.hxx       |    5 ----
 canvas/source/cairo/cairo_spritedevicehelper.cxx |    5 ----
 canvas/source/cairo/cairo_spritedevicehelper.hxx |    1 
 canvas/source/cairo/cairo_textlayout.cxx         |   24 -----------------------
 canvas/source/cairo/cairo_textlayout.hxx         |    1 
 6 files changed, 46 deletions(-)

New commits:
commit ea7a809700ea0ee6d830e493c57ff272364e344a
Author: José Guilherme Vanz <guilherme.sft at gmail.com>
Date:   Sat Nov 10 02:41:41 2012 -0200

    unusedcode.ease cleanup
    
    This commit removes some unused code from unusedcode.easy
    
    Change-Id: If3cad67a508cc85dbffd70d6344e1427bac0c775
    Signed-off-by: José Guilherme Vanz <guilherme.sft at gmail.com>
    Reviewed-on: https://gerrit.libreoffice.org/1021
    Reviewed-by: Tor Lillqvist <tml at iki.fi>
    Tested-by: Tor Lillqvist <tml at iki.fi>

diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx
index 8c0f03e..f18d2dc 100644
--- a/canvas/source/cairo/cairo_canvashelper.cxx
+++ b/canvas/source/cairo/cairo_canvashelper.cxx
@@ -1626,12 +1626,6 @@ namespace cairocanvas
         return uno::Sequence< sal_Int8 >();
     }
 
-    uno::Reference< rendering::XBitmapPalette > CanvasHelper::getPalette()
-    {
-        // TODO(F1): Palette bitmaps NYI
-        return uno::Reference< rendering::XBitmapPalette >();
-    }
-
     namespace
     {
         class CairoColorSpace : public cppu::WeakImplHelper1< com::sun::star::rendering::XIntegerBitmapColorSpace >
@@ -2020,10 +2014,6 @@ namespace cairocanvas
         return aLayout;
     }
 
-    void CanvasHelper::flush() const
-    {
-    }
-
     bool CanvasHelper::hasAlpha() const
     {
         return mbHaveAlpha;
diff --git a/canvas/source/cairo/cairo_canvashelper.hxx b/canvas/source/cairo/cairo_canvashelper.hxx
index c16edf3..3ae1de7 100644
--- a/canvas/source/cairo/cairo_canvashelper.hxx
+++ b/canvas/source/cairo/cairo_canvashelper.hxx
@@ -244,13 +244,8 @@ namespace cairocanvas
             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/canvas/source/cairo/cairo_spritedevicehelper.cxx b/canvas/source/cairo/cairo_spritedevicehelper.cxx
index caf867c..4657717 100644
--- a/canvas/source/cairo/cairo_spritedevicehelper.cxx
+++ b/canvas/source/cairo/cairo_spritedevicehelper.cxx
@@ -144,11 +144,6 @@ namespace cairocanvas
         setSize( ::basegfx::B2ISize(rBounds.Width, rBounds.Height) );
     }
 
-    SurfaceSharedPtr SpriteDeviceHelper::getSurface()
-    {
-        return mpBufferSurface;
-    }
-
     SurfaceSharedPtr SpriteDeviceHelper::getBufferSurface()
     {
         return mpBufferSurface;
diff --git a/canvas/source/cairo/cairo_spritedevicehelper.hxx b/canvas/source/cairo/cairo_spritedevicehelper.hxx
index 7236400..01672e7 100644
--- a/canvas/source/cairo/cairo_spritedevicehelper.hxx
+++ b/canvas/source/cairo/cairo_spritedevicehelper.hxx
@@ -64,7 +64,6 @@ namespace cairocanvas
         void notifySizeUpdate( const ::com::sun::star::awt::Rectangle& rBounds );
         void setSize( const ::basegfx::B2ISize& rSize );
 
-        ::cairo::SurfaceSharedPtr getSurface();
         ::cairo::SurfaceSharedPtr getBufferSurface();
         ::cairo::SurfaceSharedPtr getWindowSurface();
         ::cairo::SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, ::cairo::Content aContent = CAIRO_CONTENT_COLOR_ALPHA );
diff --git a/canvas/source/cairo/cairo_textlayout.cxx b/canvas/source/cairo/cairo_textlayout.cxx
index 317ea26..66b0f40 100644
--- a/canvas/source/cairo/cairo_textlayout.cxx
+++ b/canvas/source/cairo/cairo_textlayout.cxx
@@ -310,30 +310,6 @@ namespace cairocanvas
         cairo_set_font_size( pCairo, aFontRequest.CellSize );
     }
 
-  /** TextLayout:draw
-   *
-   * This function uses the "toy" api of the cairo library
-   *
-   **/
-    bool TextLayout::draw( Cairo* pCairo )
-    {
-        ::osl::MutexGuard aGuard( m_aMutex );
-
-        ::rtl::OUString aSubText = maText.Text.copy( maText.StartPosition, maText.Length );
-        ::rtl::OString aUTF8String = ::rtl::OUStringToOString( aSubText, RTL_TEXTENCODING_UTF8 );
-
-        cairo_save( pCairo );
-        /* move to 0, 0 as cairo_show_text advances current point and current point is not restored by cairo_restore.
-           before we were depending on unmodified current point which I believed was preserved by save/restore */
-        cairo_move_to( pCairo, 0, 0 );
-        useFont( pCairo );
-        cairo_show_text( pCairo, aUTF8String.getStr() );
-        cairo_restore( pCairo );
-
-        return true;
-    }
-
-
   /**
    * TextLayout::isCairoRenderable
    *
diff --git a/canvas/source/cairo/cairo_textlayout.hxx b/canvas/source/cairo/cairo_textlayout.hxx
index da97aaf..e4ee966 100644
--- a/canvas/source/cairo/cairo_textlayout.hxx
+++ b/canvas/source/cairo/cairo_textlayout.hxx
@@ -81,7 +81,6 @@ namespace cairocanvas
         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 );
 
-        bool draw( ::cairo::Cairo* pCairo );
         bool draw( SurfaceSharedPtr&                               pSurface,
                    OutputDevice&                                   rOutDev,
                    const Point&                                    rOutpos,