[Libreoffice-commits] core.git: 2 commits - libreofficekit/source svx/source

[Miklos Vajna]

 libreofficekit/source/gtk/lokdocview.cxx |    1 +
 svx/source/inc/formcontroller.hxx        |    8 ++------
 2 files changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 20958c4e21a3b212c4a12a6c0a83cadadd99354a
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Apr 16 09:15:27 2015 +0200

    svx: can avoid comphelper/implbase_var.hxx in formcontroller
    
    Change-Id: I37a1d16f76cad6b8ff5727ecd09d718e15519de9

diff --git a/svx/source/inc/formcontroller.hxx b/svx/source/inc/formcontroller.hxx
index 1944a2e..0cd8dc6 100644
--- a/svx/source/inc/formcontroller.hxx
+++ b/svx/source/inc/formcontroller.hxx
@@ -77,11 +77,7 @@
 #include <vcl/timer.hxx>
 #include <vcl/idle.hxx>
 
-#ifndef INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_22
-#define INCLUDED_COMPHELPER_IMPLBASE_VAR_HXX_22
-#define COMPHELPER_IMPLBASE_INTERFACE_NUMBER 22
-#include <comphelper/implbase_var.hxx>
-#endif
+#include <cppuhelper/compbase.hxx>
 
 struct FmXTextComponentLess : public ::std::binary_function< ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent >, ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTextComponent> , bool>
 {
@@ -103,7 +99,7 @@ namespace svxform
     class ControlBorderManager;
     struct FmFieldInfo;
 
-    typedef ::comphelper::WeakComponentImplHelper22 <   ::com::sun::star::form::runtime::XFormController
+    typedef cppu::WeakComponentImplHelper           <   ::com::sun::star::form::runtime::XFormController
                                                     ,   ::com::sun::star::form::runtime::XFilterController
                                                     ,   ::com::sun::star::awt::XFocusListener
                                                     ,   ::com::sun::star::form::XLoadListener
commit 2831714ef1a2ede9f365e7f3ce5b6172a408aac5
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Thu Apr 16 09:14:59 2015 +0200

    CID#1294410 missing break
    
    Change-Id: Ibfb4a60bfdce303264ef1826f943672695cdf274

diff --git a/libreofficekit/source/gtk/lokdocview.cxx b/libreofficekit/source/gtk/lokdocview.cxx
index 2e6858c..c3b75a8 100644
--- a/libreofficekit/source/gtk/lokdocview.cxx
+++ b/libreofficekit/source/gtk/lokdocview.cxx
@@ -941,6 +941,7 @@ gboolean LOKDocView_Impl::callbackImpl(CallbackData* pCallback)
         gtk_show_uri(NULL, pCallback->m_aPayload.c_str(), GDK_CURRENT_TIME, &pError);
 #endif
     }
+    break;
     case LOK_CALLBACK_STATE_CHANGED:
     {
         commandChanged(pCallback->m_aPayload);