summaryrefslogtreecommitdiffstats
path: root/canvas/inc
diff options
context:
space:
mode:
authorKurt Zenker <kz@openoffice.org>2008-06-24 09:13:17 +0000
committerKurt Zenker <kz@openoffice.org>2008-06-24 09:13:17 +0000
commit279faf7bf415180cf5dd94a29a03306899cbab82 (patch)
tree3169ec7dd66050f586489ce217789d947cdc34ef /canvas/inc
parentINTEGRATION: CWS canvas05 (1.2.112); FILE MERGED (diff)
downloadcore-279faf7bf415180cf5dd94a29a03306899cbab82.tar.gz
core-279faf7bf415180cf5dd94a29a03306899cbab82.zip
INTEGRATION: CWS canvas05 (1.2.112); FILE MERGED
2008/04/21 07:27:03 thb 1.2.112.2: RESYNC: (1.2-1.3); FILE MERGED 2007/10/01 13:02:01 thb 1.2.112.1: #i78888# #i78925# #i79258# #i79437# Merge from CWS picom
Diffstat (limited to 'canvas/inc')
-rw-r--r--canvas/inc/canvas/base/bitmapcanvasbase.hxx9
1 files changed, 2 insertions, 7 deletions
diff --git a/canvas/inc/canvas/base/bitmapcanvasbase.hxx b/canvas/inc/canvas/base/bitmapcanvasbase.hxx
index 68b394f85c40..f8367f7174fb 100644
--- a/canvas/inc/canvas/base/bitmapcanvasbase.hxx
+++ b/canvas/inc/canvas/base/bitmapcanvasbase.hxx
@@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: bitmapcanvasbase.hxx,v $
- * $Revision: 1.3 $
+ * $Revision: 1.4 $
*
* This file is part of OpenOffice.org.
*
@@ -32,7 +32,7 @@
#define INCLUDED_CANVAS_BITMAPCANVASBASE_HXX
#include <canvas/base/canvasbase.hxx>
-
+#include <com/sun/star/rendering/XBitmapCanvas.hpp>
namespace canvas
{
@@ -123,11 +123,6 @@ namespace canvas
return BaseType::maCanvasHelper.hasAlpha();
}
- virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapCanvas > SAL_CALL queryBitmapCanvas( ) throw (::com::sun::star::uno::RuntimeException)
- {
- return this;
- }
-
virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmap > SAL_CALL getScaledBitmap( const ::com::sun::star::geometry::RealSize2D& newSize,
sal_Bool beFast ) throw (::com::sun::star::uno::RuntimeException)
{