include/svx/sdrpaintwindow.hxx | 6 +++++-
svx/source/svdraw/sdrpaintwindow.cxx | 3 ++-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 5ccaa8976fc9bffddacfbe804646f4dce099ddb0
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed May 15 21:40:13 2019 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Fri May 17 09:53:38 2019 +0200
allow overruling treatment as not-Window
Change-Id: I26f987b1c2993f50cb67d89a68daf4ec82641700
Reviewed-on: https://gerrit.libreoffice.org/72383
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/include/svx/sdrpaintwindow.hxx b/include/svx/sdrpaintwindow.hxx
index dda0185f9e9d..d8ca1db6b735 100644
--- a/include/svx/sdrpaintwindow.hxx
+++ b/include/svx/sdrpaintwindow.hxx
@@ -87,6 +87,8 @@ private:
// #i72889# flag if this is only a temporary target for repaint, default
is false
bool mbTemporaryTarget : 1;
+ bool mbOutputToWindow : 1;
+
// helpers
void impCreateOverlayManager();
@@ -112,7 +114,9 @@ public:
bool OutputToPrinter() const { return (OUTDEV_PRINTER ==
mpOutputDevice->GetOutDevType()); }
// Is OutDev a window?
- bool OutputToWindow() const { return (OUTDEV_WINDOW ==
mpOutputDevice->GetOutDevType()); }
+ bool OutputToWindow() const { return mbOutputToWindow; }
+
+ void SetOutputToWindow(bool bOutputToWindow) { mbOutputToWindow =
bOutputToWindow; }
// Is OutDev a VirtualDevice?
bool OutputIsVirtualDevice() const { return mpOutputDevice->IsVirtual(); }
diff --git a/svx/source/svdraw/sdrpaintwindow.cxx
b/svx/source/svdraw/sdrpaintwindow.cxx
index 91ca3860e7b0..666a81c92312 100644
--- a/svx/source/svdraw/sdrpaintwindow.cxx
+++ b/svx/source/svdraw/sdrpaintwindow.cxx
@@ -236,7 +236,8 @@ SdrPaintWindow::SdrPaintWindow(SdrPaintView& rNewPaintView,
OutputDevice& rOut,
: mpOutputDevice(&rOut),
mpWindow(pWindow),
mrPaintView(rNewPaintView),
- mbTemporaryTarget(false) // #i72889#
+ mbTemporaryTarget(false), // #i72889#
+ mbOutputToWindow(OUTDEV_WINDOW == mpOutputDevice->GetOutDevType())
{
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
