diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-07-10 11:04:50 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-08-20 07:40:21 +0000 |
| commit | af6daec72b71b1d72a2555efdc5b2fb2e0ba2b90 (patch) | |
| tree | 1f16be1fd99edcdc3237ee3fa038ca0f1b88b4fd /svtools/source/config | |
| parent | 00754461516416f8ee59ec97632bff84f4d9b155 (diff) | |
more config skipping stuff and a tester tool
Change-Id: I5e93a4c84b3a0940239213766eb24d21fb5fd649
Reviewed-on: https://gerrit.libreoffice.org/17863
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svtools/source/config')
| -rw-r--r-- | svtools/source/config/colorcfg.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/svtools/source/config/colorcfg.cxx b/svtools/source/config/colorcfg.cxx index f4d7d35595d6..b02556293b1d 100644 --- a/svtools/source/config/colorcfg.cxx +++ b/svtools/source/config/colorcfg.cxx @@ -26,6 +26,7 @@ #include <comphelper/processfactory.hxx> #include <unotools/configitem.hxx> #include <unotools/confignode.hxx> +#include <unotools/configmgr.hxx> #include <unotools/configpaths.hxx> #include <com/sun/star/uno/Sequence.h> #include <svl/poolitem.hxx> @@ -199,7 +200,9 @@ ColorConfig_Impl::ColorConfig_Impl(bool bEditMode) : uno::Sequence < OUString > aNames(1); EnableNotification( aNames ); } - Load(OUString()); + + if (!utl::ConfigManager::IsAvoidConfig()) + Load(OUString()); ImplUpdateApplicationSettings(); |