diff options
author | Maxim Monastirsky <momonasmon@gmail.com> | 2016-05-04 01:07:23 +0300 |
---|---|---|
committer | Maxim Monastirsky <momonasmon@gmail.com> | 2016-05-04 01:14:55 +0300 |
commit | a4eba3762a01c1b686cf7de19b9391d56606e08d (patch) | |
tree | a5842fb1ec7e38a3a05a638c4e5a3193e560afe3 | |
parent | cc679439593d4da7b7abf7b456b3feed6e68268b (diff) |
tdf#82160 Reset mouse pointer if doc loading failed
Change-Id: Ib05226345c4b83d9190839de5cc04068ce1879d8
-rw-r--r-- | include/sfx2/recentdocsview.hxx | 1 | ||||
-rw-r--r-- | sfx2/source/control/recentdocsview.cxx | 3 | ||||
-rw-r--r-- | sfx2/source/control/recentdocsviewitem.cxx | 1 |
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 c0ec243c184a..1d6e0c12b67b 100644 --- a/sfx2/source/control/recentdocsview.cxx +++ b/sfx2/source/control/recentdocsview.cxx @@ -327,6 +327,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 97108463c7e5..1e0abecedcea 100644 --- a/sfx2/source/control/recentdocsviewitem.cxx +++ b/sfx2/source/control/recentdocsviewitem.cxx @@ -221,6 +221,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); } |