mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kde5: get/setLib works again

Browse Source 
Change-Id: Icc007d5c08f88ffdeb6e2d033615dccb140862ea
This commit is contained in:
Katarina Behrens
2017-10-04 20:45:28 +02:00
committed by Thorsten Behrens
parent 187324751d
commit a8c16e7c42
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
vcl/unx/kde5/KDE5Data.hxx
View File

@@ -35,6 +35,8 @@ class KDE5Data //: public X11SalData
virtual void Init() ; virtual void Init() ;
virtual void initNWF() ; virtual void initNWF() ;
virtual void deInitNWF() ; virtual void deInitNWF() ;
KDE5XLib* GetLib() { return pXLib_; }
private: private:
KDE5XLib *pXLib_; KDE5XLib *pXLib_;
QApplication* qMyApp; QApplication* qMyApp;

5
vcl/unx/kde5/KDE5SalInstance.hxx
View File

@@ -23,6 +23,7 @@
class SalYieldMutex; class SalYieldMutex;
class SalFrame; class SalFrame;
class KDE5XLib;
class KDE5SalInstance : public SvpSalInstance class KDE5SalInstance : public SvpSalInstance
{ {
@@ -41,6 +42,10 @@ public:
css::uno::XComponentContext >& ) override; css::uno::XComponentContext >& ) override;
virtual bool IsMainThread() const override; virtual bool IsMainThread() const override;
void SetLib( KDE5XLib *pXLib ) { m_pXLib = pXLib; }
private:
KDE5XLib *m_pXLib;
}; };
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

2
vcl/unx/kde5/main.cxx
View File

@@ -79,7 +79,7 @@ extern "C" {
KDE5Data *salData = new KDE5Data( pInstance ); KDE5Data *salData = new KDE5Data( pInstance );
salData->Init(); salData->Init();
salData->initNWF(); salData->initNWF();
//pInstance->SetLib(salData->GetLib()); pInstance->SetLib(salData->GetLib());
return pInstance; return pInstance;
} }