diff options
| author | Oliver Bolte <obo@openoffice.org> | 2006-10-13 08:43:05 +0000 |
|---|---|---|
| committer | Oliver Bolte <obo@openoffice.org> | 2006-10-13 08:43:05 +0000 |
| commit | 7a7706cc1b9a7b5c3788ce57905776279fecaf85 (patch) | |
| tree | a636e1ef917cb0a41bc96271cddd3cc8f090a1a0 /framework/source/services | |
| parent | d3e056c958b815d16230958b807338df73c0bcee (diff) | |
INTEGRATION: CWS fwk48 (1.94.50); FILE MERGED
2006/09/18 07:48:52 as 1.94.50.2: RESYNC: (1.94-1.95); FILE MERGED
2006/09/14 09:04:22 as 1.94.50.1: #140884# special menu bar closer uses dispatch(CloseWin) instead of sending statusEvent() directly
Diffstat (limited to 'framework/source/services')
| -rw-r--r-- | framework/source/services/frame.cxx | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index 0c8a5bce7c25..e7fb7443d635 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -4,9 +4,9 @@ * * $RCSfile: frame.cxx,v $ * - * $Revision: 1.97 $ + * $Revision: 1.98 $ * - * last change: $Author: obo $ $Date: 2006-10-12 10:41:49 $ + * last change: $Author: obo $ $Date: 2006-10-13 09:43:05 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -3153,13 +3153,7 @@ void Frame::impl_setCloser( /*IN*/ const css::uno::Reference< css::frame::XFrame css::uno::Reference< css::frame::XLayoutManager > xLayoutManager; xFrameProps->getPropertyValue(FRAME_PROPNAME_LAYOUTMANAGER) >>= xLayoutManager; css::uno::Reference< css::beans::XPropertySet > xLayoutProps(xLayoutManager, css::uno::UNO_QUERY_THROW); - css::uno::Reference< css::frame::XStatusListener > xCallback; - if (bState) - { - CloseDispatcher* pHandler = new CloseDispatcher(m_xFactory, xFrame); - xCallback = css::uno::Reference< css::frame::XStatusListener >( static_cast< ::cppu::OWeakObject* >(pHandler), css::uno::UNO_QUERY ); - } - xLayoutProps->setPropertyValue(LAYOUTMANAGER_PROPNAME_MENUBARCLOSER, css::uno::makeAny(xCallback)); + xLayoutProps->setPropertyValue(LAYOUTMANAGER_PROPNAME_MENUBARCLOSER, css::uno::makeAny(bState)); } catch(const css::uno::RuntimeException&) { throw; } |