[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.1' - 3 commits - android/source sw/source

[AlexF]

 android/source/res/layout/activity_main.xml                     |    3 +--
 android/source/src/java/org/libreoffice/ui/GridItemAdapter.java |    4 +++-
 sw/source/uibase/inc/unodispatch.hxx                            |    7 ++++++-
 sw/source/uibase/uno/unodispatch.cxx                            |   10 ++++++++++
 4 files changed, 20 insertions(+), 4 deletions(-)

New commits:
commit f744eba17d13b4a680c9233d6af47d9f3897b26c
Author: AlexF <alexfongg at gmail.com>
Date:   Sun Dec 6 21:01:38 2015 +0800

    tdf#96127 Android: No UI visible
    
    Duplicate <include layout="@layout/toolbar"/> statement found.
    Problem could be caused by either
    1) a differing xml reading mechanism across android versions
    2) toolbar being accessed in a different way across android versions
    
    Duplicate element removed, and linearlayout shifted below first toolbar.
    
    Change-Id: I084b6498745bc72988f3a8eed12f7a72d261e267
    Reviewed-on: https://gerrit.libreoffice.org/20422
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: jan iversen <jani at documentfoundation.org>
    (cherry picked from commit 7115f0360a8758297c82752f9bf3543fc66015ea)

diff --git a/android/source/res/layout/activity_main.xml b/android/source/res/layout/activity_main.xml
index 881466d..625422e 100644
--- a/android/source/res/layout/activity_main.xml
+++ b/android/source/res/layout/activity_main.xml
@@ -20,10 +20,9 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:layout_above="@+id/toolbar_bottom"
+            android:layout_below="@+id/toolbar"
             android:orientation="vertical">
 
-            <include layout="@layout/toolbar"/>
-
             <RelativeLayout
                 android:id="@+id/gecko_layout"
                 android:layout_width="match_parent"
commit e377ed25dc0cb4c10f1addf1e926641a1ba3e266
Author: AlexF <alexfongg at gmail.com>
Date:   Thu Nov 12 09:49:36 2015 +0800

    tdf#88391 android document browser: draw and impress icon is the same
    
    Added missing code to set icon for draw in grid mode.
    
    Change-Id: I9ee356d5ab1a296a90e5ece11f5f4c50e7600f13
    Reviewed-on: https://gerrit.libreoffice.org/19921
    Reviewed-by: jan iversen <jani at documentfoundation.org>
    Tested-by: jan iversen <jani at documentfoundation.org>
    Tested-by: Jenkins <ci at libreoffice.org>
    (cherry picked from commit 715f21a000e59af064c0d2684fe815615bd4eec4)

diff --git a/android/source/src/java/org/libreoffice/ui/GridItemAdapter.java b/android/source/src/java/org/libreoffice/ui/GridItemAdapter.java
index d1e4278..b083de4 100644
--- a/android/source/src/java/org/libreoffice/ui/GridItemAdapter.java
+++ b/android/source/src/java/org/libreoffice/ui/GridItemAdapter.java
@@ -101,7 +101,9 @@ public class GridItemAdapter extends BaseAdapter {
                 case FileUtilities.CALC:
                     imageView.setImageResource(R.drawable.calc);
                     break;
-                case FileUtilities.DRAWING: // FIXME: only for now ...
+                case FileUtilities.DRAWING:
+                    imageView.setImageResource(R.drawable.draw);
+                    break;
                 case FileUtilities.IMPRESS:
                     imageView.setImageResource(R.drawable.impress);
                     break;
commit a85fcc171e2e4f5fdc00a3c1de60107912e38ee5
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Jun 6 12:34:08 2016 +0200

    SwXDispatchProviderInterceptor: implement frame::XInterceptorInfo
    
    With this, framework::InterceptionHelper can make a better decision what
    interceptor to call: it can avoid calling SwXDispatchProviderInterceptor
    when the sw code would just call the previous interceptor anyway.
    
    Change-Id: I92897f2c8baa264dc9ccbc11b63f415da30a910d
    Reviewed-on: https://gerrit.libreoffice.org/25961
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Jenkins <ci at libreoffice.org>
    (cherry picked from commit b0d819ac5667a07f629f2acb5d3c542fa76d348b)

diff --git a/sw/source/uibase/inc/unodispatch.hxx b/sw/source/uibase/inc/unodispatch.hxx
index b115f7e..f5408d7 100644
--- a/sw/source/uibase/inc/unodispatch.hxx
+++ b/sw/source/uibase/inc/unodispatch.hxx
@@ -24,6 +24,7 @@
 #include <com/sun/star/view/XSelectionChangeListener.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/frame/XDispatch.hpp>
+#include <com/sun/star/frame/XInterceptorInfo.hpp>
 #include <cppuhelper/implbase.hxx>
 #include <list>
 #include <vcl/svapp.hxx>
@@ -35,7 +36,8 @@ class SwXDispatchProviderInterceptor : public cppu::WeakImplHelper
 <
     css::frame::XDispatchProviderInterceptor,
     css::lang::XEventListener,
-    css::lang::XUnoTunnel
+    css::lang::XUnoTunnel,
+    css::frame::XInterceptorInfo
 >
 {
     class DispatchMutexLock_Impl
@@ -83,6 +85,9 @@ public:
     static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
     virtual sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException, std::exception) override;
 
+    // XInterceptorInfo
+    virtual css::uno::Sequence<OUString> SAL_CALL getInterceptedURLs() throw (css::uno::RuntimeException, std::exception) override;
+
     // view destroyed
     void    Invalidate();
 };
diff --git a/sw/source/uibase/uno/unodispatch.cxx b/sw/source/uibase/uno/unodispatch.cxx
index 534aea5..d273a8d 100644
--- a/sw/source/uibase/uno/unodispatch.cxx
+++ b/sw/source/uibase/uno/unodispatch.cxx
@@ -88,6 +88,16 @@ uno::Reference< frame::XDispatch > SwXDispatchProviderInterceptor::queryDispatch
     return xResult;
 }
 
+uno::Sequence<OUString> SAL_CALL SwXDispatchProviderInterceptor::getInterceptedURLs() throw (uno::RuntimeException, std::exception)
+{
+    uno::Sequence<OUString> aRet =
+    {
+         OUString(".uno:DataSourceBrowser/*")
+    };
+
+    return aRet;
+}
+
 uno::Sequence< uno::Reference< frame::XDispatch > > SwXDispatchProviderInterceptor::queryDispatches(
     const uno::Sequence< frame::DispatchDescriptor >& aDescripts ) throw(uno::RuntimeException, std::exception)
 {