diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2012-07-24 17:29:20 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-07-24 18:07:05 +0200 |
| commit | e3f087d9ed753be702503220e1f97a3514d74d62 (patch) | |
| tree | f5db6f805367f1877b1a6b5d1f41ff21cf6812ae /reportdesign | |
| parent | ca9607ac8ed43d29125a0a2d22a938ec8f414841 (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
(cherry picked from commit c2617e960e1ff9c132af34b11f2e099f04fb46a3)
Signed-off-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'reportdesign')
| -rw-r--r-- | reportdesign/source/ui/report/propbrw.cxx | 4 |
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(); |