diff options
| -rw-r--r-- | vcl/Library_vclplug_kde5.mk | 2 | ||||
| -rw-r--r-- | vcl/inc/qt5/Qt5Frame.hxx | 3 | ||||
| -rw-r--r-- | vcl/unx/kde5/KDE5SalFrame.cxx | 3 | ||||
| -rw-r--r-- | vcl/unx/kde5/KDE5SalFrame.hxx | 8 | ||||
| -rw-r--r-- | vcl/unx/kde5/KDE5SalInstance.cxx | 4 | ||||
| -rw-r--r-- | vcl/unx/kde5/KDE5SalInstance.hxx | 3 | ||||
| -rw-r--r-- | vcl/unx/kde5/main.cxx | 2 |
7 files changed, 16 insertions, 9 deletions
diff --git a/vcl/Library_vclplug_kde5.mk b/vcl/Library_vclplug_kde5.mk index d7481690c8e3..9480fca4ce44 100644 --- a/vcl/Library_vclplug_kde5.mk +++ b/vcl/Library_vclplug_kde5.mk @@ -24,6 +24,7 @@ $(eval $(call gb_Library_use_custom_headers,vclplug_kde5,vcl/unx/kde5)) $(eval $(call gb_Library_set_include,vclplug_kde5,\ $$(INCLUDE) \ -I$(SRCDIR)/vcl/inc \ + -I$(SRCDIR)/vcl/inc/qt5 \ )) $(eval $(call gb_Library_add_defs,vclplug_kde5,\ @@ -34,6 +35,7 @@ $(eval $(call gb_Library_use_sdk_api,vclplug_kde5)) $(eval $(call gb_Library_use_libraries,vclplug_kde5,\ vclplug_gen \ + vclplug_qt5 \ vcl \ tl \ utl \ diff --git a/vcl/inc/qt5/Qt5Frame.hxx b/vcl/inc/qt5/Qt5Frame.hxx index b5f31387b3e2..e2b9b96936e2 100644 --- a/vcl/inc/qt5/Qt5Frame.hxx +++ b/vcl/inc/qt5/Qt5Frame.hxx @@ -20,6 +20,7 @@ #pragma once #include <salframe.hxx> +#include <vclpluginapi.h> #include "Qt5Tools.hxx" @@ -33,7 +34,7 @@ class QPaintDevice; class QImage; class SvpSalGraphics; -class Qt5Frame : public SalFrame +class VCLPLUG_QT5_PUBLIC Qt5Frame : public SalFrame { friend class Qt5Widget; diff --git a/vcl/unx/kde5/KDE5SalFrame.cxx b/vcl/unx/kde5/KDE5SalFrame.cxx index ab1fc1f67763..b1ca9d6118bc 100644 --- a/vcl/unx/kde5/KDE5SalFrame.cxx +++ b/vcl/unx/kde5/KDE5SalFrame.cxx @@ -47,7 +47,8 @@ #include <boost/optional.hpp> -KDE5SalFrame::KDE5SalFrame( SalFrame* pParent, SalFrameStyleFlags nState ) +KDE5SalFrame::KDE5SalFrame( KDE5SalFrame* pParent, SalFrameStyleFlags nState, bool bUseCairo ) + :Qt5Frame( pParent, nState, bUseCairo ) { } diff --git a/vcl/unx/kde5/KDE5SalFrame.hxx b/vcl/unx/kde5/KDE5SalFrame.hxx index 7cc2a8e97662..485c909653f3 100644 --- a/vcl/unx/kde5/KDE5SalFrame.hxx +++ b/vcl/unx/kde5/KDE5SalFrame.hxx @@ -22,8 +22,10 @@ #include <memory> #include <cairo.h> +#undef Status + #include <unx/saldisp.hxx> -#include <unx/salframe.h> +#include <qt5/Qt5Frame.hxx> #include <unx/salgdi.h> #include "KDE5SalGraphics.hxx" @@ -31,7 +33,7 @@ class QWidget; class KDE5SalGraphics; -class KDE5SalFrame : public SalFrame +class KDE5SalFrame : public Qt5Frame { private: static const int nMaxGraphics = 2; @@ -50,7 +52,7 @@ class KDE5SalFrame : public SalFrame QWidget* m_pWindow; public: - KDE5SalFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ); + KDE5SalFrame( KDE5SalFrame* pParent, SalFrameStyleFlags nStyle, bool bUseCairo ); virtual SalGraphics* AcquireGraphics() override; virtual void ReleaseGraphics( SalGraphics *pGraphics ) override; diff --git a/vcl/unx/kde5/KDE5SalInstance.cxx b/vcl/unx/kde5/KDE5SalInstance.cxx index 38629113295c..0f0a5daf8c74 100644 --- a/vcl/unx/kde5/KDE5SalInstance.cxx +++ b/vcl/unx/kde5/KDE5SalInstance.cxx @@ -41,9 +41,9 @@ KDE5SalInstance::KDE5SalInstance(SalYieldMutex* pMutex) pSVData->maAppData.mpToolkitName = new OUString("kde5"); } -SalFrame* KDE5SalInstance::CreateFrame( SalFrame *pParent, SalFrameStyleFlags nState ) +KDE5SalFrame* KDE5SalInstance::CreateFrame( KDE5SalFrame *pParent, SalFrameStyleFlags nState ) { - return new KDE5SalFrame( pParent, nState ); + return new KDE5SalFrame( pParent, nState, true ); } uno::Reference< ui::dialogs::XFilePicker2 > KDE5SalInstance::createFilePicker( diff --git a/vcl/unx/kde5/KDE5SalInstance.hxx b/vcl/unx/kde5/KDE5SalInstance.hxx index 54f2798dc65e..c61a63a8e271 100644 --- a/vcl/unx/kde5/KDE5SalInstance.hxx +++ b/vcl/unx/kde5/KDE5SalInstance.hxx @@ -20,6 +20,7 @@ #pragma once #include <headless/svpinst.hxx> +#include "KDE5SalFrame.hxx" class SalYieldMutex; class SalFrame; @@ -33,7 +34,7 @@ protected: public: explicit KDE5SalInstance(SalYieldMutex* pMutex); - virtual SalFrame* CreateFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) override; + virtual KDE5SalFrame* CreateFrame( KDE5SalFrame* pParent, SalFrameStyleFlags nStyle ); virtual bool hasNativeFileSelection() const override { return true; } diff --git a/vcl/unx/kde5/main.cxx b/vcl/unx/kde5/main.cxx index 1c3a40bb55ea..ad9b8234eb1d 100644 --- a/vcl/unx/kde5/main.cxx +++ b/vcl/unx/kde5/main.cxx @@ -72,7 +72,7 @@ extern "C" { } #endif - KDE5SalInstance* pInstance = new KDE5SalInstance( new SvpSalYieldMutex() ); + KDE5SalInstance* pInstance = new KDE5SalInstance( new SalYieldMutex() ); SAL_INFO( "vcl.kde5", "created KDE5SalInstance " << &pInstance ); // initialize SalData |