[Libreoffice-commits] core.git: vcl/inc vcl/Library_vclplug_kde5.mk vcl/qt5 vcl/unx
Jan-Marek Glogowski (via logerrit)
logerrit at kemper.freedesktop.org
Sat Jun 8 03:57:39 UTC 2019
vcl/Library_vclplug_kde5.mk | 1
vcl/inc/qt5/Qt5Graphics_Controls.hxx | 5 --
vcl/inc/qt5/Qt5SvpGraphics.hxx | 46 +++++++++++++++++-
vcl/qt5/Qt5Frame.cxx | 2
vcl/qt5/Qt5Instance.cxx | 5 +-
vcl/qt5/Qt5SvpGraphics.cxx | 65 +++++++++++++++++++++++++-
vcl/qt5/Qt5SvpVirtualDevice.hxx | 8 +--
vcl/unx/kde5/KDE5SalFrame.cxx | 3 -
vcl/unx/kde5/KDE5SalFrame.hxx | 6 --
vcl/unx/kde5/KDE5SalGraphics.cxx | 85 -----------------------------------
vcl/unx/kde5/KDE5SalGraphics.hxx | 84 ----------------------------------
vcl/unx/kde5/KDE5SalInstance.cxx | 17 -------
vcl/unx/kde5/KDE5SalInstance.hxx | 4 -
13 files changed, 117 insertions(+), 214 deletions(-)
New commits:
commit 3e82710d1e368a4c1a942270efa3ee6f4c936f67
Author: Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Fri Jun 7 22:20:53 2019 +0200
Commit: Jan-Marek Glogowski <glogow at fbihome.de>
CommitDate: Sat Jun 8 05:56:44 2019 +0200
KDE5 merge KDE5SalGraphics into Qt5SvpGraphics
Nothing KDE specific left in there, so just merge it.
Change-Id: I11712961f2abc5e11256a158300ec6b388f9ee44
Reviewed-on: https://gerrit.libreoffice.org/73680
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>
diff --git a/vcl/Library_vclplug_kde5.mk b/vcl/Library_vclplug_kde5.mk
index e60ea79c1f5e..d097845bd5ce 100644
--- a/vcl/Library_vclplug_kde5.mk
+++ b/vcl/Library_vclplug_kde5.mk
@@ -81,7 +81,6 @@ $(eval $(call gb_Library_add_libs,vclplug_kde5,\
$(eval $(call gb_Library_add_exception_objects,vclplug_kde5,\
vcl/unx/kde5/KDE5FilePicker2 \
vcl/unx/kde5/KDE5SalFrame \
- vcl/unx/kde5/KDE5SalGraphics \
vcl/unx/kde5/KDE5SalInstance \
))
diff --git a/vcl/inc/qt5/Qt5Graphics_Controls.hxx b/vcl/inc/qt5/Qt5Graphics_Controls.hxx
index c83d3ef458f1..f8b5c5a6759c 100644
--- a/vcl/inc/qt5/Qt5Graphics_Controls.hxx
+++ b/vcl/inc/qt5/Qt5Graphics_Controls.hxx
@@ -24,11 +24,10 @@
#include <memory>
+#include <QtGui/QImage>
#include <QtGui/QPainter>
#include <QtGui/QRegion>
-
-class QImage;
-class QPushButton;
+#include <QtWidgets/QPushButton>
// Native control support
class VCLPLUG_QT5_PUBLIC Qt5Graphics_Controls
diff --git a/vcl/inc/qt5/Qt5SvpGraphics.hxx b/vcl/inc/qt5/Qt5SvpGraphics.hxx
index e6a931b77f55..9dd8a53aeb54 100644
--- a/vcl/inc/qt5/Qt5SvpGraphics.hxx
+++ b/vcl/inc/qt5/Qt5SvpGraphics.hxx
@@ -22,14 +22,17 @@
#include <vclpluginapi.h>
#include <headless/svpgdi.hxx>
-class QWidget;
+#include "Qt5Graphics_Controls.hxx"
+
+class Qt5Frame;
class VCLPLUG_QT5_PUBLIC Qt5SvpGraphics : public SvpSalGraphics
{
- QWidget* m_pQWidget;
+ Qt5Graphics_Controls m_aControl;
+ Qt5Frame* const m_pFrame;
public:
- Qt5SvpGraphics(QWidget* pQWidget);
+ Qt5SvpGraphics(Qt5Frame* pFrame);
~Qt5SvpGraphics() override;
void updateQWidget() const;
@@ -41,6 +44,43 @@ public:
cairo::SurfaceSharedPtr CreateSurface(const OutputDevice& rRefDevice, int x, int y, int width,
int height) const override;
#endif // ENABLE_CAIRO_CANVAS
+
+ virtual bool IsNativeControlSupported(ControlType, ControlPart) override;
+
+ virtual bool hitTestNativeControl(ControlType, ControlPart, const tools::Rectangle&,
+ const Point&, bool&) override;
+
+ virtual bool drawNativeControl(ControlType, ControlPart, const tools::Rectangle&, ControlState,
+ const ImplControlValue&, const OUString&) override;
+
+ virtual bool getNativeControlRegion(ControlType, ControlPart, const tools::Rectangle&,
+ ControlState, const ImplControlValue&, const OUString&,
+ tools::Rectangle&, tools::Rectangle&) override;
+
+ virtual void GetResolution(sal_Int32& rDPIX, sal_Int32& rDPIY) override;
};
+inline bool Qt5SvpGraphics::IsNativeControlSupported(ControlType nType, ControlPart nPart)
+{
+ return Qt5Graphics_Controls::IsNativeControlSupported(nType, nPart);
+}
+
+inline bool Qt5SvpGraphics::hitTestNativeControl(ControlType nType, ControlPart nPart,
+ const tools::Rectangle& rControlRegion,
+ const Point& aPos, bool& rIsInside)
+{
+ return Qt5Graphics_Controls::hitTestNativeControl(nType, nPart, rControlRegion, aPos,
+ rIsInside);
+}
+
+inline bool Qt5SvpGraphics::getNativeControlRegion(
+ ControlType nType, ControlPart nPart, const tools::Rectangle& rControlRegion,
+ ControlState nState, const ImplControlValue& aValue, const OUString& aCaption,
+ tools::Rectangle& rNativeBoundingRegion, tools::Rectangle& rNativeContentRegion)
+{
+ return Qt5Graphics_Controls::getNativeControlRegion(nType, nPart, rControlRegion, nState,
+ aValue, aCaption, rNativeBoundingRegion,
+ rNativeContentRegion);
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index ed8af3f1542d..0520465c190e 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -257,7 +257,7 @@ SalGraphics* Qt5Frame::AcquireGraphics()
{
if (!m_pOurSvpGraphics.get() || m_bGraphicsInvalid)
{
- m_pOurSvpGraphics.reset(new Qt5SvpGraphics(m_pQWidget));
+ m_pOurSvpGraphics.reset(new Qt5SvpGraphics(this));
InitQt5SvpGraphics(m_pOurSvpGraphics.get());
m_bGraphicsInvalid = false;
}
diff --git a/vcl/qt5/Qt5Instance.cxx b/vcl/qt5/Qt5Instance.cxx
index 52eab795682e..bdfb0473c55b 100644
--- a/vcl/qt5/Qt5Instance.cxx
+++ b/vcl/qt5/Qt5Instance.cxx
@@ -31,6 +31,7 @@
#include <Qt5Menu.hxx>
#include <Qt5Object.hxx>
#include <Qt5OpenGLContext.hxx>
+#include "Qt5SvpVirtualDevice.hxx"
#include <Qt5System.hxx>
#include <Qt5Timer.hxx>
#include <Qt5VirtualDevice.hxx>
@@ -283,10 +284,10 @@ Qt5Instance::CreateVirtualDevice(SalGraphics* pGraphics, long& nDX, long& nDY, D
{
if (m_bUseCairo)
{
- SvpSalGraphics* pSvpSalGraphics = dynamic_cast<SvpSalGraphics*>(pGraphics);
+ SvpSalGraphics* pSvpSalGraphics = dynamic_cast<Qt5SvpGraphics*>(pGraphics);
assert(pSvpSalGraphics);
std::unique_ptr<SalVirtualDevice> pVD(
- new SvpSalVirtualDevice(eFormat, pSvpSalGraphics->getSurface()));
+ new Qt5SvpVirtualDevice(eFormat, pSvpSalGraphics->getSurface()));
pVD->SetSize(nDX, nDY);
return pVD;
}
diff --git a/vcl/qt5/Qt5SvpGraphics.cxx b/vcl/qt5/Qt5SvpGraphics.cxx
index f746381e6561..1e6ae94be070 100644
--- a/vcl/qt5/Qt5SvpGraphics.cxx
+++ b/vcl/qt5/Qt5SvpGraphics.cxx
@@ -9,17 +9,22 @@
#include <sal/config.h>
#include <sal/log.hxx>
+#include <salbmp.hxx>
#include <config_cairo_canvas.h>
+#include <Qt5Frame.hxx>
#include <Qt5SvpGraphics.hxx>
#include <Qt5SvpSurface.hxx>
+#include <Qt5Tools.hxx>
+#include <QtGui/QScreen>
+#include <QtGui/QWindow>
#include <QtWidgets/QWidget>
-Qt5SvpGraphics::Qt5SvpGraphics(QWidget* pQWidget)
+Qt5SvpGraphics::Qt5SvpGraphics(Qt5Frame* pFrame)
: SvpSalGraphics()
- , m_pQWidget(pQWidget)
+ , m_pFrame(pFrame)
{
}
@@ -27,8 +32,11 @@ Qt5SvpGraphics::~Qt5SvpGraphics() {}
void Qt5SvpGraphics::updateQWidget() const
{
- if (m_pQWidget)
- m_pQWidget->update(m_pQWidget->rect());
+ if (!m_pFrame)
+ return;
+ QWidget* pQWidget = m_pFrame->GetQWidget();
+ if (pQWidget)
+ pQWidget->update(pQWidget->rect());
}
#if ENABLE_CAIRO_CANVAS
@@ -49,4 +57,53 @@ cairo::SurfaceSharedPtr Qt5SvpGraphics::CreateSurface(const OutputDevice& /*rRef
#endif
+static void QImage2BitmapBuffer(QImage* pImg, BitmapBuffer* pBuf)
+{
+ if (pImg->width() != 0 && pImg->height() != 0)
+ {
+ pBuf->mnWidth = pImg->width();
+ pBuf->mnHeight = pImg->height();
+ pBuf->mnBitCount = getFormatBits(pImg->format());
+ pBuf->mpBits = pImg->bits();
+ pBuf->mnScanlineSize = pImg->bytesPerLine();
+ }
+}
+
+bool Qt5SvpGraphics::drawNativeControl(ControlType nType, ControlPart nPart,
+ const tools::Rectangle& rControlRegion, ControlState nState,
+ const ImplControlValue& aValue, const OUString& aCaption)
+{
+ bool bHandled
+ = m_aControl.drawNativeControl(nType, nPart, rControlRegion, nState, aValue, aCaption);
+ if (bHandled)
+ {
+ QImage* pImage = &m_aControl.getImage();
+ BitmapBuffer* pBuffer = new BitmapBuffer;
+ QImage2BitmapBuffer(pImage, pBuffer);
+ SalTwoRect aTR(0, 0, pImage->width(), pImage->height(), rControlRegion.getX(),
+ rControlRegion.getY(), rControlRegion.GetWidth(),
+ rControlRegion.GetHeight());
+ drawBitmap(aTR, pBuffer, CAIRO_OPERATOR_OVER);
+ }
+ return bHandled;
+}
+
+void Qt5SvpGraphics::GetResolution(sal_Int32& rDPIX, sal_Int32& rDPIY)
+{
+ char* pForceDpi;
+ if ((pForceDpi = getenv("SAL_FORCEDPI")))
+ {
+ OString sForceDPI(pForceDpi);
+ rDPIX = rDPIY = sForceDPI.toInt32();
+ return;
+ }
+
+ if (!m_pFrame || !m_pFrame->GetQWidget()->window()->windowHandle())
+ return;
+
+ QScreen* pScreen = m_pFrame->GetQWidget()->window()->windowHandle()->screen();
+ rDPIX = pScreen->logicalDotsPerInchX() * pScreen->devicePixelRatio() + 0.5;
+ rDPIY = pScreen->logicalDotsPerInchY() * pScreen->devicePixelRatio() + 0.5;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/kde5/KDE5SalVirtualDevice.hxx b/vcl/qt5/Qt5SvpVirtualDevice.hxx
similarity index 84%
rename from vcl/unx/kde5/KDE5SalVirtualDevice.hxx
rename to vcl/qt5/Qt5SvpVirtualDevice.hxx
index baa8a2e31aa8..75c446bafb33 100644
--- a/vcl/unx/kde5/KDE5SalVirtualDevice.hxx
+++ b/vcl/qt5/Qt5SvpVirtualDevice.hxx
@@ -20,17 +20,17 @@
#pragma once
#include <headless/svpvd.hxx>
-#include "KDE5SalGraphics.hxx"
+#include <qt5/Qt5SvpGraphics.hxx>
-class VCL_DLLPUBLIC KDE5SalVirtualDevice : public SvpSalVirtualDevice
+class VCL_DLLPUBLIC Qt5SvpVirtualDevice : public SvpSalVirtualDevice
{
public:
- KDE5SalVirtualDevice(DeviceFormat eFormat, cairo_surface_t* pRefSurface)
+ Qt5SvpVirtualDevice(DeviceFormat eFormat, cairo_surface_t* pRefSurface)
: SvpSalVirtualDevice(eFormat, pRefSurface)
{
}
- SalGraphics* AcquireGraphics() override { return AddGraphics(new KDE5SalGraphics(nullptr)); }
+ SalGraphics* AcquireGraphics() override { return AddGraphics(new Qt5SvpGraphics(nullptr)); }
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/kde5/KDE5SalFrame.cxx b/vcl/unx/kde5/KDE5SalFrame.cxx
index 06efc52ff535..9399da4783fe 100644
--- a/vcl/unx/kde5/KDE5SalFrame.cxx
+++ b/vcl/unx/kde5/KDE5SalFrame.cxx
@@ -31,7 +31,6 @@
#include <KSharedConfig>
#include "KDE5SalFrame.hxx"
-#include "KDE5SalGraphics.hxx"
#include <tools/color.hxx>
@@ -208,7 +207,7 @@ SalGraphics* KDE5SalFrame::AcquireGraphics()
if (!m_pKDE5Graphics.get())
{
- m_pKDE5Graphics.reset(new KDE5SalGraphics(this));
+ m_pKDE5Graphics.reset(new Qt5SvpGraphics(this));
Qt5Frame::InitQt5SvpGraphics(m_pKDE5Graphics.get());
}
diff --git a/vcl/unx/kde5/KDE5SalFrame.hxx b/vcl/unx/kde5/KDE5SalFrame.hxx
index 441039829846..96c634a20e7a 100644
--- a/vcl/unx/kde5/KDE5SalFrame.hxx
+++ b/vcl/unx/kde5/KDE5SalFrame.hxx
@@ -24,17 +24,15 @@
#undef Status
#include <qt5/Qt5Frame.hxx>
+#include <qt5/Qt5SvpGraphics.hxx>
#include <unx/screensaverinhibitor.hxx>
-#include "KDE5SalGraphics.hxx"
-
class QWidget;
-class KDE5SalGraphics;
class KDE5SalFrame : public Qt5Frame
{
private:
- std::unique_ptr<KDE5SalGraphics> m_pKDE5Graphics;
+ std::unique_ptr<Qt5SvpGraphics> m_pKDE5Graphics;
ScreenSaverInhibitor m_ScreenSaverInhibitor;
bool m_bGraphicsInUse;
diff --git a/vcl/unx/kde5/KDE5SalGraphics.cxx b/vcl/unx/kde5/KDE5SalGraphics.cxx
deleted file mode 100644
index 268f8331f7e7..000000000000
--- a/vcl/unx/kde5/KDE5SalGraphics.cxx
+++ /dev/null
@@ -1,85 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include "KDE5SalGraphics.hxx"
-
-#include <salbmp.hxx>
-
-#include <QtGui/QScreen>
-#include <QtGui/QWindow>
-
-#include <Qt5Tools.hxx>
-#include <Qt5Frame.hxx>
-
-static void QImage2BitmapBuffer(QImage* pImg, BitmapBuffer* pBuf)
-{
- if (pImg->width() != 0 && pImg->height() != 0)
- {
- pBuf->mnWidth = pImg->width();
- pBuf->mnHeight = pImg->height();
- pBuf->mnBitCount = getFormatBits(pImg->format());
- pBuf->mpBits = pImg->bits();
- pBuf->mnScanlineSize = pImg->bytesPerLine();
- }
-}
-
-KDE5SalGraphics::KDE5SalGraphics(Qt5Frame* pFrame)
- : Qt5SvpGraphics(pFrame ? pFrame->GetQWidget() : nullptr)
- , m_pFrame(pFrame)
-{
-}
-
-bool KDE5SalGraphics::drawNativeControl(ControlType nType, ControlPart nPart,
- const tools::Rectangle& rControlRegion, ControlState nState,
- const ImplControlValue& aValue, const OUString& aCaption)
-{
- bool bHandled
- = m_aControl.drawNativeControl(nType, nPart, rControlRegion, nState, aValue, aCaption);
- if (bHandled)
- {
- QImage* pImage = &m_aControl.getImage();
- BitmapBuffer* pBuffer = new BitmapBuffer;
- QImage2BitmapBuffer(pImage, pBuffer);
- SalTwoRect aTR(0, 0, pImage->width(), pImage->height(), rControlRegion.getX(),
- rControlRegion.getY(), rControlRegion.GetWidth(),
- rControlRegion.GetHeight());
- drawBitmap(aTR, pBuffer, CAIRO_OPERATOR_OVER);
- }
- return bHandled;
-}
-
-void KDE5SalGraphics::GetResolution(sal_Int32& rDPIX, sal_Int32& rDPIY)
-{
- char* pForceDpi;
- if ((pForceDpi = getenv("SAL_FORCEDPI")))
- {
- OString sForceDPI(pForceDpi);
- rDPIX = rDPIY = sForceDPI.toInt32();
- return;
- }
-
- if (!m_pFrame || !m_pFrame->GetQWidget()->window()->windowHandle())
- return;
-
- QScreen* pScreen = m_pFrame->GetQWidget()->window()->windowHandle()->screen();
- rDPIX = pScreen->logicalDotsPerInchX() * pScreen->devicePixelRatio() + 0.5;
- rDPIY = pScreen->logicalDotsPerInchY() * pScreen->devicePixelRatio() + 0.5;
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/kde5/KDE5SalGraphics.hxx b/vcl/unx/kde5/KDE5SalGraphics.hxx
deleted file mode 100644
index 1b12d890278c..000000000000
--- a/vcl/unx/kde5/KDE5SalGraphics.hxx
+++ /dev/null
@@ -1,84 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#pragma once
-
-#include <memory>
-
-#include <rtl/string.hxx>
-#include <headless/svpgdi.hxx>
-
-#include <Qt5Graphics_Controls.hxx>
-#include <Qt5SvpGraphics.hxx>
-
-#include <QtGui/QImage>
-#include <QtWidgets/QPushButton>
-
-class Qt5Frame;
-
-/**
- * Handles native graphics requests and performs the needed drawing operations.
- */
-class KDE5SalGraphics : public Qt5SvpGraphics
-{
-public:
- KDE5SalGraphics(Qt5Frame* pFrame);
- virtual bool IsNativeControlSupported(ControlType, ControlPart) override;
-
- virtual bool hitTestNativeControl(ControlType, ControlPart, const tools::Rectangle&,
- const Point&, bool&) override;
-
- virtual bool drawNativeControl(ControlType, ControlPart, const tools::Rectangle&, ControlState,
- const ImplControlValue&, const OUString&) override;
-
- virtual bool getNativeControlRegion(ControlType, ControlPart, const tools::Rectangle&,
- ControlState, const ImplControlValue&, const OUString&,
- tools::Rectangle&, tools::Rectangle&) override;
-
- virtual void GetResolution(sal_Int32& rDPIX, sal_Int32& rDPIY) override;
-
-private:
- Qt5Graphics_Controls m_aControl;
- Qt5Frame* m_pFrame;
-};
-
-inline bool KDE5SalGraphics::IsNativeControlSupported(ControlType nType, ControlPart nPart)
-{
- return Qt5Graphics_Controls::IsNativeControlSupported(nType, nPart);
-}
-
-inline bool KDE5SalGraphics::hitTestNativeControl(ControlType nType, ControlPart nPart,
- const tools::Rectangle& rControlRegion,
- const Point& aPos, bool& rIsInside)
-{
- return Qt5Graphics_Controls::hitTestNativeControl(nType, nPart, rControlRegion, aPos,
- rIsInside);
-}
-
-inline bool KDE5SalGraphics::getNativeControlRegion(
- ControlType nType, ControlPart nPart, const tools::Rectangle& rControlRegion,
- ControlState nState, const ImplControlValue& aValue, const OUString& aCaption,
- tools::Rectangle& rNativeBoundingRegion, tools::Rectangle& rNativeContentRegion)
-{
- return Qt5Graphics_Controls::getNativeControlRegion(nType, nPart, rControlRegion, nState,
- aValue, aCaption, rNativeBoundingRegion,
- rNativeContentRegion);
-}
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/unx/kde5/KDE5SalInstance.cxx b/vcl/unx/kde5/KDE5SalInstance.cxx
index e83d48007712..3a227fc7b2b6 100644
--- a/vcl/unx/kde5/KDE5SalInstance.cxx
+++ b/vcl/unx/kde5/KDE5SalInstance.cxx
@@ -30,7 +30,6 @@
#include "KDE5FilePicker.hxx"
#include "KDE5SalFrame.hxx"
#include "KDE5SalInstance.hxx"
-#include "KDE5SalVirtualDevice.hxx"
using namespace com::sun::star;
@@ -70,22 +69,6 @@ Qt5FilePicker* KDE5SalInstance::createPicker(QFileDialog::FileMode eMode)
return Qt5Instance::createPicker(eMode);
}
-std::unique_ptr<SalVirtualDevice> KDE5SalInstance::CreateVirtualDevice(SalGraphics* pGraphics,
- long& nDX, long& nDY,
- DeviceFormat eFormat,
- const SystemGraphicsData*)
-{
- std::unique_ptr<SalVirtualDevice> pVD;
- assert(pGraphics);
- RunInMainThread(std::function([&]() {
- KDE5SalGraphics* pKDE5Graphics = dynamic_cast<KDE5SalGraphics*>(pGraphics);
- assert(pKDE5Graphics);
- pVD.reset(new KDE5SalVirtualDevice(eFormat, pKDE5Graphics->getSurface()));
- pVD->SetSize(nDX, nDY);
- }));
- return pVD;
-}
-
extern "C" {
VCLPLUG_KDE5_PUBLIC SalInstance* create_SalInstance()
{
diff --git a/vcl/unx/kde5/KDE5SalInstance.hxx b/vcl/unx/kde5/KDE5SalInstance.hxx
index 6b9f8eb29806..53993a5ecc34 100644
--- a/vcl/unx/kde5/KDE5SalInstance.hxx
+++ b/vcl/unx/kde5/KDE5SalInstance.hxx
@@ -30,10 +30,6 @@ class KDE5SalInstance final : public Qt5Instance
public:
explicit KDE5SalInstance(std::unique_ptr<QApplication>& pQApp);
-
- std::unique_ptr<SalVirtualDevice>
- CreateVirtualDevice(SalGraphics*, long&, long&, DeviceFormat,
- const SystemGraphicsData* = nullptr) override;
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list