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 /sc/source/filter/excel/xetable.cxx | |
| 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 'sc/source/filter/excel/xetable.cxx')
| -rw-r--r-- | sc/source/filter/excel/xetable.cxx | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx index 1f95b7a8f45d..473f97a78daf 100644 --- a/sc/source/filter/excel/xetable.cxx +++ b/sc/source/filter/excel/xetable.cxx @@ -37,6 +37,7 @@ #include <formula/errorcodes.hxx> #include <thread> #include <comphelper/threadpool.hxx> +#include <oox/export/utils.hxx> #if defined(ANDROID) namespace std @@ -994,7 +995,7 @@ void XclExpFormulaCell::SaveXml( XclExpXmlStream& rStrm ) aMatScRange.aStart.Row() == static_cast<SCROW>(GetXclPos().mnRow)) { rWorksheet->startElement( XML_f, - XML_aca, XclXmlUtils::ToPsz( (mxTokArr && mxTokArr->IsVolatile()) || + XML_aca, ToPsz( (mxTokArr && mxTokArr->IsVolatile()) || (mxAddRec && mxAddRec->IsVolatile())), XML_t, mxAddRec ? "array" : nullptr, XML_ref, !sFmlaCellRange.isEmpty()? sFmlaCellRange.getStr() : nullptr, @@ -1019,7 +1020,7 @@ void XclExpFormulaCell::SaveXml( XclExpXmlStream& rStrm ) if (!bTagStarted) { rWorksheet->startElement( XML_f, - XML_aca, XclXmlUtils::ToPsz( (mxTokArr && mxTokArr->IsVolatile()) || + XML_aca, ToPsz( (mxTokArr && mxTokArr->IsVolatile()) || (mxAddRec && mxAddRec->IsVolatile()) ), FSEND ); } @@ -1695,9 +1696,9 @@ void XclExpColinfo::SaveXml( XclExpXmlStream& rStrm ) const double nTruncatedExcelColumnWidth = std::trunc( nExcelColumnWidth * 100.0 + 0.5 ) / 100.0; rStrm.GetCurrentStream()->singleElement( XML_col, // OOXTODO: XML_bestFit, - XML_collapsed, XclXmlUtils::ToPsz( ::get_flag( mnFlags, EXC_COLINFO_COLLAPSED ) ), - XML_customWidth, XclXmlUtils::ToPsz( mbCustomWidth ), - XML_hidden, XclXmlUtils::ToPsz( ::get_flag( mnFlags, EXC_COLINFO_HIDDEN ) ), + XML_collapsed, ToPsz( ::get_flag( mnFlags, EXC_COLINFO_COLLAPSED ) ), + XML_customWidth, ToPsz( mbCustomWidth ), + XML_hidden, ToPsz( ::get_flag( mnFlags, EXC_COLINFO_HIDDEN ) ), XML_outlineLevel, OString::number( mnOutlineLevel ).getStr(), XML_max, OString::number( nLastXclCol + 1 ).getStr(), XML_min, OString::number( mnFirstXclCol + 1 ).getStr(), @@ -2125,12 +2126,12 @@ void XclExpRow::SaveXml( XclExpXmlStream& rStrm ) XML_r, OString::number( (mnCurrentRow++) ).getStr(), // OOXTODO: XML_spans, optional XML_s, haveFormat ? lcl_GetStyleId( rStrm, mnXFIndex ).getStr() : nullptr, - XML_customFormat, XclXmlUtils::ToPsz( haveFormat ), + XML_customFormat, ToPsz( haveFormat ), XML_ht, OString::number( (double) mnHeight / 20.0 ).getStr(), - XML_hidden, XclXmlUtils::ToPsz( ::get_flag( mnFlags, EXC_ROW_HIDDEN ) ), - XML_customHeight, XclXmlUtils::ToPsz( ::get_flag( mnFlags, EXC_ROW_UNSYNCED ) ), + XML_hidden, ToPsz( ::get_flag( mnFlags, EXC_ROW_HIDDEN ) ), + XML_customHeight, ToPsz( ::get_flag( mnFlags, EXC_ROW_UNSYNCED ) ), XML_outlineLevel, OString::number( mnOutlineLevel ).getStr(), - XML_collapsed, XclXmlUtils::ToPsz( ::get_flag( mnFlags, EXC_ROW_COLLAPSED ) ), + XML_collapsed, ToPsz( ::get_flag( mnFlags, EXC_ROW_COLLAPSED ) ), // OOXTODO: XML_thickTop, bool // OOXTODO: XML_thickBot, bool // OOXTODO: XML_ph, bool @@ -2712,7 +2713,7 @@ void XclExpCellTable::SaveXml( XclExpXmlStream& rStrm ) // OOXTODO: XML_thickTop // OOXTODO: XML_thickBottom XML_defaultRowHeight, OString::number( static_cast< double> ( rDefData.mnHeight ) / 20.0 ).getStr(), - XML_zeroHeight, XclXmlUtils::ToPsz( rDefData.IsHidden() ), + XML_zeroHeight, ToPsz( rDefData.IsHidden() ), XML_outlineLevelRow, OString::number( maRowBfr.GetHighestOutlineLevel() ).getStr(), XML_outlineLevelCol, OString::number( maColInfoBfr.GetHighestOutlineLevel() ).getStr(), FSEND ); |