[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - vcl/unx

[Jan-Marek Glogowski (via logerrit)]

 vcl/unx/kde4/KDESalInstance.cxx |    7 +++++++
 vcl/unx/kde4/KDESalInstance.hxx |    3 +++
 2 files changed, 10 insertions(+)

New commits:
commit cd98258b659d98871787fa932698a290b20f56cf
Author:     Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Tue Jul 9 03:15:28 2019 +0200
Commit:     Katarina Behrens <Katarina.Behrens at cib.de>
CommitDate: Tue Jul 9 22:21:18 2019 +0200

    KDE4 create KDESalGraphics based X11VirtualDevice
    
    In the spirit of commit 5ee408eb4c9f ("tdf#125673 KDE5 implement
    a KDE5SalVirtualDevice"), this might help with KDE4 graphics
    problems, like the ones mentioned in tdf#126272.
    
    Change-Id: I50875b69e1c1494803f08746bfc3b99a57e36414
    Reviewed-on: https://gerrit.libreoffice.org/75281
    Tested-by: Jenkins
    Reviewed-by: Katarina Behrens <Katarina.Behrens at cib.de>

diff --git a/vcl/unx/kde4/KDESalInstance.cxx b/vcl/unx/kde4/KDESalInstance.cxx
index c11d62689b52..e487bb00362b 100644
--- a/vcl/unx/kde4/KDESalInstance.cxx
+++ b/vcl/unx/kde4/KDESalInstance.cxx
@@ -24,6 +24,7 @@
 
 #include "KDEXLib.hxx"
 #include "KDESalDisplay.hxx"
+#include "KDESalGraphics.hxx"
 
 #include <QtGui/QApplication>
 #include <QtCore/QThread>
@@ -63,4 +64,10 @@ bool KDESalInstance::IsMainThread() const
     return qApp->thread() == QThread::currentThread();
 }
 
+std::unique_ptr<SalVirtualDevice> KDESalInstance::CreateVirtualDevice(SalGraphics* pGraphics,
+        long &nDX, long &nDY, DeviceFormat eFormat, const SystemGraphicsData *pData)
+{
+    return CreateX11VirtualDevice(pGraphics, nDX, nDY, eFormat, pData, o3tl::make_unique<KDESalGraphics>());
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/kde4/KDESalInstance.hxx b/vcl/unx/kde4/KDESalInstance.hxx
index 87328a88406e..589b485299d3 100644
--- a/vcl/unx/kde4/KDESalInstance.hxx
+++ b/vcl/unx/kde4/KDESalInstance.hxx
@@ -40,6 +40,9 @@ public:
                               css::uno::XComponentContext >& ) override;
 
     virtual bool IsMainThread() const override;
+
+    std::unique_ptr<SalVirtualDevice> CreateVirtualDevice(SalGraphics* pGraphics,
+        long &nDX, long &nDY, DeviceFormat eFormat, const SystemGraphicsData *pData) override;
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */