[Libreoffice-commits] core.git: 2 commits - framework/source include/sfx2 sfx2/source

[Maxim Monastirsky]

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

New commits:
commit a4eba3762a01c1b686cf7de19b9391d56606e08d
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Wed May 4 01:07:23 2016 +0300

    tdf#82160 Reset mouse pointer if doc loading failed
    
    Change-Id: Ib05226345c4b83d9190839de5cc04068ce1879d8

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 c0ec243..1d6e0c1 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 9710846..1e0abece 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);
     }
commit cc679439593d4da7b7abf7b456b3feed6e68268b
Author: Maxim Monastirsky <momonasmon at gmail.com>
Date:   Wed May 4 00:32:14 2016 +0300

    LoadEnv::getTargetComponent() is supposed to return nothing
    
    ... if loading the document failed. Make sure that's the case
    also when the frame containing BackingComp was about to be
    recycled. Can be tested by trying to open password-protected
    odt, but canceling the password prompt.
    
    Change-Id: I733357b3a961fd88db010dd8eb89e01f0cad10fa

diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index 64c0a8f..a7fcf57 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -1402,6 +1402,7 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchRecycleTarget()
         {
             // bring it to front ...
             impl_makeFrameWindowVisible(aTasksAnalyzer.m_xBackingComponent->getContainerWindow(), true);
+            m_bReactivateControllerOnError = true;
             return aTasksAnalyzer.m_xBackingComponent;
         }
     }