diff options
| author | Jan-Marek Glogowski <glogow@fbihome.de> | 2019-05-24 15:36:39 +0000 |
|---|---|---|
| committer | Katarina Behrens <Katarina.Behrens@cib.de> | 2019-06-13 13:52:27 +0200 |
| commit | 7c54b11e98a7b8705eb2fc0ad41a6ec25f8e62e7 (patch) | |
| tree | ecc15ed3509dee336562e90450a96a10b88a8ea8 /vcl/unx | |
| parent | 87c418a98650ab6e4a62a0b4b72e02fee358dced (diff) | |
Qt5 implement SalSurface support for cairo
Current qt5+cairo uses the plain VCL canvas. This patch is just a
copy of Gtk3Surface (minus comments) with a different update call.
This way the Cairo path now uses the Cairo canvas instead.
It fixes at least tdf#122668 for me, but other Impress bugs might
be fixed this way too.
Reviewed-on: https://gerrit.libreoffice.org/72921
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Tested-by: Jenkins
Reviewed-by: Aleksei Nikiforov <darktemplar@basealt.ru>
(cherry picked from commit 86cab846c1a122dd4dd5f5c4ca5750a0fc397c6b)
[This also squashes the backport of commit cc237438f6d1c7ee3a391b51402aaa71cd347b6b
("qt5: Make it compile with '-Werror=shadow'") in to the same commit.]
Change-Id: Iba511c851001753328293c28e53eaa4acc4315d0
Reviewed-on: https://gerrit.libreoffice.org/73198
Reviewed-by: Michael Weghorn <m.weghorn@posteo.de>
Tested-by: Jenkins
Reviewed-by: Katarina Behrens <Katarina.Behrens@cib.de>
Diffstat (limited to 'vcl/unx')
| -rw-r--r-- | vcl/unx/kde5/KDE5SalFrame.cxx | 4 | ||||
| -rw-r--r-- | vcl/unx/kde5/KDE5SalGraphics.cxx | 2 | ||||
| -rw-r--r-- | vcl/unx/kde5/KDE5SalGraphics.hxx | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/vcl/unx/kde5/KDE5SalFrame.cxx b/vcl/unx/kde5/KDE5SalFrame.cxx index d3a13968237f..c195b641e119 100644 --- a/vcl/unx/kde5/KDE5SalFrame.cxx +++ b/vcl/unx/kde5/KDE5SalFrame.cxx @@ -30,8 +30,6 @@ #include <KConfigGroup> #include <KSharedConfig> -#undef Region - #include "KDE5SalFrame.hxx" #include "KDE5SalGraphics.hxx" @@ -211,7 +209,7 @@ SalGraphics* KDE5SalFrame::AcquireGraphics() if (!m_pKDE5Graphics.get()) { m_pKDE5Graphics.reset(new KDE5SalGraphics(this)); - Qt5Frame::InitSvpSalGraphics(m_pKDE5Graphics.get()); + Qt5Frame::InitQt5SvpGraphics(m_pKDE5Graphics.get()); } return m_pKDE5Graphics.get(); diff --git a/vcl/unx/kde5/KDE5SalGraphics.cxx b/vcl/unx/kde5/KDE5SalGraphics.cxx index 0b4b4283f0da..6e30b9599740 100644 --- a/vcl/unx/kde5/KDE5SalGraphics.cxx +++ b/vcl/unx/kde5/KDE5SalGraphics.cxx @@ -40,7 +40,7 @@ static void QImage2BitmapBuffer(QImage* pImg, BitmapBuffer* pBuf) } KDE5SalGraphics::KDE5SalGraphics(Qt5Frame* pFrame) - : SvpSalGraphics() + : Qt5SvpGraphics(pFrame->GetQWidget()) , m_pFrame(pFrame) { } diff --git a/vcl/unx/kde5/KDE5SalGraphics.hxx b/vcl/unx/kde5/KDE5SalGraphics.hxx index 109a0fa8ac29..1b12d890278c 100644 --- a/vcl/unx/kde5/KDE5SalGraphics.hxx +++ b/vcl/unx/kde5/KDE5SalGraphics.hxx @@ -25,6 +25,7 @@ #include <headless/svpgdi.hxx> #include <Qt5Graphics_Controls.hxx> +#include <Qt5SvpGraphics.hxx> #include <QtGui/QImage> #include <QtWidgets/QPushButton> @@ -34,7 +35,7 @@ class Qt5Frame; /** * Handles native graphics requests and performs the needed drawing operations. */ -class KDE5SalGraphics : public SvpSalGraphics +class KDE5SalGraphics : public Qt5SvpGraphics { public: KDE5SalGraphics(Qt5Frame* pFrame); |