[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - include/sfx2 sfx2/source

[Maxim Monastirsky]

 include/sfx2/recentdocsview.hxx            |    1 +
 sfx2/source/control/recentdocsview.cxx     |    3 +++
 sfx2/source/control/recentdocsviewitem.cxx |    1 +
 3 files changed, 5 insertions(+)

New commits:
commit 2a814ff97361a0f907fde2677e92401eb6881234
Author: Maxim Monastirsky <momonas...@gmail.com>
Date:   Wed May 4 01:07:23 2016 +0300

    tdf#82160 Reset mouse pointer if doc loading failed
    
    Change-Id: Ib05226345c4b83d9190839de5cc04068ce1879d8
    (cherry picked from commit a4eba3762a01c1b686cf7de19b9391d56606e08d)
    Reviewed-on: https://gerrit.libreoffice.org/24801
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Caolán McNamara <caol...@redhat.com>
    Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/include/sfx2/recentdocsview.hxx b/include/sfx2/recentdocsview.hxx
index 99934e4..af3ce1b 100644
--- a/include/sfx2/recentdocsview.hxx
+++ b/include/sfx2/recentdocsview.hxx
@@ -23,6 +23,7 @@ struct LoadRecentFile
     css::util::URL                                    aTargetURL;
     css::uno::Sequence< css::beans::PropertyValue >   aArgSeq;
     css::uno::Reference< css::frame::XDispatch >      xDispatch;
+    VclPtr< ThumbnailView >                           pView;
 };
 
 enum ApplicationType
diff --git a/sfx2/source/control/recentdocsview.cxx 
b/sfx2/source/control/recentdocsview.cxx
index e4f5932..74e3a7f 100644
--- a/sfx2/source/control/recentdocsview.cxx
+++ b/sfx2/source/control/recentdocsview.cxx
@@ -326,6 +326,9 @@ IMPL_STATIC_LINK_TYPED( RecentDocsView, ExecuteHdl_Impl, 
void*, p, void )
     {
     }
 
+    if ( !pLoadRecentFile->pView->IsDisposed() )
+        pLoadRecentFile->pView->SetPointer( PointerStyle::Arrow );
+
     delete pLoadRecentFile;
 }
 
diff --git a/sfx2/source/control/recentdocsviewitem.cxx 
b/sfx2/source/control/recentdocsviewitem.cxx
index ea5169f..b16b841 100644
--- a/sfx2/source/control/recentdocsviewitem.cxx
+++ b/sfx2/source/control/recentdocsviewitem.cxx
@@ -218,6 +218,7 @@ void RecentDocsViewItem::OpenDocument()
         pLoadRecentFile->xDispatch = xDispatch;
         pLoadRecentFile->aTargetURL = aTargetURL;
         pLoadRecentFile->aArgSeq = aArgsList;
+        pLoadRecentFile->pView.set(&mrParent);
 
         Application::PostUserEvent(LINK(nullptr, RecentDocsView, 
ExecuteHdl_Impl), pLoadRecentFile, true);
     }

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits