diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-04-07 08:26:21 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-04-07 08:26:21 +0000 |
| commit | e698a016b19ab1760d2e7b0e9097ebf5fe07e859 (patch) | |
| tree | 5009ce8399ce2c2076f13b83bd82eac4c5c56072 /framework/source/services/backingcomp.cxx | |
| parent | acbadea195baba5725ebaf3cf9e7a9cf9e2af8e0 (diff) | |
#i87917# solve merge conflicts
Diffstat (limited to 'framework/source/services/backingcomp.cxx')
| -rw-r--r-- | framework/source/services/backingcomp.cxx | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/framework/source/services/backingcomp.cxx b/framework/source/services/backingcomp.cxx index 660e64afd9cb..eaa6b080cfb6 100644 --- a/framework/source/services/backingcomp.cxx +++ b/framework/source/services/backingcomp.cxx @@ -4,9 +4,9 @@ * * $RCSfile: backingcomp.cxx,v $ * - * $Revision: 1.24 $ + * $Revision: 1.25 $ * - * last change: $Author: kz $ $Date: 2008-04-04 15:20:44 $ + * last change: $Author: kz $ $Date: 2008-04-07 09:26:21 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -602,12 +602,8 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::f pParent->SetMenuBarMode(MENUBAR_MODE_NORMAL); } - // create a listener for automatic updates of the window background color - // It hold itself alive and listen for window disposing() so it can die automaticly - // if we release our component window. - new ColorListener(m_xWindow); - // create the menu bar for the backing component + css::uno::Reference< css::beans::XPropertySet > xPropSet(m_xFrame, css::uno::UNO_QUERY_THROW); css::uno::Reference< css::frame::XLayoutManager > xLayoutManager; xPropSet->getPropertyValue(FRAME_PROPNAME_LAYOUTMANAGER) >>= xLayoutManager; if (xLayoutManager.is()) |