diff options
| author | Maxim Monastirsky <momonasmon@gmail.com> | 2016-05-04 00:32:14 +0300 |
|---|---|---|
| committer | Maxim Monastirsky <momonasmon@gmail.com> | 2016-05-04 01:11:59 +0300 |
| commit | cc679439593d4da7b7abf7b456b3feed6e68268b (patch) | |
| tree | 8831af8466f7b08cb097633271792ecaa2a567c5 | |
| parent | Enable Any functions on sal_uInt16 for LIBO_INTERNAL_ONLY (diff) | |
| download | core-cc679439593d4da7b7abf7b456b3feed6e68268b.tar.gz core-cc679439593d4da7b7abf7b456b3feed6e68268b.zip | |
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
| -rw-r--r-- | framework/source/loadenv/loadenv.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index 64c0a8ffff69..a7fcf579c609 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; } } |