getColorWindow calling itself, so undisposed windows lying around

Change-Id: I5902c7a677b8b0d3d2891a5f793e5f8e457f25fa
2017-01-27 14:33:53 +00:00
parent 9c62e04bd5
commit 3ae2158d43
1 changed files with 1 additions and 1 deletions
--- 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);