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

Caolán McNamara caolanm at redhat.com
Fri Oct 27 15:59:45 UTC 2017


 svx/source/xoutdev/xtabcolr.cxx |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit 5922f9af749ff53e3bda2ff60a52116bf999a8a0
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Oct 27 16:43:29 2017 +0100

    survive without config
    
    Change-Id: I410e486acc206ae2981fd16a9e2780dbd4d27af5

diff --git a/svx/source/xoutdev/xtabcolr.cxx b/svx/source/xoutdev/xtabcolr.cxx
index 04376c564dff..0a148eb1b084 100644
--- a/svx/source/xoutdev/xtabcolr.cxx
+++ b/svx/source/xoutdev/xtabcolr.cxx
@@ -19,6 +19,7 @@
 
 #include <memory>
 #include <svx/XPropertyTable.hxx>
+#include <unotools/configmgr.hxx>
 #include <unotools/pathoptions.hxx>
 
 #include <svx/strings.hrc>
@@ -34,7 +35,9 @@ XColorListRef XColorList::CreateStdColorList()
 {
     return XPropertyList::AsColorList(
         XPropertyList::CreatePropertyList(
-            XPropertyListType::Color, SvtPathOptions().GetPalettePath(), ""));
+            XPropertyListType::Color, !utl::ConfigManager::IsAvoidConfig() ?
+                                          SvtPathOptions().GetPalettePath() :
+                                          "", ""));
 }
 
 XColorListRef XColorList::GetStdColorList()


More information about the Libreoffice-commits mailing list