summaryrefslogtreecommitdiff
path: root/chart2/source
diff options
context:
space:
mode:
authorMarco Cecchetti <marco.cecchetti@collabora.com>2015-10-06 16:24:18 +0200
committerAndras Timar <andras.timar@collabora.com>2015-10-07 06:12:10 +0000
commit9887118e1977e603d2103701c5d82bb799a729c7 (patch)
tree6ac166cea201fdf242df06adb5495ab5372c76ce /chart2/source
parent8273350ff48f198efc9dc9c5de5519b8cbdc0cb3 (diff)
tdf#90839: follow-up work
- Removed the data-label-wrap token and related code in xmloff module. - Using the already present `fo:wrap-option` seems to be the preferred solution: investigated to see how the token is imported exported: the class `XMLWordWrapPropertyHdl` takes care of that, luckily it converts the token to a boolean property. - Fixed a minor issue in the code for the data label dialog. Change-Id: Id050fdfeedd3af7fb79be96bfe157c61c4b44191 Reviewed-on: https://gerrit.libreoffice.org/19197 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'chart2/source')
-rw-r--r--chart2/source/controller/dialogs/res_DataLabel.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx b/chart2/source/controller/dialogs/res_DataLabel.cxx
index 591b8fa3bf51..2cf50d91c8b5 100644
--- a/chart2/source/controller/dialogs/res_DataLabel.cxx
+++ b/chart2/source/controller/dialogs/res_DataLabel.cxx
@@ -294,7 +294,7 @@ bool DataLabelResources::FillItemSet( SfxItemSet* rOutAttrs ) const
rOutAttrs->Put( SfxBoolItem( SCHATTR_DATADESCR_SHOW_CATEGORY, m_pCBCategory->IsChecked() ) );
if( m_pCBSymbol->GetState()!= TRISTATE_INDET )
rOutAttrs->Put( SfxBoolItem( SCHATTR_DATADESCR_SHOW_SYMBOL, m_pCBSymbol->IsChecked()) );
- if( m_pCBSymbol->GetState()!= TRISTATE_INDET )
+ if( m_pCBWrapText->GetState()!= TRISTATE_INDET )
rOutAttrs->Put( SfxBoolItem( SCHATTR_DATADESCR_WRAP_TEXT, m_pCBWrapText->IsChecked()) );
OUString aSep = m_aEntryMap[m_pLB_Separator->GetSelectEntryPos()];