Kaydet (Commit) 74b0d908 authored tarafından Katarina Behrens's avatar Katarina Behrens Kaydeden (comit) Thorsten Behrens

kde5: convert KDE5SalInstance to SvpSalInstance

Change-Id: I72da846525128a689d92598b64e6a70062ff1c69
üst b899ba17
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
using namespace com::sun::star; using namespace com::sun::star;
KDE5SalInstance::KDE5SalInstance(SalYieldMutex* pMutex) KDE5SalInstance::KDE5SalInstance(SalYieldMutex* pMutex)
: X11SalInstance(pMutex) :SvpSalInstance( pMutex )
{ {
ImplSVData* pSVData = ImplGetSVData(); ImplSVData* pSVData = ImplGetSVData();
delete pSVData->maAppData.mpToolkitName; delete pSVData->maAppData.mpToolkitName;
...@@ -54,13 +54,13 @@ uno::Reference< ui::dialogs::XFilePicker2 > KDE5SalInstance::createFilePicker( ...@@ -54,13 +54,13 @@ uno::Reference< ui::dialogs::XFilePicker2 > KDE5SalInstance::createFilePicker(
return uno::Reference< ui::dialogs::XFilePicker2 >( return uno::Reference< ui::dialogs::XFilePicker2 >(
kdeXLib->createFilePicker(xMSF) ); kdeXLib->createFilePicker(xMSF) );
else*/ else*/
return X11SalInstance::createFilePicker( xMSF ); return SalInstance::createFilePicker( xMSF );
} }
SalX11Display* KDE5SalInstance::CreateDisplay() const /*SalX11Display* KDE5SalInstance::CreateDisplay() const
{ {
return new SalKDE5Display( QX11Info::display() ); return new SalKDE5Display( QX11Info::display() );
} }*/
bool KDE5SalInstance::IsMainThread() const bool KDE5SalInstance::IsMainThread() const
{ {
......
...@@ -19,15 +19,15 @@ ...@@ -19,15 +19,15 @@
#pragma once #pragma once
#include <unx/salinst.h> #include <headless/svpinst.hxx>
class SalYieldMutex; class SalYieldMutex;
class SalFrame; class SalFrame;
class KDE5SalInstance : public X11SalInstance class KDE5SalInstance : public SvpSalInstance
{ {
protected: protected:
virtual SalX11Display* CreateDisplay() const override; // virtual SalX11Display* CreateDisplay() const override;
public: public:
explicit KDE5SalInstance(SalYieldMutex* pMutex); explicit KDE5SalInstance(SalYieldMutex* pMutex);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment