diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-10-27 13:09:32 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2005-10-27 13:09:32 +0000 |
commit | 6d0b37a78ff041247184f8f915488cc002ba953b (patch) | |
tree | 75eb670e120479c97cc62d761849cb4c4f04152d /extensions/source/nsplugin | |
parent | 0978a449217f660f36d69642d25bf39346e6a674 (diff) |
INTEGRATION: CWS fwk24 (1.4.26); FILE MERGED
2005/10/12 09:18:02 cd 1.4.26.1: #i55566# Inform layout manager to not automatically show non-context sensitive toolbars
Diffstat (limited to 'extensions/source/nsplugin')
-rw-r--r-- | extensions/source/nsplugin/source/so_instance.cxx | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/extensions/source/nsplugin/source/so_instance.cxx b/extensions/source/nsplugin/source/so_instance.cxx index 4fdd572ffe09..e939583d901b 100644 --- a/extensions/source/nsplugin/source/so_instance.cxx +++ b/extensions/source/nsplugin/source/so_instance.cxx @@ -4,9 +4,9 @@ * * $RCSfile: so_instance.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2005-09-08 19:41:32 $ + * last change: $Author: hr $ $Date: 2005-10-27 14:09:32 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -358,6 +358,18 @@ int SoPluginInstance::LoadDocument(NSP_HWND hParent) // initialize frame m_xFrame->initialize( m_xUnoWin ); + try + { + // currently ignore errors in this code + uno::Reference< beans::XPropertySet > xFrameProps( m_xFrame, uno::UNO_QUERY_THROW ); + uno::Reference< beans::XPropertySet > xLMProps; + xFrameProps->getPropertyValue( ::rtl::OUString::createFromAscii("LayoutManager") ) >>= xLMProps; + if ( xLMProps.is() ) + xLMProps->setPropertyValue( ::rtl::OUString::createFromAscii("AutomaticToolbars"), uno::makeAny( (sal_Bool)sal_False ) ); + } + catch( uno::Exception& ) + {} + // get frames supplier Reference< frame::XFramesSupplier > m_xFramesSupplier( mxRemoteMSF->createInstance( ::rtl::OUString::createFromAscii("com.sun.star.frame.Desktop") ), |