diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2017-03-25 10:33:14 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2017-03-25 12:51:13 +0000 |
| commit | 4b788a12380518e31a9064d5839f4880d3f36874 (patch) | |
| tree | b40911edc6eb932f6655bb4a27359e0301c7002b /sw | |
| parent | 0f9b0f471249910787c4da111363efc57bf316d9 (diff) | |
There should be no need to distinguish between I32S and I64S
...after 64b993e046f23baaacaff1572b7d2a816588b5ef "finish deprecation of
O(U)String::valueOf()" replaced OString::valueOf with OString::number in their
bodies. (Change done in preparation of teaching loplugin:redundantcast about
C-style casts in macro bodies.)
Change-Id: Ifbb4725c496eed18a926fbabeaf4691ac98d9c5e
Reviewed-on: https://gerrit.libreoffice.org/35678
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 10 | ||||
| -rw-r--r-- | sw/source/filter/ww8/docxsdrexport.cxx | 10 |
2 files changed, 10 insertions, 10 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 88acbf8b93e7..9224c902c0df 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -4190,10 +4190,10 @@ void DocxAttributeOutput::WriteSrcRect(const SdrObject* pSdrObj, const SwFrameFo double bottom = nCropB * heightMultiplier; m_pSerializer->singleElementNS( XML_a, XML_srcRect, - XML_l, I32S(left), - XML_t, I32S(top), - XML_r, I32S(right), - XML_b, I32S(bottom), + XML_l, IS(left), + XML_t, IS(top), + XML_r, IS(right), + XML_b, IS(bottom), FSEND ); } } @@ -4522,7 +4522,7 @@ void DocxAttributeOutput::WritePostponedChart() docPr Id should be unique, ensuring the same here. */ m_pSerializer->singleElementNS( XML_wp, XML_docPr, - XML_id, I32S( m_anchorId++ ), + XML_id, IS( m_anchorId++ ), XML_name, USS( sName ), FSEND ); diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx index 4426227871b2..78798095dfcb 100644 --- a/sw/source/filter/ww8/docxsdrexport.cxx +++ b/sw/source/filter/ww8/docxsdrexport.cxx @@ -623,9 +623,9 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrameFormat* pFrameFormat, cons OString aWidth(OString::number(TwipsToEMU(cx))); //we explicitly check the converted EMU value for the range as mentioned in above comment. - aWidth = (aWidth.toInt64() > 0 ? (aWidth.toInt64() > MAX_INTEGER_VALUE ? I64S(MAX_INTEGER_VALUE) : aWidth.getStr()): "0"); + aWidth = (aWidth.toInt64() > 0 ? (aWidth.toInt64() > MAX_INTEGER_VALUE ? IS(MAX_INTEGER_VALUE) : aWidth.getStr()): "0"); OString aHeight(OString::number(TwipsToEMU(cy))); - aHeight = (aHeight.toInt64() > 0 ? (aHeight.toInt64() > MAX_INTEGER_VALUE ? I64S(MAX_INTEGER_VALUE) : aHeight.getStr()): "0"); + aHeight = (aHeight.toInt64() > 0 ? (aHeight.toInt64() > MAX_INTEGER_VALUE ? IS(MAX_INTEGER_VALUE) : aHeight.getStr()): "0"); m_pImpl->m_pSerializer->singleElementNS(XML_wp, XML_extent, XML_cx, aWidth, @@ -1550,8 +1550,8 @@ void DocxSdrExport::writeDMLTextFrame(ww8::Frame* pParentFrame, int nAnchorId, b { //not the first in the chain, so write the tag as linkedTxbx pFS->singleElementNS(XML_wps, XML_linkedTxbx, - XML_id, I32S(linkedTextboxesIter->second.nId), - XML_seq, I32S(linkedTextboxesIter->second.nSeq), + XML_id, IS(linkedTextboxesIter->second.nId), + XML_seq, IS(linkedTextboxesIter->second.nSeq), FSEND); /* no text content should be added to this tag, since the textbox is linked, the entire content @@ -1565,7 +1565,7 @@ void DocxSdrExport::writeDMLTextFrame(ww8::Frame* pParentFrame, int nAnchorId, b to this block*/ //since the text box is linked, it needs an id. pFS->startElementNS(XML_wps, XML_txbx, - XML_id, I32S(linkedTextboxesIter->second.nId), + XML_id, IS(linkedTextboxesIter->second.nId), FSEND); isTxbxLinked = true ; } |