diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-09-19 13:54:29 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-09-19 14:59:57 +0200 |
| commit | 7480094c3e71ff0538734eb360ab5f9ed2b66243 (patch) | |
| tree | 915d24838b2cf176dbfb4a9ed25aecc060d4c53c /sc/source/ui/docshell | |
| parent | 7e8c38b69742ff037a5e239bf0f02665f053ea53 (diff) | |
ofz: disable more config related code
Change-Id: I2458000c5d46a371cec0a17fb0bfd86a2444dc42
Reviewed-on: https://gerrit.libreoffice.org/42472
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sc/source/ui/docshell')
| -rw-r--r-- | sc/source/ui/docshell/docsh2.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sc/source/ui/docshell/docsh2.cxx b/sc/source/ui/docshell/docsh2.cxx index c8ea4ff7a9ff..1098f2c9025b 100644 --- a/sc/source/ui/docshell/docsh2.cxx +++ b/sc/source/ui/docshell/docsh2.cxx @@ -116,13 +116,13 @@ void ScDocShell::InitItems() PutItem( SvxColorListItem( XColorList::GetStdColorList(), SID_COLOR_TABLE ) ); } - if ( !aDocument.GetForbiddenCharacters() || - !aDocument.IsValidAsianCompression() || !aDocument.IsValidAsianKerning() ) + if (!utl::ConfigManager::IsAvoidConfig() && + (!aDocument.GetForbiddenCharacters() || !aDocument.IsValidAsianCompression() || !aDocument.IsValidAsianKerning())) { // get settings from SvxAsianConfig SvxAsianConfig aAsian; - if (!aDocument.GetForbiddenCharacters() && !utl::ConfigManager::IsAvoidConfig()) + if (!aDocument.GetForbiddenCharacters()) { // set forbidden characters if necessary uno::Sequence<lang::Locale> aLocales = aAsian.GetStartEndCharLocales(); |