[Libreoffice-commits] core.git: vcl/inc vcl/unx

[Caolán McNamara]

 vcl/inc/unx/gtk/gtkinst.hxx |    1 +
 vcl/unx/gtk/gtkinst.cxx     |    8 ++++++++
 2 files changed, 9 insertions(+)

New commits:
commit 2923907cbdc68b5723a00b92cbf6b6845c3c77f8
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Sep 5 20:27:45 2016 +0100

    GtkInstance should use default no-op I18NImeStatus
    
    gtk3 already did, gtk2 claimed to support it, but
    will use the built-in gtk support for this. So this
    leaves this as gen/kde4 only now.
    
    Change-Id: I640ffafc93bf45a4729ecd33f0f85f23fa67b4bf

diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx
index 02550fe..1460557 100644
--- a/vcl/inc/unx/gtk/gtkinst.hxx
+++ b/vcl/inc/unx/gtk/gtkinst.hxx
@@ -205,6 +205,7 @@ public:
     virtual SalFrame*           CreateFrame( SalFrame* pParent, SalFrameStyleFlags nStyle ) override;
     virtual SalFrame*           CreateChildFrame( SystemParentData* pParent, SalFrameStyleFlags nStyle ) override;
     virtual SalObject*          CreateObject( SalFrame* pParent, SystemWindowData* pWindowData, bool bShow ) override;
+    virtual SalI18NImeStatus*   CreateI18NImeStatus() override;
     virtual SalSystem*          CreateSalSystem() override;
     virtual SalInfoPrinter*     CreateInfoPrinter(SalPrinterQueueInfo* pPrinterQueueInfo, ImplJobSetup* pJobSetup) override;
     virtual SalPrinter*         CreatePrinter( SalInfoPrinter* pInfoPrinter ) override;
diff --git a/vcl/unx/gtk/gtkinst.cxx b/vcl/unx/gtk/gtkinst.cxx
index c131721..014ea7c 100644
--- a/vcl/unx/gtk/gtkinst.cxx
+++ b/vcl/unx/gtk/gtkinst.cxx
@@ -232,6 +232,14 @@ SalObject* GtkInstance::CreateObject( SalFrame* pParent, SystemWindowData* pWind
     return new GtkSalObject( static_cast<GtkSalFrame*>(pParent), bShow );
 }
 
+SalI18NImeStatus* GtkInstance::CreateI18NImeStatus()
+{
+    //we want the default SalInstance::CreateI18NImeStatus returns the no-op
+    //stub here, not the X11Instance::CreateI18NImeStatus which the gtk2
+    //one would use otherwise
+    return SalInstance::CreateI18NImeStatus();
+}
+
 extern "C"
 {
     typedef void*(* getDefaultFnc)();