summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2017-01-24 15:49:47 +0000
committerMichael Stahl <mstahl@redhat.com>2017-01-26 13:19:59 +0000
commitb97abc651d22c0657c54713fa21b98604d7a74ea (patch)
treecbb98ad738e77554bacf6155830d8705954c9eb6
parentef7aefef00bddb5008a4fd071f547cef14ce0c3e (diff)
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@libreoffice.org> Reviewed-by: Michael Stahl <mstahl@redhat.com>
-rw-r--r--extensions/source/propctrlr/formcomponenthandler.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 43fdf3ed956e..1887a55f43ac 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 );