Kaydet (Commit) 01e263ba authored tarafından Caolán McNamara's avatar Caolán McNamara Kaydeden (comit) Markus Mohrhard

Resolves: tdf#121641 properties invisible after 'reset'

Change-Id: Iedb2b11be0e008501273925d6ae7137b28c3b912
Reviewed-on: https://gerrit.libreoffice.org/64539
Tested-by: Jenkins
Tested-by: 's avatarXisco Faulí <xiscofauli@libreoffice.org>
Reviewed-by: 's avatarMarkus Mohrhard <markus.mohrhard@googlemail.com>
üst 78c52b1a
...@@ -1511,7 +1511,14 @@ void CustomPropertiesWindow::dispose() ...@@ -1511,7 +1511,14 @@ void CustomPropertiesWindow::dispose()
{ {
m_aEditLoseFocusIdle.Stop(); m_aEditLoseFocusIdle.Stop();
m_aBoxLoseFocusIdle.Stop(); m_aBoxLoseFocusIdle.Stop();
ClearAllLines();
for (CustomPropertyLine* pLine : m_aCustomPropertiesLines)
{
delete pLine;
}
m_pCurrentLine = nullptr;
m_aCustomPropertiesLines.clear();
m_pHeaderBar.clear(); m_pHeaderBar.clear();
m_pScrollBar.clear(); m_pScrollBar.clear();
m_pHeaderAccName.clear(); m_pHeaderAccName.clear();
...@@ -1746,16 +1753,12 @@ bool CustomPropertiesWindow::AreAllLinesValid() const ...@@ -1746,16 +1753,12 @@ bool CustomPropertiesWindow::AreAllLinesValid() const
void CustomPropertiesWindow::ClearAllLines() void CustomPropertiesWindow::ClearAllLines()
{ {
std::vector< CustomPropertyLine* >::iterator pIter; for (CustomPropertyLine* pLine : m_aCustomPropertiesLines)
for ( pIter = m_aCustomPropertiesLines.begin();
pIter != m_aCustomPropertiesLines.end(); ++pIter )
{ {
CustomPropertyLine* pLine = *pIter; pLine->Clear();
delete pLine;
} }
m_pCurrentLine = nullptr; m_pCurrentLine = nullptr;
m_aCustomProperties.clear(); m_aCustomProperties.clear();
m_aCustomPropertiesLines.clear();
m_nScrollPos = 0; m_nScrollPos = 0;
} }
......
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