diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-06-27 17:32:16 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2017-07-06 15:34:29 +0200 |
| commit | 67ebaff71f6327d2a6bee4bfd9babef83dd9b2c3 (patch) | |
| tree | 74d23ad88fcc144fbfef2fb14a8b1fd2b3cd4a6b /sfx2 | |
| parent | ea9bb344441bffb9b2486d42d5ef50e9d41ae96a (diff) | |
tdf#108814 sfx2: fix crash in sidebar when XUpdateModel not implemented
com.sun.star.ui.XUpdateModel was added in 5.1 so pre-existing extensions
don't implement it.
(regression from 0635208edf1cdee4235ea87666a473ac81007555)
Change-Id: I6749a9cf2fc82b9cd90d85a682247104e369e167
(cherry picked from commit d109948f0dd4190d7aca1e0fa7e2706ef3f40a6c)
Reviewed-on: https://gerrit.libreoffice.org/39312
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit 622d2b4c250f6c3cc67f10887f3e3ec9db3f69a5)
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/sidebar/ResourceManager.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sfx2/source/sidebar/ResourceManager.cxx b/sfx2/source/sidebar/ResourceManager.cxx index 97742b73b5fc..f609c799d066 100644 --- a/sfx2/source/sidebar/ResourceManager.cxx +++ b/sfx2/source/sidebar/ResourceManager.cxx @@ -719,7 +719,10 @@ void ResourceManager::UpdateModel(const css::uno::Reference<css::frame::XModel>& for (SharedPanelContainer::const_iterator it = rContainer.begin(); it != rContainer.end(); ++it) { css::uno::Reference<css::ui::XUpdateModel> xPanel((*it)->GetPanelComponent(), css::uno::UNO_QUERY); - xPanel->updateModel(xModel); + if (xPanel.is()) // tdf#108814 interface is optional + { + xPanel->updateModel(xModel); + } } } } |