diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2017-07-07 12:06:32 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2017-07-07 15:02:38 +0200 |
| commit | 23978f85533e66b18ee2e9b72ad2fc71a93958a3 (patch) | |
| tree | db8396011a7fa1f3601a08ed38fc7cfc03018468 /oox | |
| parent | 66ebc285320b8dfb064ed6a06a13e5c78158b950 (diff) | |
merge BS and ToPsz10, etc
Change-Id: I25d4efe816bf6ae4ba456bb42a827b9a70f503c7
Reviewed-on: https://gerrit.libreoffice.org/39689
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/export/chartexport.cxx | 12 | ||||
| -rw-r--r-- | oox/source/export/drawingml.cxx | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/oox/source/export/chartexport.cxx b/oox/source/export/chartexport.cxx index b1ac3f1b5415..5f488e0b4b75 100644 --- a/oox/source/export/chartexport.cxx +++ b/oox/source/export/chartexport.cxx @@ -888,7 +888,7 @@ void ChartExport::exportChart( const Reference< css::chart::XChartDocument >& xC bool bIncludeHiddenCells = false; aPlotVisOnly >>= bIncludeHiddenCells; pFS->singleElement( FSNS( XML_c, XML_plotVisOnly ), - XML_val, BS(!bIncludeHiddenCells), + XML_val, ToPsz10(!bIncludeHiddenCells), FSEND ); exportMissingValueTreatment(Reference<beans::XPropertySet>(mxDiagram, uno::UNO_QUERY)); @@ -3030,11 +3030,11 @@ void writeLabelProperties( } } - pFS->singleElement(FSNS(XML_c, XML_showLegendKey), XML_val, BS(aLabel.ShowLegendSymbol), FSEND); - pFS->singleElement(FSNS(XML_c, XML_showVal), XML_val, BS(aLabel.ShowNumber), FSEND); - pFS->singleElement(FSNS(XML_c, XML_showCatName), XML_val, BS(aLabel.ShowCategoryName), FSEND); - pFS->singleElement(FSNS(XML_c, XML_showSerName), XML_val, BS(false), FSEND); - pFS->singleElement(FSNS(XML_c, XML_showPercent), XML_val, BS(aLabel.ShowNumberInPercent), FSEND); + pFS->singleElement(FSNS(XML_c, XML_showLegendKey), XML_val, ToPsz10(aLabel.ShowLegendSymbol), FSEND); + pFS->singleElement(FSNS(XML_c, XML_showVal), XML_val, ToPsz10(aLabel.ShowNumber), FSEND); + pFS->singleElement(FSNS(XML_c, XML_showCatName), XML_val, ToPsz10(aLabel.ShowCategoryName), FSEND); + pFS->singleElement(FSNS(XML_c, XML_showSerName), XML_val, ToPsz10(false), FSEND); + pFS->singleElement(FSNS(XML_c, XML_showPercent), XML_val, ToPsz10(aLabel.ShowNumberInPercent), FSEND); } } diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx index e3615e6bb5de..ddb91babb7c5 100644 --- a/oox/source/export/drawingml.cxx +++ b/oox/source/export/drawingml.cxx @@ -2006,7 +2006,7 @@ void DrawingML::WriteParagraphProperties( const Reference< XTextContent >& rPara XML_marL, nParaLeftMargin > 0 ? I32S( oox::drawingml::convertHmmToEmu( nParaLeftMargin ) ) : nullptr, XML_indent, nParaFirstLineIndent ? I32S( oox::drawingml::convertHmmToEmu( nParaFirstLineIndent ) ) : nullptr, XML_algn, GetAlignment( nAlignment ), - XML_rtl, bRtl ? BS(bRtl) : nullptr, + XML_rtl, bRtl ? ToPsz10(bRtl) : nullptr, FSEND ); else mpFS->startElementNS( XML_a, XML_pPr, @@ -2014,7 +2014,7 @@ void DrawingML::WriteParagraphProperties( const Reference< XTextContent >& rPara XML_marL, nLeftMargin > 0 ? I32S( oox::drawingml::convertHmmToEmu( nLeftMargin ) ) : nullptr, XML_indent, nLineIndentation ? I32S( oox::drawingml::convertHmmToEmu( nLineIndentation ) ) : nullptr, XML_algn, GetAlignment( nAlignment ), - XML_rtl, bRtl ? BS(bRtl) : nullptr, + XML_rtl, bRtl ? ToPsz10(bRtl) : nullptr, FSEND ); |