diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-09-19 12:16:11 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-09-19 13:41:54 +0200 |
| commit | c61a44cf44fd4d5355250c3dbed82b82f6f94c57 (patch) | |
| tree | 3b82875e2def79308398c3ba12455fd48374950b /sc | |
| parent | a34bb5d4325da8ee359acfa493bd8b2d0a9b0c8c (diff) | |
ofz: survive missing config
Change-Id: I9d05602b6e3af2bb54e1c82668090d71153b3c9d
Reviewed-on: https://gerrit.libreoffice.org/42463
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc')
| -rw-r--r-- | sc/source/ui/docshell/docsh2.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
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 ) ); |