[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - sfx2/source
Michael Stahl
mstahl at redhat.com
Fri Jun 22 11:09:12 UTC 2018
sfx2/source/sidebar/ResourceManager.cxx | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit deb48a648e7becc1fb45a3b8357b1ceb119eb1a1
Author: Michael Stahl <mstahl at redhat.com>
Date: Tue Jun 27 17:32:16 2017 +0200
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
diff --git a/sfx2/source/sidebar/ResourceManager.cxx b/sfx2/source/sidebar/ResourceManager.cxx
index 8958f3b4d5cd..293288058c1d 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);
+ }
}
}
}
More information about the Libreoffice-commits
mailing list