[Libreoffice-commits] .: Branch 'libreoffice-4-0' - sfx2/source

[Libreoffice Gerrit user]

 sfx2/source/dialog/taskpane.cxx |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 417e10b3714c3106fb7a602d91c174aefff32763
Author: Rob Snelders <programming at ertai.nl>
Date:   Mon Dec 3 22:49:37 2012 +0100

    fdo#31309 Taskpane items visibility can't be restored
    
    Change-Id: I9959b8e0a21252638a4f39f88bf5049ea905f4bb
    Reviewed-on: https://gerrit.libreoffice.org/1231
    Reviewed-by: Lennard Wasserthal <Wasserthal at nefkom.net>
    Reviewed-by: Kohei Yoshida <kohei.yoshida at gmail.com>
    Tested-by: Kohei Yoshida <kohei.yoshida at gmail.com>
    Signed-off-by: Kohei Yoshida <kohei.yoshida at gmail.com>

diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx
index fa73b75..ae67a64 100644
--- a/sfx2/source/dialog/taskpane.cxx
+++ b/sfx2/source/dialog/taskpane.cxx
@@ -956,15 +956,16 @@ namespace sfx2
     TaskPaneController_Impl::~TaskPaneController_Impl()
     {
         m_rTaskPane.GetPanelDeck().RemoveListener( *this );
+        int i = 0;
 
         // remove the panels which are not under the control of the panel deck currently
         for (   PanelDescriptors::iterator panelPos = m_aPanelRepository.begin();
                 panelPos != m_aPanelRepository.end();
-                ++panelPos
+                ++panelPos, ++i
             )
         {
             if ( panelPos->bHidden )
-                panelPos->pPanel->Dispose();
+                impl_togglePanelVisibility( i );
         }
         m_aPanelRepository.clear();
     }