Kaydet (Commit) 82c9dbe2 authored tarafından Maxim Monastirsky's avatar Maxim Monastirsky

Improve last commit

Change-Id: I4feb71c9117e13f18e2c5215714fd0170f166b64
üst 9152f16b
......@@ -52,10 +52,8 @@ NotebookBar::~NotebookBar()
void NotebookBar::dispose()
{
if (m_pSystemWindow && m_pSystemWindow->ImplIsInTaskPaneList(this))
{
m_pSystemWindow->GetTaskPaneList()->RemoveWindow(this);
m_pSystemWindow.clear();
}
m_pSystemWindow.clear();
disposeBuilder();
m_pEventListener.clear();
Control::dispose();
......@@ -117,10 +115,7 @@ void NotebookBar::SetIconClickHdl(Link<NotebookBar*, void> aHdl)
void NotebookBar::SetSystemWindow(SystemWindow* pSystemWindow)
{
if (m_pSystemWindow)
m_pSystemWindow.clear();
m_pSystemWindow = VclPtr<SystemWindow>(pSystemWindow);
m_pSystemWindow = pSystemWindow;
if (!m_pSystemWindow->ImplIsInTaskPaneList(this))
m_pSystemWindow->GetTaskPaneList()->AddWindow(this);
}
......
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