diff options
| author | Kurt Zenker <kz@openoffice.org> | 2008-03-05 16:23:04 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2008-03-05 16:23:04 +0000 |
| commit | 96d1ec500aa0192b7c69ab803a14686fa198a7fa (patch) | |
| tree | 48f269974052f21d32da205cdba7ae57c61fb97f /framework | |
| parent | fd92eff754d4d30663bf8364ab75abc5ef4c3283 (diff) | |
INTEGRATION: CWS aquavcl05_DEV300 (1.21.236); FILE MERGED
2008/02/18 13:41:43 pl 1.21.236.2: #i85963# no standardbar and statusbar in backing component
2008/02/14 21:37:17 pl 1.21.236.1: #i85963# implement StartCenter
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/services/backingcomp.cxx | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/framework/source/services/backingcomp.cxx b/framework/source/services/backingcomp.cxx index 077688d0e431..bca0ebcb2b41 100644 --- a/framework/source/services/backingcomp.cxx +++ b/framework/source/services/backingcomp.cxx @@ -4,9 +4,9 @@ * * $RCSfile: backingcomp.cxx,v $ * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * - * last change: $Author: obo $ $Date: 2006-09-16 14:07:58 $ + * last change: $Author: kz $ $Date: 2008-03-05 17:23:04 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -38,6 +38,8 @@ #include "services/backingcomp.hxx" +#include "backingwindow.hxx" + //_______________________________________________ // own includes @@ -644,10 +646,12 @@ void SAL_CALL BackingComp::attachFrame( /*IN*/ const css::uno::Reference< css::f { xLayoutManager->lock(); xLayoutManager->createElement( DECLARE_ASCII( "private:resource/menubar/menubar" )); + /* #i85963# new backing window comes withoud standard bar and statusbar xLayoutManager->createElement( DECLARE_ASCII( "private:resource/toolbar/standardbar" )); xLayoutManager->createElement( DECLARE_ASCII( "private:resource/statusbar/statusbar" )); xLayoutManager->showElement ( DECLARE_ASCII( "private:resource/toolbar/standardbar" )); xLayoutManager->showElement ( DECLARE_ASCII( "private:resource/statusbar/statusbar" )); + */ xLayoutManager->unlock(); } @@ -946,7 +950,7 @@ void SAL_CALL BackingComp::initialize( /*IN*/ const css::uno::Sequence< css::uno // create the component window Window* pParent = VCLUnoHelper::GetWindow(xParentWindow); - Window* pWindow = new Window(pParent, WB_BORDER); + Window* pWindow = new BackingWindow(pParent); m_xWindow = VCLUnoHelper::GetInterface(pWindow); if (!m_xWindow.is()) |