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

[Stephan Bergmann]

 sw/source/uibase/config/modcfg.cxx |   11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

New commits:
commit 2a7be4a49ca52fc10975fa9fff8befcfdc50e59a
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Feb 8 10:11:55 2018 +0100

    The special value of CaptionOrderNumberingFirst for hu is already set
    
    ...in the configuration data, cf. 552bebc85d907748dcd72b7978a00a3eee7c4f34
    "/org...Writer/Insert/Caption/CaptionOrderNumberingFirst should be localized",
    so there should be no need to handle a nil value specially for hu here.  (Any
    tests run during the build that don't use the configuration data will now use
    false instead of true for hu, but that's apparently not a problem for any of the
    `make check` tests, at least.)
    
    (Ideally, this property would always have been non-nillable anyway, or should at
    least have been included in the mass non-nillability change of
    e8bb827571f540ac4af2247cb11239bb96876669 "Fixed cppheader.xsl nillable
    treatment."  But now, just leave it as it is and live with that.)
    
    Change-Id: Iec6937dccc2f5ab3d98ca530a7172f27f13a860e
    Reviewed-on: https://gerrit.libreoffice.org/49474
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sw/source/uibase/config/modcfg.cxx b/sw/source/uibase/config/modcfg.cxx
index 97ec5719c6bc..a6cb03eb1ef5 100644
--- a/sw/source/uibase/config/modcfg.cxx
+++ b/sw/source/uibase/config/modcfg.cxx
@@ -32,13 +32,10 @@
 #include <itabenum.hxx>
 #include <modcfg.hxx>
 #include <fldupde.hxx>
-#include <unotools/configmgr.hxx>
-#include <unotools/syslocaleoptions.hxx>
 #include <caption.hxx>
 
 #include <unomid.h>
 
-using namespace utl;
 using namespace com::sun::star::uno;
 
 #define GLOB_NAME_CALC      0
@@ -1087,13 +1084,7 @@ void SwInsertConfig::Load()
         }
         else if (nProp == INS_PROP_CAP_CAPTIONORDERNUMBERINGFIRST)
         {
-            if (!utl::ConfigManager::IsFuzzing())
-            {
-                //#i61007#  initialize caption order, right now only HUNGARIAN seems to need a different order
-                SvtSysLocaleOptions aSysLocaleOptions;
-                const LanguageTag& rLang = aSysLocaleOptions.GetRealLanguageTag();
-                bCaptionOrderNumberingFirst = (rLang.getLanguage() == "hu");
-            }
+            bCaptionOrderNumberingFirst = false;
         }
 
     }