summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-01-27 14:33:53 +0000
committerCaolán McNamara <caolanm@redhat.com>2017-01-27 14:34:24 +0000
commit3ae2158d43c52fda03edfddb584bf41a8aa0b0ad (patch)
tree60e3910024bd0230afd7fabccb56b5a6d9023859
parent9c62e04bd52960b1a412f52d995e1a4c6fb4d69a (diff)
getColorWindow calling itself, so undisposed windows lying around
Change-Id: I5902c7a677b8b0d3d2891a5f793e5f8e457f25fa
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 7b4997f77a5a..c8862ca78ff3 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -3218,7 +3218,6 @@ void SvxColorListBox::EnsurePaletteManager()
m_xPaletteManager.reset(new PaletteManager);
m_xPaletteManager->SetColorSelectFunction(m_aColorWrapper);
m_xPaletteManager->SetLastColor(m_aSelectedColor.first);
- SetNoSelection();
}
}
@@ -3300,6 +3299,7 @@ void SvxColorListBox::createColorWindow()
xFrame,
this,
m_aColorWrapper);
+ SetNoSelection();
if (m_bShowNoneButton)
m_xColorWindow->ShowNoneButton();
m_xColorWindow->SelectEntry(m_aSelectedColor);