diff options
author | Armin Le Grand <alg@apache.org> | 2012-05-03 10:59:32 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2013-03-11 07:50:32 +0000 |
commit | 3137258e346a9c16b2e61747fd926a1e7d358d02 (patch) | |
tree | 02a19c5f59b7f6e4528f35ad8cc0c8785598ce8b /editeng/inc | |
parent | 6874c25f98dcfe5116d96a1282c4231c3f2d623a (diff) |
Resolves: #i118905# Changed EditEngine to be able to paint to overlay directly
i.e. paint to VirtualDevice as well, not only to Window.
Removed the no longer needed switch between buffered and unbuffered overlay,
this removes the flickering white block.
(cherry picked from commit 5ab32faf2426fa60f975d0b544cfd671cdc7983b)
Conflicts:
editeng/inc/editeng/outliner.hxx
editeng/source/editeng/impedit.hxx
editeng/source/editeng/impedit3.cxx
editeng/source/editeng/impedit4.cxx
svx/inc/svx/sdr/overlay/overlaymanager.hxx
svx/inc/svx/sdr/overlay/overlaymanagerbuffered.hxx
svx/inc/svx/sdrpaintwindow.hxx
svx/inc/svx/svdpagv.hxx
svx/source/sdr/overlay/overlaymanager.cxx
svx/source/svdraw/sdrpaintwindow.cxx
svx/source/svdraw/svdedxv.cxx
svx/source/svdraw/svdpagv.cxx
Change-Id: Ibf4fcba77b120187fbae2454d136d2acd74be119
Diffstat (limited to 'editeng/inc')
-rw-r--r-- | editeng/inc/editeng/editview.hxx | 3 | ||||
-rw-r--r-- | editeng/inc/editeng/outliner.hxx | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/editeng/inc/editeng/editview.hxx b/editeng/inc/editeng/editview.hxx index aea70fd87fba..9a2fa855cfce 100644 --- a/editeng/inc/editeng/editview.hxx +++ b/editeng/inc/editeng/editview.hxx @@ -49,6 +49,7 @@ class SvKeyValueIterator; class SfxStyleSheet; class Font; class FontList; +class OutputDevice; #include <editeng/editdata.hxx> #include <com/sun/star/uno/Reference.h> @@ -88,7 +89,7 @@ public: void SetWindow( Window* pWin ); Window* GetWindow() const; - void Paint( const Rectangle& rRect ); + void Paint( const Rectangle& rRect, OutputDevice* pTargetDevice = 0 ); void Invalidate(); Pair Scroll( long nHorzScroll, long nVertScroll, sal_uInt8 nRangeCheck = RGCHK_NEG ); diff --git a/editeng/inc/editeng/outliner.hxx b/editeng/inc/editeng/outliner.hxx index 70531b0798df..1bb02965ccb2 100644 --- a/editeng/inc/editeng/outliner.hxx +++ b/editeng/inc/editeng/outliner.hxx @@ -240,7 +240,7 @@ public: void Scroll( long nHorzScroll, long nVertScroll ); - void Paint( const Rectangle& rRect ); + void Paint( const Rectangle& rRect, OutputDevice* pTargetDevice = 0 ); sal_Bool PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin = NULL ); sal_Bool MouseButtonDown( const MouseEvent& ); sal_Bool MouseButtonUp( const MouseEvent& ); |