summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2017-03-06 17:49:30 +0100
committerStephan Bergmann <sbergman@redhat.com>2017-03-06 17:49:30 +0100
commit979e4b822cf03c8bde6885893c8c93f3a0e467f1 (patch)
tree729a67d0439d136e03710c5943a26c7f11f52d94
parent190eaa760336ec7c8f2d8d89785b22e770b3e8d6 (diff)
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.
-rw-r--r--configmgr/source/xcuparser.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/configmgr/source/xcuparser.cxx b/configmgr/source/xcuparser.cxx
index e999cf1e28b0..34e0eb5973c8 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());