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

Caolán McNamara caolanm at redhat.com
Tue Jan 26 07:44:31 PST 2016


 vcl/inc/unx/gtk/gtkinst.hxx  |    1 +
 vcl/unx/gtk3/gtk3gtkinst.cxx |    2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 7345aaf69a9d88cde3deabb6818a00938d8ad392
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jan 26 15:43:40 2016 +0000

    wrong CreateDropTarget
    
    Change-Id: I7df8c17863f1e16f1658c061a324d6f1f0699833

diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx
index a2f8f78..a649f62 100644
--- a/vcl/inc/unx/gtk/gtkinst.hxx
+++ b/vcl/inc/unx/gtk/gtkinst.hxx
@@ -175,6 +175,7 @@ public:
 
 #if GTK_CHECK_VERSION(3,0,0)
     virtual css::uno::Reference< css::uno::XInterface > CreateClipboard( const css::uno::Sequence< css::uno::Any >& i_rArguments ) override;
+    virtual css::uno::Reference< css::uno::XInterface > CreateDropTarget() override;
 #endif
 
     virtual const cairo_font_options_t* GetCairoFontOptions() override;
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 566444e..5ab81ac 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -805,7 +805,7 @@ void GtkDropTarget::setDefaultActions(sal_Int8 nDefaultActions) throw(std::excep
     m_nDefaultActions = nDefaultActions;
 }
 
-Reference< XInterface > SalInstance::CreateDropTarget()
+Reference< XInterface > GtkInstance::CreateDropTarget()
 {
     return Reference< XInterface >( static_cast<cppu::OWeakObject *>(new GtkDropTarget()) );
 }


More information about the Libreoffice-commits mailing list