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

[Stephan Bergmann]

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

New commits:
commit 979e4b822cf03c8bde6885893c8c93f3a0e467f1
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Mon Mar 6 17:49:30 2017 +0100

    Revert "tdf#106283: Registry settings are not read properly on Windows"
    
    This reverts commit 8cfda7206139b3017346c435591c77c9741ba8ee.  The problem in
    that issue is that the configmgr/source/winreg.cxx code generates .xcu data
    where such an extension prop doesn't have an oor:type attribute, which is not
    allowed.  On the other hand, it is important that the PropertyNode representing
    such an extension prop has a staticType_ of TYPE_ANY, so that later layers or
    programmatic calls can store values of different type.

diff --git a/configmgr/source/xcuparser.cxx b/configmgr/source/xcuparser.cxx
index e999cf1..34e0eb5 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, true, css::uno::Any(),
+                    valueParser_.getLayer(), TYPE_ANY, true, css::uno::Any(),
                     true));
             if (finalized) {
                 prop->setFinalized(valueParser_.getLayer());