sc/source/ui/docshell/docsh2.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit c61a44cf44fd4d5355250c3dbed82b82f6f94c57
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Sep 19 12:16:11 2017 +0100
ofz: survive missing config
Change-Id: I9d05602b6e3af2bb54e1c82668090d71153b3c9d
Reviewed-on: https://gerrit.libreoffice.org/42463
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sc/source/ui/docshell/docsh2.cxx b/sc/source/ui/docshell/docsh2.cxx
index 2ae71b4f101d..ad5c3c8727cb 100644
--- a/sc/source/ui/docshell/docsh2.cxx
+++ b/sc/source/ui/docshell/docsh2.cxx
@@ -27,6 +27,7 @@
#include <orcus/orcus_import_ods.hpp>
#include <orcusfiltersimpl.hxx>
#include <config_folders.h>
+#include <unotools/configmgr.hxx>
#include "drwlayer.hxx"
#include "stlpool.hxx"
@@ -109,7 +110,7 @@ void ScDocShell::InitItems()
// Other modifications after creation of the DrawLayer
pDrawLayer->SetNotifyUndoActionHdl( LINK( pDocFunc, ScDocFunc,
NotifyDrawUndo ) );
}
- else
+ else if (!utl::ConfigManager::IsAvoidConfig())
{
// always use global color table instead of local copy
PutItem( SvxColorListItem( XColorList::GetStdColorList(),
SID_COLOR_TABLE ) );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
