diff options
| author | Katarina Behrens <Katarina.Behrens@cib.de> | 2017-10-04 20:45:28 +0200 |
|---|---|---|
| committer | Thorsten Behrens <Thorsten.Behrens@CIB.de> | 2017-10-25 03:23:18 +0200 |
| commit | a8c16e7c42bc19579f56f9d0ec3d05d70a48481a (patch) | |
| tree | b85b6d9785dc96081fd5b1ebc5f13ce71a9b93d1 | |
| parent | 187324751d27dcc96c5e2cc17ad9bc38bc7d8480 (diff) | |
kde5: get/setLib works again
Change-Id: Icc007d5c08f88ffdeb6e2d033615dccb140862ea
| -rw-r--r-- | vcl/unx/kde5/KDE5Data.hxx | 2 | ||||
| -rw-r--r-- | vcl/unx/kde5/KDE5SalInstance.hxx | 5 | ||||
| -rw-r--r-- | vcl/unx/kde5/main.cxx | 2 |
3 files changed, 8 insertions, 1 deletions
diff --git a/vcl/unx/kde5/KDE5Data.hxx b/vcl/unx/kde5/KDE5Data.hxx index 1106663d3910..6feedbe81734 100644 --- a/vcl/unx/kde5/KDE5Data.hxx +++ b/vcl/unx/kde5/KDE5Data.hxx @@ -35,6 +35,8 @@ class KDE5Data //: public X11SalData virtual void Init() ; virtual void initNWF() ; virtual void deInitNWF() ; + + KDE5XLib* GetLib() { return pXLib_; } private: KDE5XLib *pXLib_; QApplication* qMyApp; diff --git a/vcl/unx/kde5/KDE5SalInstance.hxx b/vcl/unx/kde5/KDE5SalInstance.hxx index e6169256020e..54f2798dc65e 100644 --- a/vcl/unx/kde5/KDE5SalInstance.hxx +++ b/vcl/unx/kde5/KDE5SalInstance.hxx @@ -23,6 +23,7 @@ class SalYieldMutex; class SalFrame; +class KDE5XLib; class KDE5SalInstance : public SvpSalInstance { @@ -41,6 +42,10 @@ public: css::uno::XComponentContext >& ) override; virtual bool IsMainThread() const override; + void SetLib( KDE5XLib *pXLib ) { m_pXLib = pXLib; } + +private: + KDE5XLib *m_pXLib; }; /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/unx/kde5/main.cxx b/vcl/unx/kde5/main.cxx index c26d2ab25c4f..654a9d654ee8 100644 --- a/vcl/unx/kde5/main.cxx +++ b/vcl/unx/kde5/main.cxx @@ -79,7 +79,7 @@ extern "C" { KDE5Data *salData = new KDE5Data( pInstance ); salData->Init(); salData->initNWF(); - //pInstance->SetLib(salData->GetLib()); + pInstance->SetLib(salData->GetLib()); return pInstance; } |