diff options
author | José Guilherme Vanz <guilherme.sft@gmail.com> | 2012-11-10 02:41:41 -0200 |
---|---|---|
committer | Tor Lillqvist <tml@iki.fi> | 2012-11-12 12:02:40 +0000 |
commit | ea7a809700ea0ee6d830e493c57ff272364e344a (patch) | |
tree | 33687dffbf289310ee7e300408ccccca8624a976 /canvas | |
parent | 040e022d06ecadc36d3ef5c52178095a4d2c828a (diff) |
unusedcode.ease cleanup
This commit removes some unused code from unusedcode.easy
Change-Id: If3cad67a508cc85dbffd70d6344e1427bac0c775
Signed-off-by: José Guilherme Vanz <guilherme.sft@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/1021
Reviewed-by: Tor Lillqvist <tml@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
Diffstat (limited to 'canvas')
-rw-r--r-- | canvas/source/cairo/cairo_canvashelper.cxx | 10 | ||||
-rw-r--r-- | canvas/source/cairo/cairo_canvashelper.hxx | 5 | ||||
-rw-r--r-- | canvas/source/cairo/cairo_spritedevicehelper.cxx | 5 | ||||
-rw-r--r-- | canvas/source/cairo/cairo_spritedevicehelper.hxx | 1 | ||||
-rw-r--r-- | canvas/source/cairo/cairo_textlayout.cxx | 24 | ||||
-rw-r--r-- | canvas/source/cairo/cairo_textlayout.hxx | 1 |
6 files changed, 0 insertions, 46 deletions
diff --git a/canvas/source/cairo/cairo_canvashelper.cxx b/canvas/source/cairo/cairo_canvashelper.cxx index 8c0f03e1c5a1..f18d2dce0492 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 c16edf3639e5..3ae1de714463 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 caf867c338a5..465771736c17 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 7236400918ca..01672e79e6dc 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 317ea264751a..66b0f40823b4 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 da97aaf94440..e4ee9668ade6 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, |