tdf#107020: Reintroduce uses of I32S, I64S

...that had been removed with 4b788a12380518e31a9064d5839f4880d3f36874 "There
should be no need to distinguish between I32S and I64S" (which this commit
effectively reverts).  I had erroneously assumed that the arguments to I32S and
I64S would only be of (signed) integer types, and that it would be irrelevant
that they are truncated to sal_Int32 resp. sal_Int64.  However, at least
oox/source/export/drawingml.cxx called I32S with double values (for which there
is an OUString::number overload too), so the resulting strings could be rather
different.

Change-Id: Ib3887269fad0764740bc9ed3be91f67696a23b55
Reviewed-on: https://gerrit.libreoffice.org/37040
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

2 files changed, 10 insertions, 10 deletions

diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 356f468debab..6f428005963d 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -4243,10 +4243,10 @@ void DocxAttributeOutput::WriteSrcRect(const SdrObject* pSdrObj, const SwFrameFo
         double bottom = nCropB * heightMultiplier;
 
         m_pSerializer->singleElementNS( XML_a, XML_srcRect,
-             XML_l, IS(left),
-             XML_t, IS(top),
-             XML_r, IS(right),
-             XML_b, IS(bottom),
+             XML_l, I32S(left),
+             XML_t, I32S(top),
+             XML_r, I32S(right),
+             XML_b, I32S(bottom),
              FSEND );
     }
 }
@@ -4575,7 +4575,7 @@ void DocxAttributeOutput::WritePostponedChart()
            docPr Id should be unique, ensuring the same here.
         */
         m_pSerializer->singleElementNS( XML_wp, XML_docPr,
-            XML_id, IS( m_anchorId++ ),
+            XML_id, I32S( m_anchorId++ ),
             XML_name, USS( sName ),
             FSEND );
 
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx
index 3e85f643b608..6eef5c94decb 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 ? IS(MAX_INTEGER_VALUE) : aWidth.getStr()): "0");
+    aWidth = (aWidth.toInt64() > 0 ? (aWidth.toInt64() > MAX_INTEGER_VALUE ? I64S(MAX_INTEGER_VALUE) : aWidth.getStr()): "0");
     OString aHeight(OString::number(TwipsToEMU(cy)));
-    aHeight = (aHeight.toInt64() > 0 ? (aHeight.toInt64() > MAX_INTEGER_VALUE ? IS(MAX_INTEGER_VALUE) : aHeight.getStr()): "0");
+    aHeight = (aHeight.toInt64() > 0 ? (aHeight.toInt64() > MAX_INTEGER_VALUE ? I64S(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,  IS(linkedTextboxesIter->second.nId),
-                                 XML_seq, IS(linkedTextboxesIter->second.nSeq),
+                                 XML_id,  I32S(linkedTextboxesIter->second.nId),
+                                 XML_seq, I32S(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,  IS(linkedTextboxesIter->second.nId),
+                                XML_id,  I32S(linkedTextboxesIter->second.nId),
                                 FSEND);
             isTxbxLinked = true ;
         }