mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS dba17 (1.53.4); FILE MERGED

Browse Source 
2004/09/30 14:48:11 fs 1.53.4.2: #ii34790# loadSubMenu->onLoadedMenu
2004/09/27 11:57:23 fs 1.53.4.1: #i33573# refined the pane window handling
This commit is contained in:
Pascal Junck
2004-10-22 11:03:46 +00:00
parent 53c5c2b815
commit b7029a48fc
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
dbaccess/source/ui/browser/genericcontroller.cxx
View File

@@ -2,9 +2,9 @@
*
* $RCSfile: genericcontroller.cxx,v $
*
* $Revision: 1.54 $
* $Revision: 1.55 $
*
* last change: $Author: rt $ $Date: 2004-10-22 09:04:44 $
* last change: $Author: pjunck $ $Date: 2004-10-22 12:03:46 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@@ -258,11 +258,7 @@ void SAL_CALL OGenericUnoController::initialize( const Sequence< Any >& aArgumen
throw Exception(::rtl::OUString::createFromAscii("Parent window is null"),*this);
}
if(xFrame.is() && Construct(pParentWin))
{
}
// remove the container window
::dbaui::notifySystemWindow(pParentWin,pParentWin,::comphelper::mem_fun(&TaskPaneList::RemoveWindow));
Construct( pParentWin );
break; // no more needed here
}
else
@@ -926,15 +922,19 @@ void OGenericUnoController::loadMenu(const Reference< XFrame >& _xFrame)
xLayoutManager->lock();
xLayoutManager->createElement( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:resource/menubar/menubar" )));
xLayoutManager->createElement( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/toolbar" )));
loadSubToolbar(xLayoutManager);
xLayoutManager->unlock();
xLayoutManager->doLayout();
}
onLoadedMenu( xLayoutManager );
}
// -----------------------------------------------------------------------------
void OGenericUnoController::loadSubToolbar(const Reference< drafts::com::sun::star::frame::XLayoutManager >& _xLayoutManager)
void OGenericUnoController::onLoadedMenu(const Reference< drafts::com::sun::star::frame::XLayoutManager >& _xLayoutManager)
{
// not interested in
}
// -----------------------------------------------------------------------------
void OGenericUnoController::closeTask()
{