[Libreoffice-commits] core.git: xmloff/source

[Caolán McNamara]

 xmloff/source/core/DocumentSettingsContext.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit b6be50c99c66d517d39dd2cfcb90542cfc13c8ef
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Sep 15 11:14:06 2017 +0100

    avoid config when unavailable
    
    Change-Id: I4effcfd82b977c8580fa7287ca4c30dda1af3250
    Reviewed-on: https://gerrit.libreoffice.org/42319
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/xmloff/source/core/DocumentSettingsContext.cxx b/xmloff/source/core/DocumentSettingsContext.cxx
index 070ecc1581f2..6d2627f77e6d 100644
--- a/xmloff/source/core/DocumentSettingsContext.cxx
+++ b/xmloff/source/core/DocumentSettingsContext.cxx
@@ -44,6 +44,7 @@
 #include <com/sun/star/document/NamedPropertyValues.hpp>
 #include <rtl/ustrbuf.hxx>
 #include <osl/diagnose.h>
+#include <unotools/configmgr.hxx>
 #include <xmlenums.hxx>
 
 using namespace com::sun::star;
@@ -380,7 +381,7 @@ void XMLDocumentSettingsContext::EndElement()
     uno::Sequence<beans::PropertyValue> aSeqConfigProps;
     if ( m_pData->aConfigProps >>= aSeqConfigProps )
     {
-        if (!officecfg::Office::Common::Save::Document::LoadPrinter::get())
+        if (!utl::ConfigManager::IsAvoidConfig() && !officecfg::Office::Common::Save::Document::LoadPrinter::get())
         {
             sal_Int32 i = aSeqConfigProps.getLength() - 1;
             int nFound = 0;