[Libreoffice-commits] core.git: extensions/source

[Michael Meeks]

 extensions/source/propctrlr/browserline.cxx |    2 +-
 extensions/source/propctrlr/browserpage.cxx |   20 +-------------------
 2 files changed, 2 insertions(+), 20 deletions(-)

New commits:
commit 7a7a908263fc5761e963606d063bf1154112b87f
Author: Michael Meeks <michael.meeks at collabora.com>
Date:   Thu May 14 17:50:01 2015 +0100

    tdf#91240 - cope with state-change after dispose and dispose fixedtext.
    
    Change-Id: Iba204fbeebbc4ea0982036159507b755cedd544e

diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx
index 174c01e..1d3bd4c 100644
--- a/extensions/source/propctrlr/browserline.cxx
+++ b/extensions/source/propctrlr/browserline.cxx
@@ -69,11 +69,11 @@ namespace pcr
         m_aFtTitle->Show();
     }
 
-
     OBrowserLine::~OBrowserLine()
     {
         implHideBrowseButton( true, false );
         implHideBrowseButton( false, false );
+        m_aFtTitle.disposeAndClear();
     }
 
 
diff --git a/extensions/source/propctrlr/browserpage.cxx b/extensions/source/propctrlr/browserpage.cxx
index 432ba8c..6aaf03f 100644
--- a/extensions/source/propctrlr/browserpage.cxx
+++ b/extensions/source/propctrlr/browserpage.cxx
@@ -19,20 +19,13 @@
 
 #include "browserpage.hxx"
 
-
 namespace pcr
 {
-
-
     #define LAYOUT_BORDER_LEFT      3
     #define LAYOUT_BORDER_TOP       3
     #define LAYOUT_BORDER_RIGHT     3
     #define LAYOUT_BORDER_BOTTOM    3
 
-
-    // class OBrowserPage
-
-
     OBrowserPage::OBrowserPage(vcl::Window* pParent,WinBits nWinStyle)
             :TabPage(pParent,nWinStyle)
             ,m_aListBox(VclPtr<OBrowserListBox>::Create(this))
@@ -42,7 +35,6 @@ namespace pcr
         m_aListBox->Show();
     }
 
-
     OBrowserPage::~OBrowserPage()
     {
         disposeOnce();
@@ -62,33 +54,23 @@ namespace pcr
         m_aListBox->SetPosSizePixel( Point( LAYOUT_BORDER_LEFT, LAYOUT_BORDER_TOP ), aSize );
     }
 
-
-
-
-
-
     void OBrowserPage::StateChanged(StateChangedType nType)
     {
         Window::StateChanged( nType);
-        if (StateChangedType::Visible == nType)
+        if (StateChangedType::Visible == nType && m_aListBox)
             m_aListBox->ActivateListBox(IsVisible());
     }
 
-
     sal_Int32 OBrowserPage::getMinimumWidth()
     {
         return m_aListBox->GetMinimumWidth() + LAYOUT_BORDER_LEFT + LAYOUT_BORDER_RIGHT;
     }
 
-
     sal_Int32 OBrowserPage::getMinimumHeight()
     {
         return m_aListBox->GetMinimumHeight() + LAYOUT_BORDER_TOP + LAYOUT_BORDER_BOTTOM;
     }
 
-
 } // namespace pcr
 
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */