diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-06-24 09:15:39 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-06-24 09:15:39 +0000 |
| commit | e6fa7691f3457bebfd15305c22056d981bf59fb8 (patch) | |
| tree | d7ac1344a13d25a4b3e04a26864e41349aad325d /canvas/inc/canvas/base | |
| parent | f3694fbf844de466b718a71e732eb1ca15871e04 (diff) | |
INTEGRATION: CWS canvas05 (1.2.112); FILE MERGED
2008/04/21 07:27:09 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/canvas/base')
| -rw-r--r-- | canvas/inc/canvas/base/integerbitmapbase.hxx | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/canvas/inc/canvas/base/integerbitmapbase.hxx b/canvas/inc/canvas/base/integerbitmapbase.hxx index d720b577a42a..afad1dc97eab 100644 --- a/canvas/inc/canvas/base/integerbitmapbase.hxx +++ b/canvas/inc/canvas/base/integerbitmapbase.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: integerbitmapbase.hxx,v $ - * $Revision: 1.3 $ + * $Revision: 1.4 $ * * This file is part of OpenOffice.org. * @@ -142,13 +142,6 @@ namespace canvas pos ); } - virtual ::com::sun::star::uno::Reference< ::com::sun::star::rendering::XBitmapPalette > SAL_CALL getPalette( ) throw (::com::sun::star::uno::RuntimeException) - { - typename BaseType::MutexType aGuard( BaseType::m_aMutex ); - - return BaseType::maCanvasHelper.getPalette(); - } - virtual ::com::sun::star::rendering::IntegerBitmapLayout SAL_CALL getMemoryLayout( ) throw (::com::sun::star::uno::RuntimeException) { typename BaseType::MutexType aGuard( BaseType::m_aMutex ); |