desktop/source/lib/init.cxx | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 9763383ebb7e5b10ba9e7557dffa803a8d392c0d
Author: Henry Castro <hcas...@collabora.com>
Date: Tue Feb 13 20:54:05 2018 -0400
lok: check if an element exists in the container
Change-Id: I5987e90d92a2ebff654a993fb77e389bd036a8f8
Reviewed-on: https://gerrit.libreoffice.org/49693
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Henry Castro <hcas...@collabora.com>
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index f5952665d148..bc788d243b9e 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2850,11 +2850,12 @@ static char* getStyles(LibreOfficeKitDocument* pThis,
const char* pCommand)
OUString sName;
bool bIsPhysical;
boost::property_tree::ptree aChild;
- uno::Reference<beans::XPropertySet> xProperty;
boost::property_tree::ptree aChildren;
+ const OUString sPageStyles("PageStyles");
+ uno::Reference<beans::XPropertySet> xProperty;
uno::Reference<container::XNameContainer> xContainer;
- if (xStyleFamilies->getByName("PageStyles") >>= xContainer)
+ if (xStyleFamilies->hasByName(sPageStyles) &&
(xStyleFamilies->getByName(sPageStyles) >>= xContainer))
{
uno::Sequence<OUString> aSeqNames = xContainer->getElementNames();
for (sal_Int32 itName = 0; itName < aSeqNames.getLength();
itName++)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
