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

[Stephan Bergmann]

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

New commits:
commit f7dd958ad383c31fe380273d4a59e24fe6fe8caf
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Tue Sep 6 14:51:44 2016 +0200

    Work around loplugin:unnecessaryoverride
    
    ("public virtual function just calls public parent", in the gtk3 case)
    
    Change-Id: I0d5653f835fe0e62a905943fda7d79538dabfee3

diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx
index 1460557..cd38d12 100644
--- a/vcl/inc/unx/gtk/gtkinst.hxx
+++ b/vcl/inc/unx/gtk/gtkinst.hxx
@@ -205,7 +205,9 @@ 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;
+#if !GTK_CHECK_VERSION(3,0,0)
     virtual SalI18NImeStatus*   CreateI18NImeStatus() override;
+#endif
     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 6f82a22..0f62467 100644
--- a/vcl/unx/gtk/gtkinst.cxx
+++ b/vcl/unx/gtk/gtkinst.cxx
@@ -230,6 +230,7 @@ SalObject* GtkInstance::CreateObject( SalFrame* pParent, SystemWindowData* pWind
     return new GtkSalObject( static_cast<GtkSalFrame*>(pParent), bShow );
 }
 
+#if !GTK_CHECK_VERSION(3,0,0)
 SalI18NImeStatus* GtkInstance::CreateI18NImeStatus()
 {
     //we want the default SalInstance::CreateI18NImeStatus returns the no-op
@@ -237,6 +238,7 @@ SalI18NImeStatus* GtkInstance::CreateI18NImeStatus()
     //one would use otherwise
     return SalInstance::CreateI18NImeStatus();
 }
+#endif
 
 extern "C"
 {