Author: arielch
Date: Fri Jan 4 19:57:18 2013
New Revision: 1429068
URL: http://svn.apache.org/viewvc?rev=1429068&view=rev
Log:
i116455 - Make toolbar style settings persistent
Modified:
openoffice/trunk/main/framework/source/layoutmanager/toolbarlayoutmanager.cxx
Modified:
openoffice/trunk/main/framework/source/layoutmanager/toolbarlayoutmanager.cxx
URL:
http://svn.apache.org/viewvc/openoffice/trunk/main/framework/source/layoutmanager/toolbarlayoutmanager.cxx?rev=1429068&r1=1429067&r2=1429068&view=diff
==============================================================================
---
openoffice/trunk/main/framework/source/layoutmanager/toolbarlayoutmanager.cxx
(original)
+++
openoffice/trunk/main/framework/source/layoutmanager/toolbarlayoutmanager.cxx
Fri Jan 4 19:57:18 2013
@@ -1004,7 +1004,9 @@ void ToolbarLayoutManager::implts_create
catch ( uno::Exception& ) {}
}
- ::rtl::OUString aGenericAddonTitle =
implts_generateGenericAddonToolbarTitle( i+1 );
+ ::rtl::OUString aAddonUIName =
m_pAddonOptions->GetAddonsToolbarUIName( i );
+ ::rtl::OUString aAddonTitle = aAddonUIName.getLength() ?
+ aAddonUIName : implts_generateGenericAddonToolbarTitle(
i+1 );
if ( aElement.m_aName.getLength() > 0 )
{
@@ -1014,7 +1016,7 @@ void ToolbarLayoutManager::implts_create
aElement.m_xUIElement = xUIElement;
if ( aElement.m_aUIName.getLength() == 0 )
{
- aElement.m_aUIName = aGenericAddonTitle;
+ aElement.m_aUIName = aAddonTitle;
implts_writeWindowStateData( aElement );
}
}
@@ -1027,7 +1029,7 @@ void ToolbarLayoutManager::implts_create
implts_setElementData( aNewToolbar, xDockWindow );
if ( aNewToolbar.m_aUIName.getLength() == 0 )
{
- aNewToolbar.m_aUIName = aGenericAddonTitle;
+ aNewToolbar.m_aUIName = aAddonTitle;
implts_writeWindowStateData( aNewToolbar );
}
implts_insertToolbar( aNewToolbar );
@@ -1040,7 +1042,7 @@ void ToolbarLayoutManager::implts_create
vos::OGuard aGuard( Application::GetSolarMutex() );
Window* pWindow = VCLUnoHelper::GetWindow( xWindow );
if ( pWindow->GetText().Len() == 0 )
- pWindow->SetText( aGenericAddonTitle );
+ pWindow->SetText( aAddonTitle );
if ( pWindow->GetType() == WINDOW_TOOLBOX )
{
ToolBox* pToolbar = (ToolBox *)pWindow;
@@ -1696,7 +1698,7 @@ void ToolbarLayoutManager::implts_writeW
{
try
{
- uno::Sequence< beans::PropertyValue > aWindowState( 8 );
+ uno::Sequence< beans::PropertyValue > aWindowState( 9 );
aWindowState[0].Name = ::rtl::OUString::createFromAscii(
WINDOWSTATE_PROPERTY_DOCKED );
aWindowState[0].Value = ::uno::makeAny( sal_Bool(
!rElementData.m_bFloating ));
@@ -1725,6 +1727,8 @@ void ToolbarLayoutManager::implts_writeW
aWindowState[6].Value = uno::makeAny( rElementData.m_aUIName );
aWindowState[7].Name = ::rtl::OUString::createFromAscii(
WINDOWSTATE_PROPERTY_LOCKED );
aWindowState[7].Value = uno::makeAny(
rElementData.m_aDockedData.m_bLocked );
+ aWindowState[8].Name = ::rtl::OUString::createFromAscii(
WINDOWSTATE_PROPERTY_STYLE );
+ aWindowState[8].Value = uno::makeAny( rElementData.m_nStyle );
::rtl::OUString aName = rElementData.m_aName;
if ( xPersistentWindowState->hasByName( aName ))
