[Libreoffice-commits] core.git: svx/source

[Caolán McNamara]

 svx/source/tbxctrls/tbcontrl.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3ae2158d43c52fda03edfddb584bf41a8aa0b0ad
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Jan 27 14:33:53 2017 +0000

    getColorWindow calling itself, so undisposed windows lying around
    
    Change-Id: I5902c7a677b8b0d3d2891a5f793e5f8e457f25fa

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 7b4997f..c8862ca 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);