diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-05-14 17:50:01 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-05-14 21:15:14 +0100 |
| commit | 7a7a908263fc5761e963606d063bf1154112b87f (patch) | |
| tree | 9c32beebb31d56e93b80b25a9fa8c5d9606131f1 /extensions | |
| parent | 8f591dffc6128aa2d2674bcb29cafd17b462a4d0 (diff) | |
tdf#91240 - cope with state-change after dispose and dispose fixedtext.
Change-Id: Iba204fbeebbc4ea0982036159507b755cedd544e
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/propctrlr/browserline.cxx | 2 | ||||
| -rw-r--r-- | extensions/source/propctrlr/browserpage.cxx | 20 |
2 files changed, 2 insertions, 20 deletions
diff --git a/extensions/source/propctrlr/browserline.cxx b/extensions/source/propctrlr/browserline.cxx index 174c01eef667..1d3bd4c53981 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 432ba8c9655d..6aaf03f9b633 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: */ |