From 0992e5111fcac424e3b0e944a077716428ab4f84 Mon Sep 17 00:00:00 2001 From: Julien Nabet Date: Mon, 30 Apr 2012 19:50:19 +0200 Subject: Some removing in cairocanvas Change-Id: Idd08fd733670f4410349a45de882710b19a31f67 --- 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 ----- 4 files changed, 22 deletions(-) (limited to 'canvas/source') diff --git a/canvas/source/null/null_canvasfont.cxx b/canvas/source/null/null_canvasfont.cxx index 8c5cb37e979d..838e9256e95a 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 8e3a0f3b44c1..0712e2bb3a40 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 40ac91ce00cd..75bcc3591f62 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 383e47c5ffcd..a3e8ad5073ed 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 */ -- cgit