diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2019-07-13 23:32:28 +1000 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2019-07-27 03:45:06 +0200 |
| commit | 08995b6a764c9e387c94f6ce5faba2145b5512f9 (patch) | |
| tree | fc7545e12a1e3a0cdd007eb3519eb928984a9d2d /include | |
| parent | f440c1d28b440135b162e0e22703110a23e18d92 (diff) | |
tdf#74702: remove GetOutDevType() from ImplAnimView
I have done a spot of refactoring - it turns out that the bits where we
save and reset the map mode during background saves should probably be
done in Window::SaveBackground(). As Window::SaveBackground() doesn't
need the animation size (maSzPix) I have rarrange the parameter order
so the Window function can ignore the parameter.
OutputDevice::SaveBackground() has been introduced as a virtual function
and now is overridden by Window for its own purposes - OutputDevice just
does a DrawOutDev(...) operation on the background.
Change-Id: Ifeffe9536c01d8e4737f6e39a4f3dd14ba418f4d
Reviewed-on: https://gerrit.libreoffice.org/76399
Reviewed-by: Michael Meeks <michael.meeks@collabora.com>
Tested-by: Michael Meeks <michael.meeks@collabora.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/outdev.hxx | 2 | ||||
| -rw-r--r-- | include/vcl/window.hxx | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index 0b92e735914f..b18150cefd38 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -624,6 +624,8 @@ public: void SetBackground(); void SetBackground( const Wallpaper& rBackground ); + virtual void SaveBackground(VirtualDevice& rSaveDevice, + const Point& rPos, const Size& rSize, const Size& rBackgroundSize) const; const Wallpaper& GetBackground() const { return maBackground; } bool IsBackground() const { return mbBackground; } diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx index 47c140e475ae..c1ac276f6327 100644 --- a/include/vcl/window.hxx +++ b/include/vcl/window.hxx @@ -1184,8 +1184,8 @@ public: ScrollBar* pHScrl, ScrollBar* pVScrl ); - void SaveBackground( const Point& rPos, const Size& rSize, - VirtualDevice& rSaveDevice ) const; + void SaveBackground(VirtualDevice& rSaveDevice, + const Point& rPos, const Size& rSize, const Size&) const override; virtual const SystemEnvData* GetSystemData() const; css::uno::Any GetSystemDataAny() const; |