From a8c16e7c42bc19579f56f9d0ec3d05d70a48481a Mon Sep 17 00:00:00 2001
From: Katarina Behrens <Katarina.Behrens@cib.de>
Date: Wed, 4 Oct 2017 20:45:28 +0200
Subject: kde5: get/setLib works again

Change-Id: Icc007d5c08f88ffdeb6e2d033615dccb140862ea
---
 vcl/unx/kde5/KDE5Data.hxx        | 2 ++
 vcl/unx/kde5/KDE5SalInstance.hxx | 5 +++++
 vcl/unx/kde5/main.cxx            | 2 +-
 3 files changed, 8 insertions(+), 1 deletion(-)

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;
     }
-- 
cgit