chart2/source/controller/dialogs/res_DataLabel.cxx | 2 +-
include/xmloff/xmltoken.hxx | 1 -
xmloff/source/chart/PropertyMap.hxx | 1 -
xmloff/source/core/xmltoken.cxx | 1 -
4 files changed, 1 insertion(+), 4 deletions(-)
New commits:
commit 9887118e1977e603d2103701c5d82bb799a729c7
Author: Marco Cecchetti <marco.cecche...@collabora.com>
Date: Tue Oct 6 16:24:18 2015 +0200
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 <c...@libreoffice.org>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/chart2/source/controller/dialogs/res_DataLabel.cxx
b/chart2/source/controller/dialogs/res_DataLabel.cxx
index 591b8fa..2cf50d9 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()];
diff --git a/include/xmloff/xmltoken.hxx b/include/xmloff/xmltoken.hxx
index aa314a3..1eea8c1 100644
--- a/include/xmloff/xmltoken.hxx
+++ b/include/xmloff/xmltoken.hxx
@@ -542,7 +542,6 @@ namespace xmloff { namespace token {
XML_DATA_LABEL_NUMBER,
XML_DATA_LABEL_SYMBOL,
XML_DATA_LABEL_TEXT,
- XML_DATA_LABEL_WRAP,
XML_DATA_PILOT_FIELD,
XML_DATA_PILOT_GRAND_TOTAL,
XML_DATA_PILOT_LEVEL,
diff --git a/xmloff/source/chart/PropertyMap.hxx
b/xmloff/source/chart/PropertyMap.hxx
index 0ca6e41..0145bde 100644
--- a/xmloff/source/chart/PropertyMap.hxx
+++ b/xmloff/source/chart/PropertyMap.hxx
@@ -238,7 +238,6 @@ const XMLPropertyMapEntry aXMLChartPropMap[] =
MAP_SPECIAL( "DataCaption", CHART, XML_DATA_LABEL_NUMBER, XML_TYPE_NUMBER
| MID_FLAG_MERGE_PROPERTY, XML_SCH_CONTEXT_SPECIAL_DATA_LABEL_NUMBER ), //
convert one constant
MAP_SPECIAL( "DataCaption", CHART, XML_DATA_LABEL_TEXT, XML_TYPE_NUMBER |
MID_FLAG_MERGE_PROPERTY, XML_SCH_CONTEXT_SPECIAL_DATA_LABEL_TEXT ), // to
'tristate' and two bools
MAP_SPECIAL( "DataCaption", CHART, XML_DATA_LABEL_SYMBOL, XML_TYPE_NUMBER
| MID_FLAG_MERGE_PROPERTY, XML_SCH_CONTEXT_SPECIAL_DATA_LABEL_SYMBOL ),
- MAP_ENTRY_ODF_EXT( "TextWrap", LO_EXT, XML_DATA_LABEL_WRAP, XML_TYPE_BOOL
),
MAP_SPECIAL_ODF12( "LabelSeparator", CHART, XML_LABEL_SEPARATOR,
XML_TYPE_STRING | MID_FLAG_ELEMENT_ITEM,
XML_SCH_CONTEXT_SPECIAL_LABEL_SEPARATOR ),
MAP_ENTRY_ODF12( "LabelPlacement", CHART, XML_LABEL_POSITION,
XML_SCH_TYPE_LABEL_PLACEMENT_TYPE ),
MAP_ENTRY( "SegmentOffset", CHART, XML_PIE_OFFSET, XML_TYPE_NUMBER ),
diff --git a/xmloff/source/core/xmltoken.cxx b/xmloff/source/core/xmltoken.cxx
index 861236a3..63e4aff 100644
--- a/xmloff/source/core/xmltoken.cxx
+++ b/xmloff/source/core/xmltoken.cxx
@@ -546,7 +546,6 @@ namespace xmloff { namespace token {
TOKEN( "data-label-number", XML_DATA_LABEL_NUMBER ),
TOKEN( "data-label-symbol", XML_DATA_LABEL_SYMBOL ),
TOKEN( "data-label-text", XML_DATA_LABEL_TEXT ),
- TOKEN( "data-label-wrap", XML_DATA_LABEL_WRAP ),
TOKEN( "data-pilot-field", XML_DATA_PILOT_FIELD ),
TOKEN( "data-pilot-grand-total", XML_DATA_PILOT_GRAND_TOTAL ),
TOKEN( "data-pilot-level", XML_DATA_PILOT_LEVEL ),
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
