diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-09-15 17:23:20 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-09-15 21:56:53 +0200 |
| commit | e20fe337d76f3a81b1acead279b63bb9beea03eb (patch) | |
| tree | 4f311aa4ab1b112d054fe90602b626bf742db65c /vcl/source | |
| parent | 15966e0721af1d16243a032ec2832a66a069de93 (diff) | |
some defaults for when config is unavailable
Change-Id: I0fd7cedbf9957707d56f99b5801dacf3a8868f02
Reviewed-on: https://gerrit.libreoffice.org/42337
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 'vcl/source')
| -rw-r--r-- | vcl/source/window/settings.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vcl/source/window/settings.cxx b/vcl/source/window/settings.cxx index 759f1ff12da1..bb18f957a72a 100644 --- a/vcl/source/window/settings.cxx +++ b/vcl/source/window/settings.cxx @@ -26,6 +26,7 @@ #include <vcl/settings.hxx> #include <unotools/fontcfg.hxx> +#include <unotools/configmgr.hxx> #include <unotools/confignode.hxx> #include <comphelper/processfactory.hxx> @@ -236,7 +237,7 @@ void Window::ImplUpdateGlobalSettings( AllSettings& rSettings, bool bCallHdl ) // auto detect HC mode; if the system already set it to "yes" // (see above) then accept that - if( !rSettings.GetStyleSettings().GetHighContrastMode() ) + if (!rSettings.GetStyleSettings().GetHighContrastMode() && !utl::ConfigManager::IsAvoidConfig()) { bool bAutoHCMode = true; utl::OConfigurationNode aNode = utl::OConfigurationTreeRoot::tryCreateWithComponentContext( |