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

INTEGRATION: CWS ab35 (1.50.8); FILE MERGED

Browse Source 
2007/05/29 23:15:13 ab 1.50.8.2: RESYNC: (1.50-1.51); FILE MERGED
2007/05/25 11:38:19 ab 1.50.8.1: #i77640# ManageToolbars method
This commit is contained in:
Jens-Heiner Rechtien
2007-06-26 15:51:47 +00:00
parent 626d3973e8
commit e1d8752586
1 changed files with 51 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
basctl/source/basicide/basides1.cxx
View File

@@ -4,9 +4,9 @@
*
* $RCSfile: basides1.cxx,v $
*
* $Revision: 1.51 $
* $Revision: 1.52 $
*
* last change: $Author: rt $ $Date: 2007-04-25 14:53:25 $
* last change: $Author: hr $ $Date: 2007-06-26 16:51:47 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -102,6 +102,7 @@
#ifndef _COM_SUN_STAR_FRAME_XDISPATCHPROVIDER_HPP_
#include <com/sun/star/frame/XDispatchProvider.hpp>
#endif
#include <com/sun/star/frame/XLayoutManager.hpp>
#include <algorithm>
@@ -1143,11 +1144,59 @@ void BasicIDEShell::SetCurWindow( IDEBaseWindow* pNewWin, BOOL bUpdateTabBar, BO
InvalidateBasicIDESlots();
EnableScrollbars( pCurWin ? TRUE : FALSE );
if ( m_pCurLocalizationMgr )
m_pCurLocalizationMgr->handleTranslationbar();
ManageToolbars();
// fade out (in) property browser in module (dialog) windows
UIFeatureChanged();
}
}
void BasicIDEShell::ManageToolbars()
{
static ::rtl::OUString aLayoutManagerName = ::rtl::OUString::createFromAscii( "LayoutManager" );
static ::rtl::OUString aMacroBarResName =
::rtl::OUString::createFromAscii( "private:resource/toolbar/macrobar" );
static ::rtl::OUString aDialogBarResName =
::rtl::OUString::createFromAscii( "private:resource/toolbar/dialogbar" );
static ::rtl::OUString aInsertControlsBarResName =
::rtl::OUString::createFromAscii( "private:resource/toolbar/insertcontrolsbar" );
(void)aInsertControlsBarResName;
if( !pCurWin )
return;
Reference< beans::XPropertySet > xFrameProps
( GetViewFrame()->GetFrame()->GetFrameInterface(), uno::UNO_QUERY );
if ( xFrameProps.is() )
{
Reference< ::com::sun::star::frame::XLayoutManager > xLayoutManager;
uno::Any a = xFrameProps->getPropertyValue( aLayoutManagerName );
a >>= xLayoutManager;
if ( xLayoutManager.is() )
{
xLayoutManager->lock();
if( pCurWin->IsA( TYPE( DialogWindow ) ) )
{
xLayoutManager->destroyElement( aMacroBarResName );
xLayoutManager->requestElement( aDialogBarResName );
xLayoutManager->requestElement( aInsertControlsBarResName );
}
else
{
xLayoutManager->destroyElement( aDialogBarResName );
xLayoutManager->destroyElement( aInsertControlsBarResName );
xLayoutManager->requestElement( aMacroBarResName );
}
xLayoutManager->unlock();
}
}
}
IDEBaseWindow* BasicIDEShell::FindApplicationWindow()
{
return FindWindow( ScriptDocument::getApplicationScriptDocument() );