diff options
author | Caolán McNamara <caolanm@redhat.com> | 2017-01-24 15:49:47 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2017-01-24 15:49:49 +0000 |
commit | d92b12604b644195328b89cb9355cd4fc4bc3e2d (patch) | |
tree | 2bd25e6cf25d2b00746b4720840735ff3450a791 | |
parent | e3bd10f8d5c7750dd0a700f738f4713519cde118 (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
-rw-r--r-- | extensions/source/propctrlr/formcomponenthandler.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index 91781c8d5c3d..46af453d3bdf 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 ); |