[Libreoffice-commits] core.git: Branch 'libreoffice-5-3' - extensions/source

[Caolán McNamara]

 extensions/source/propctrlr/formcomponenthandler.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b97abc651d22c0657c54713fa21b98604d7a74ea
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jan 24 15:49:47 2017 +0000

    tdf#105467 new color widget doesn't support XStringListControl
    
    so this threw and mangled the dialog. New color dialog doesn't need
    to be told the name of colors, it figures that out itself.
    
    Change-Id: I89382b6b26312fc90c967620c654ea611cbd9616
    (cherry picked from commit d92b12604b644195328b89cb9355cd4fc4bc3e2d)
    Reviewed-on: https://gerrit.libreoffice.org/33501
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 43fdf3e..1887a55 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -1369,7 +1369,7 @@ namespace pcr
         if ( ( aProperty.Attributes & PropertyAttribute::MAYBEVOID ) != 0 )
         {
             // insert the string "Default" string, if necessary
-            if ( bNeedDefaultStringIfVoidAllowed || ( nControlType == PropertyControlType::ColorListBox ) )
+            if (bNeedDefaultStringIfVoidAllowed)
             {
                 Reference< XStringListControl > xStringList( aDescriptor.Control, UNO_QUERY_THROW );
                 xStringList->prependListEntry( m_sDefaultValueString );