summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2012-07-24 17:29:20 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2012-07-24 19:46:35 +0200
commit002f9b03c8ccf7ae0dcc346ca6b87454105e3379 (patch)
tree4029716283668b91512d906a0c0feda824c64b2d
parent01576a7d02cb205333e6a322d0cb5f77934981cb (diff)
fdo#52399: Do not needlessly set DefaultContext of global ServiceManager
...the new cppuhelper/source/defaultbootstrap.cxx now forbids this nonsense with a PropertyVetoException. It looks like the code in propbrw.cxx had always been confused about what to do exactly (using xOwnContext as delegate in the call to createComponentContext should just be enough) and the useless re-setting of the global ServiceManager's DefaultContext happened to work by accident. Change-Id: I80a87fe9b0948d9aa6dc9e2e63497097044a4959 Signed-off-by: Michael Stahl <mstahl@redhat.com> Signed-off-by: Lionel Elie Mamane <lionel@mamane.lu> Signed-off-by: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
-rw-r--r--reportdesign/source/ui/report/propbrw.cxx4
1 files changed, 0 insertions, 4 deletions
diff --git a/reportdesign/source/ui/report/propbrw.cxx b/reportdesign/source/ui/report/propbrw.cxx
index 45b4f1a46fc8..cb4bd1022d5c 100644
--- a/reportdesign/source/ui/report/propbrw.cxx
+++ b/reportdesign/source/ui/report/propbrw.cxx
@@ -173,7 +173,6 @@ PropBrw::PropBrw(const Reference< XMultiServiceFactory >& _xORB,Window* pParen
uno::Reference< uno::XInterface > xDefaultHelpProvider( inspection::DefaultHelpProvider::create( m_xInspectorContext, xInspectorUI ) );
}
}
- xFactoryProperties->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ) ) ,makeAny(xOwnContext));
}
catch (Exception&)
{
@@ -182,9 +181,6 @@ PropBrw::PropBrw(const Reference< XMultiServiceFactory >& _xORB,Window* pParen
{
::comphelper::disposeComponent(m_xBrowserController);
::comphelper::disposeComponent(m_xBrowserComponentWindow);
- Reference< XPropertySet > xFactoryProperties( m_xORB, UNO_QUERY_THROW );
- if ( xOwnContext.is() )
- xFactoryProperties->setPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ) ) ,makeAny(xOwnContext));
}
catch(Exception&) { }
m_xBrowserController.clear();