diff options
| author | sb <sb@openoffice.org> | 2010-09-16 16:45:57 +0200 |
|---|---|---|
| committer | sb <sb@openoffice.org> | 2010-09-16 16:45:57 +0200 |
| commit | 56c2cd6dc5b2545336ee0777a81132d2fed2d973 (patch) | |
| tree | a337120bcd0eca7ba75802463946701f6c6c8c8b /configmgr/source | |
| parent | e96293e65a972a440aa5435bf22268a7ae4cef23 (diff) | |
| parent | b12644eb20d8153243943d22e5923e06afebd637 (diff) | |
sb126: merged in DEV300_m87
Diffstat (limited to 'configmgr/source')
| -rw-r--r-- | configmgr/source/rootaccess.cxx | 5 | ||||
| -rw-r--r-- | configmgr/source/xcuparser.cxx | 8 |
2 files changed, 11 insertions, 2 deletions
diff --git a/configmgr/source/rootaccess.cxx b/configmgr/source/rootaccess.cxx index 95a346d720c2..f5d0bb137202 100644 --- a/configmgr/source/rootaccess.cxx +++ b/configmgr/source/rootaccess.cxx @@ -96,11 +96,12 @@ void RootAccess::initBroadcaster( for (ChangesListeners::iterator i(changesListeners_.begin()); i != changesListeners_.end(); ++i) { + cppu::OWeakObject* pSource = static_cast< cppu::OWeakObject * >(this); + css::uno::Reference< css::uno::XInterface > xBase( pSource, css::uno::UNO_QUERY ); broadcaster->addChangesNotification( *i, css::util::ChangesEvent( - static_cast< cppu::OWeakObject * >(this), - css::uno::makeAny(pathRepresentation_), set)); + pSource, makeAny( xBase ), set)); } } } diff --git a/configmgr/source/xcuparser.cxx b/configmgr/source/xcuparser.cxx index eda478b18b70..cd1e6e55d085 100644 --- a/configmgr/source/xcuparser.cxx +++ b/configmgr/source/xcuparser.cxx @@ -196,6 +196,14 @@ bool XcuParser::startElement( { handleSetNode( reader, dynamic_cast< SetNode * >(state_.top().node.get())); + } else if (ns == XmlReader::NAMESPACE_NONE && + name.equals(RTL_CONSTASCII_STRINGPARAM("prop"))) + { + OSL_TRACE( + "configmgr bad set node <prop> member in %s", + rtl::OUStringToOString( + reader.getUrl(), RTL_TEXTENCODING_UTF8).getStr()); + state_.push(State(true)); // ignored } else { throw css::uno::RuntimeException( (rtl::OUString( |