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

Caolán McNamara caolanm at redhat.com
Tue Sep 19 12:01:15 UTC 2017


 sc/source/ui/docshell/docsh2.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2e9eff7380484f3317bf03464b564ae80adfb7d3
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Sep 19 12:58:44 2017 +0100

    ofz: survive missing config
    
    Change-Id: Ie09544ffefcd1789aef7a7f6193aaaddd3ad1896
    Reviewed-on: https://gerrit.libreoffice.org/42467
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sc/source/ui/docshell/docsh2.cxx b/sc/source/ui/docshell/docsh2.cxx
index ad5c3c8727cb..c8ea4ff7a9ff 100644
--- a/sc/source/ui/docshell/docsh2.cxx
+++ b/sc/source/ui/docshell/docsh2.cxx
@@ -122,7 +122,7 @@ void ScDocShell::InitItems()
         //  get settings from SvxAsianConfig
         SvxAsianConfig aAsian;
 
-        if (!aDocument.GetForbiddenCharacters())
+        if (!aDocument.GetForbiddenCharacters() && !utl::ConfigManager::IsAvoidConfig())
         {
             // set forbidden characters if necessary
             uno::Sequence<lang::Locale> aLocales = aAsian.GetStartEndCharLocales();


More information about the Libreoffice-commits mailing list