mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS presfixes02 (1.4.2); FILE MERGED

Browse Source 
2005/03/14 16:03:06 thb 1.4.2.1: #i35136# #i36914# #i41113# #i44100# Merge from presfixes01 patches
This commit is contained in:
Rüdiger Timm
2005-03-30 06:35:43 +00:00
parent ef0dc56ab3
commit 7c5f2254c7
2 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
canvas/source/vcl/canvasbitmap.cxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: canvasbitmap.cxx,v $ * $RCSfile: canvasbitmap.cxx,v $
* *
* $Revision: 1.4 $ * $Revision: 1.5 $
* *
* last change: $Author: vg $ $Date: 2005-03-10 11:56:58 $ * last change: $Author: rt $ $Date: 2005-03-30 07:35:30 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -182,4 +182,16 @@ namespace vclcanvas
{ {
return maCanvasHelper.getBitmap(); return maCanvasHelper.getBitmap();
} }
bool CanvasBitmap::repaint( const GraphicObjectSharedPtr& rGrf,
const ::Point& rPt,
const ::Size& rSz,
const GraphicAttr& rAttr ) const
{
tools::LocalGuard aGuard;
mbSurfaceDirty = true;
return maCanvasHelper.repaint( rGrf, rPt, rSz, rAttr );
}
} }

14
canvas/source/vcl/canvasbitmap.hxx
View File

@@ -2,9 +2,9 @@
* *
* $RCSfile: canvasbitmap.hxx,v $ * $RCSfile: canvasbitmap.hxx,v $
* *
* $Revision: 1.4 $ * $Revision: 1.5 $
* *
* last change: $Author: vg $ $Date: 2005-03-10 11:57:12 $ * last change: $Author: rt $ $Date: 2005-03-30 07:35:43 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@@ -89,6 +89,7 @@
#include <canvasbitmaphelper.hxx> #include <canvasbitmaphelper.hxx>
#include "impltools.hxx" #include "impltools.hxx"
#include "repainttarget.hxx"
#define CANVASBITMAP_IMPLEMENTATION_NAME "VCLCanvas::CanvasBitmap" #define CANVASBITMAP_IMPLEMENTATION_NAME "VCLCanvas::CanvasBitmap"
@@ -102,7 +103,8 @@ namespace vclcanvas
::com::sun::star::lang::XServiceInfo > CanvasBitmapBase_Base; ::com::sun::star::lang::XServiceInfo > CanvasBitmapBase_Base;
typedef ::canvas::internal::BitmapCanvasBase< CanvasBitmapBase_Base, CanvasBitmapHelper, tools::LocalGuard > CanvasBitmap_Base; typedef ::canvas::internal::BitmapCanvasBase< CanvasBitmapBase_Base, CanvasBitmapHelper, tools::LocalGuard > CanvasBitmap_Base;
class CanvasBitmap : public CanvasBitmap_Base class CanvasBitmap : public CanvasBitmap_Base,
public RepaintTarget
{ {
public: public:
/** Must be called with locked Solar mutex /** Must be called with locked Solar mutex
@@ -132,6 +134,12 @@ namespace vclcanvas
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);
// RepaintTarget interface
virtual bool repaint( const GraphicObjectSharedPtr& rGrf,
const ::Point& rPt,
const ::Size& rSz,
const GraphicAttr& rAttr ) const;
BitmapEx getBitmap() const; BitmapEx getBitmap() const;
protected: protected: