[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - desktop/source

[Henry Castro]

 desktop/source/lib/init.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 0df89c0fdaaff10272fb74b196ade0bcc9ea1ff6
Author: Henry Castro <hcastro at 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 <ci at libreoffice.org>
    Reviewed-by: Henry Castro <hcastro at collabora.com>
    Reviewed-on: https://gerrit.libreoffice.org/49712
    Reviewed-by: Aron Budea <aron.budea at collabora.com>
    Tested-by: Aron Budea <aron.budea at collabora.com>

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 2598da695e0a..eafdf21f88ce 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2819,11 +2819,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++)