Kaydet (Commit) 7a7a9082 authored tarafından Michael Meeks's avatar Michael Meeks

tdf#91240 - cope with state-change after dispose and dispose fixedtext.

Change-Id: Iba204fbeebbc4ea0982036159507b755cedd544e
üst 8f591dff
......@@ -69,11 +69,11 @@ namespace pcr
m_aFtTitle->Show();
}
OBrowserLine::~OBrowserLine()
{
implHideBrowseButton( true, false );
implHideBrowseButton( false, false );
m_aFtTitle.disposeAndClear();
}
......
......@@ -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: */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment