i116455 - Make toolbar style settings persistent

framework/source/layoutmanager/toolbarlayoutmanager.cxx

@@ -1004,7 +1004,9 @@ void ToolbarLayoutManager::implts_createAddonsToolBars()
                     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_createAddonsToolBars()
                     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_createAddonsToolBars()
                     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_createAddonsToolBars()
                     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_writeWindowStateData( const UIElement& rElemen
     {
         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_writeWindowStateData( const UIElement& rElemen
             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 ))