summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaxim Monastirsky <momonasmon@gmail.com>2016-05-04 01:07:23 +0300
committerCaolán McNamara <caolanm@redhat.com>2016-05-10 08:46:47 +0000
commit2a814ff97361a0f907fde2677e92401eb6881234 (patch)
treee8984fa38dc6cf5c1e40502196f36ba859969a1d
parent97f46313d304e63e8efc9761ac1e490b186683c1 (diff)
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 <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r--include/sfx2/recentdocsview.hxx1
-rw-r--r--sfx2/source/control/recentdocsview.cxx3
-rw-r--r--sfx2/source/control/recentdocsviewitem.cxx1
3 files changed, 5 insertions, 0 deletions
diff --git a/include/sfx2/recentdocsview.hxx b/include/sfx2/recentdocsview.hxx
index 99934e40b528..af3ce1badb80 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 e4f59320ba33..74e3a7f26000 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 ea5169f1a959..b16b84194e4c 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);
}