sc/source/ui/docshell/docsh2.cxx | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 7480094c3e71ff0538734eb360ab5f9ed2b66243
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Sep 19 13:54:29 2017 +0100
ofz: disable more config related code
Change-Id: I2458000c5d46a371cec0a17fb0bfd86a2444dc42
Reviewed-on: https://gerrit.libreoffice.org/42472
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
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();
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
