svn commit: r1448059 - in /openoffice/branches/sidebar/main/sfx2/source/sidebar: DeckTitleBar.cxx PanelTitleBar.cxx SidebarController.cxx

[af]

Author: af
Date: Wed Feb 20 09:43:30 2013
New Revision: 1448059

URL: http://svn.apache.org/r1448059
Log:
i121420: Fixed DataChange() handling in sidebar title bars.  SidebarController 
destroyes TabBar in disposing().

Modified:
    openoffice/branches/sidebar/main/sfx2/source/sidebar/DeckTitleBar.cxx
    openoffice/branches/sidebar/main/sfx2/source/sidebar/PanelTitleBar.cxx
    openoffice/branches/sidebar/main/sfx2/source/sidebar/SidebarController.cxx

Modified: openoffice/branches/sidebar/main/sfx2/source/sidebar/DeckTitleBar.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sfx2/source/sidebar/DeckTitleBar.cxx?rev=1448059&r1=1448058&r2=1448059&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sfx2/source/sidebar/DeckTitleBar.cxx 
(original)
+++ openoffice/branches/sidebar/main/sfx2/source/sidebar/DeckTitleBar.cxx Wed 
Feb 20 09:43:30 2013
@@ -148,6 +148,7 @@ void DeckTitleBar::DataChanged (const Da
     maToolBox.SetItemImage(
         mnCloserItemIndex,
         Theme::GetImage(Theme::Image_Closer));
+    TitleBar::DataChanged(rEvent);
 }
 
 

Modified: openoffice/branches/sidebar/main/sfx2/source/sidebar/PanelTitleBar.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sfx2/source/sidebar/PanelTitleBar.cxx?rev=1448059&r1=1448058&r2=1448059&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sfx2/source/sidebar/PanelTitleBar.cxx 
(original)
+++ openoffice/branches/sidebar/main/sfx2/source/sidebar/PanelTitleBar.cxx Wed 
Feb 20 09:43:30 2013
@@ -182,6 +182,7 @@ void PanelTitleBar::DataChanged (const D
     maToolBox.SetItemImage(
         mnMenuItemIndex,
         Theme::GetImage(Theme::Image_PanelMenu));
+    TitleBar::DataChanged(rEvent);
 }
 
 } } // end of namespace sfx2::sidebar

Modified: 
openoffice/branches/sidebar/main/sfx2/source/sidebar/SidebarController.cxx
URL: 
http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sfx2/source/sidebar/SidebarController.cxx?rev=1448059&r1=1448058&r2=1448059&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sfx2/source/sidebar/SidebarController.cxx 
(original)
+++ openoffice/branches/sidebar/main/sfx2/source/sidebar/SidebarController.cxx 
Wed Feb 20 09:43:30 2013
@@ -149,6 +149,8 @@ void SAL_CALL SidebarController::disposi
         mpCurrentConfiguration.reset();
     }
 
+    mpTabBar.reset();
+
     Theme::GetPropertySet()->removePropertyChangeListener(
         A2S(""),
         static_cast<css::beans::XPropertyChangeListener*>(this));