Kaydet (Commit) ea7a8097 authored tarafından José Guilherme Vanz's avatar José Guilherme Vanz Kaydeden (comit) Tor Lillqvist

unusedcode.ease cleanup

This commit removes some unused code from unusedcode.easy

Change-Id: If3cad67a508cc85dbffd70d6344e1427bac0c775
Signed-off-by: 's avatarJosé Guilherme Vanz <guilherme.sft@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/1021Reviewed-by: 's avatarTor Lillqvist <tml@iki.fi>
Tested-by: 's avatarTor Lillqvist <tml@iki.fi>
üst 040e022d
...@@ -1626,12 +1626,6 @@ namespace cairocanvas ...@@ -1626,12 +1626,6 @@ namespace cairocanvas
return uno::Sequence< sal_Int8 >(); return uno::Sequence< sal_Int8 >();
} }
uno::Reference< rendering::XBitmapPalette > CanvasHelper::getPalette()
{
// TODO(F1): Palette bitmaps NYI
return uno::Reference< rendering::XBitmapPalette >();
}
namespace namespace
{ {
class CairoColorSpace : public cppu::WeakImplHelper1< com::sun::star::rendering::XIntegerBitmapColorSpace > class CairoColorSpace : public cppu::WeakImplHelper1< com::sun::star::rendering::XIntegerBitmapColorSpace >
...@@ -2020,10 +2014,6 @@ namespace cairocanvas ...@@ -2020,10 +2014,6 @@ namespace cairocanvas
return aLayout; return aLayout;
} }
void CanvasHelper::flush() const
{
}
bool CanvasHelper::hasAlpha() const bool CanvasHelper::hasAlpha() const
{ {
return mbHaveAlpha; return mbHaveAlpha;
......
...@@ -244,13 +244,8 @@ namespace cairocanvas ...@@ -244,13 +244,8 @@ namespace cairocanvas
getPixel( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout, getPixel( ::com::sun::star::rendering::IntegerBitmapLayout& bitmapLayout,
const ::com::sun::star::geometry::IntegerPoint2D& pos ); const ::com::sun::star::geometry::IntegerPoint2D& pos );
::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapPalette > getPalette();
::com::sun::star::rendering::IntegerBitmapLayout getMemoryLayout(); ::com::sun::star::rendering::IntegerBitmapLayout getMemoryLayout();
// Flush drawing queue to screen
void flush() const;
/** Called from XCanvas base classes, to notify that content /** Called from XCanvas base classes, to notify that content
is _about_ to change is _about_ to change
*/ */
......
...@@ -144,11 +144,6 @@ namespace cairocanvas ...@@ -144,11 +144,6 @@ namespace cairocanvas
setSize( ::basegfx::B2ISize(rBounds.Width, rBounds.Height) ); setSize( ::basegfx::B2ISize(rBounds.Width, rBounds.Height) );
} }
SurfaceSharedPtr SpriteDeviceHelper::getSurface()
{
return mpBufferSurface;
}
SurfaceSharedPtr SpriteDeviceHelper::getBufferSurface() SurfaceSharedPtr SpriteDeviceHelper::getBufferSurface()
{ {
return mpBufferSurface; return mpBufferSurface;
......
...@@ -64,7 +64,6 @@ namespace cairocanvas ...@@ -64,7 +64,6 @@ namespace cairocanvas
void notifySizeUpdate( const ::com::sun::star::awt::Rectangle& rBounds ); void notifySizeUpdate( const ::com::sun::star::awt::Rectangle& rBounds );
void setSize( const ::basegfx::B2ISize& rSize ); void setSize( const ::basegfx::B2ISize& rSize );
::cairo::SurfaceSharedPtr getSurface();
::cairo::SurfaceSharedPtr getBufferSurface(); ::cairo::SurfaceSharedPtr getBufferSurface();
::cairo::SurfaceSharedPtr getWindowSurface(); ::cairo::SurfaceSharedPtr getWindowSurface();
::cairo::SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, ::cairo::Content aContent = CAIRO_CONTENT_COLOR_ALPHA ); ::cairo::SurfaceSharedPtr createSurface( const ::basegfx::B2ISize& rSize, ::cairo::Content aContent = CAIRO_CONTENT_COLOR_ALPHA );
......
...@@ -310,30 +310,6 @@ namespace cairocanvas ...@@ -310,30 +310,6 @@ namespace cairocanvas
cairo_set_font_size( pCairo, aFontRequest.CellSize ); 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 * TextLayout::isCairoRenderable
* *
......
...@@ -81,7 +81,6 @@ namespace cairocanvas ...@@ -81,7 +81,6 @@ namespace cairocanvas
virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw( ::com::sun::star::uno::RuntimeException ); 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 ); 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, bool draw( SurfaceSharedPtr& pSurface,
OutputDevice& rOutDev, OutputDevice& rOutDev,
const Point& rOutpos, const Point& rOutpos,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment