[Libreoffice-commits] core.git: officecfg/registry

Stephan Bergmann sbergman at redhat.com
Fri Feb 9 07:52:48 UTC 2018


 officecfg/registry/schema/org/openoffice/Office/Writer.xcs |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 552bebc85d907748dcd72b7978a00a3eee7c4f34
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Feb 8 09:49:12 2018 +0100

    /org...Writer/Insert/Caption/CaptionOrderNumberingFirst should be localized
    
    ...as f6281ec4112479b5bdd750be351f4437ecf8a65a "#i110273# caption order changed
    for locale hu" added a special value for xml:lang="hu", but failed to take into
    account that the property is not localized.
    
    Until now, every installation that had the hu localization installed (but
    regardless of whether or not it was actually using it) would always have
    reported the special hu value (true), while any other installation would always
    have reported the default value (nil, mapped to false in the else branch at the
    end of SwInsertConfig::Load, sw/source/uibase/config/modcfg.cxx).
    
    Unless the value was overwritten in registrymodifications.xcu (by changing the
    Options dialog "LibreOffice Writer - AutoCaption - Caption Order" setting).  In
    which case the hu localization will now start to use its default again (true),
    while all other localizations will continue to use whatever value had been
    stored (without an xml:lang attribute) in registrymodifications.xcu.  This is a
    bit unfortunate for the hu-localization case.  It should probably be mentioned
    in the release notes.
    
    (Strictly speaking, changing a property from non-localized to localized, as is
    done here as well as in e.g. ffd8369b909c86653ef30593fddf67c9f5308583
    "rhbz#1541486: Fix localized'ness of ooSetupFactoryUIName props" is an
    incompatible change which 3rd-party code can observe through the
    css.configuration UNO API.  But chances are extremely low that this will have
    any impact, as access to any property's value is normally done in a way that
    makes it transparent whether or not the property is localizied.)
    
    Change-Id: Ia840e28e10d0fa388bff6eaf8aadf0e8e6b25a19
    Reviewed-on: https://gerrit.libreoffice.org/49414
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
index 1ec64444ec0e..b64a41f734ed 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Writer.xcs
@@ -2700,7 +2700,7 @@
         <info>
           <desc>Specifies the settings for inserting captions for various object types.</desc>
         </info>
-        <prop oor:name="CaptionOrderNumberingFirst" oor:type="xs:boolean">
+        <prop oor:name="CaptionOrderNumberingFirst" oor:type="xs:boolean" oor:localized="true">
           <info>
             <desc>Specifies the order of the captions. If true, the number appears in front of the category.</desc>
             <label>Caption order: Numbering first</label>


More information about the Libreoffice-commits mailing list