[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - configmgr/source

[Tamás Zolnai]

 configmgr/source/xcuparser.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c44d7bbcb6c7048dec93e9784e1e8fc9d20db382
Author: Tamás Zolnai <tamas.zolnai at collabora.com>
Date:   Fri Mar 3 13:27:53 2017 +0100

    tdf#106283: Registry settings are not read properly on Windows
    
    In general, properties' type is read from scheme files (xcs)
    but scheme files can contain property groups without a type
    (extensible groups). In this case the xcd files defines the actual
    properties and their type.
    handleUnknownGroupProp() method is called when a property is
    not defined in the scheme file. Here we have the type information
    read from xcd file, so use it instead of setting it to any
    
    Change-Id: I4180d154ecf4130ecbb9c808cee6529124842790
    Reviewed-on: https://gerrit.libreoffice.org/34859
    Reviewed-by: Tamás Zolnai <tamas.zolnai at collabora.com>
    Tested-by: Tamás Zolnai <tamas.zolnai at collabora.com>
    (cherry picked from commit 8cfda7206139b3017346c435591c77c9741ba8ee)

diff --git a/configmgr/source/xcuparser.cxx b/configmgr/source/xcuparser.cxx
index 34e0eb5..e999cf1 100644
--- a/configmgr/source/xcuparser.cxx
+++ b/configmgr/source/xcuparser.cxx
@@ -636,7 +636,7 @@ void XcuParser::handleUnknownGroupProp(
             valueParser_.type_ = type;
             rtl::Reference< Node > prop(
                 new PropertyNode(
-                    valueParser_.getLayer(), TYPE_ANY, true, css::uno::Any(),
+                    valueParser_.getLayer(), type, true, css::uno::Any(),
                     true));
             if (finalized) {
                 prop->setFinalized(valueParser_.getLayer());