diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index 064e4fd47c01..1d8d8900b9bf 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -3348,7 +3348,7 @@ DECLARE_OOXMLEXPORT_TEST(testAbsolutePositionOffsetValue,"fdo78432.docx")
     if (!pXmlDoc)
         return;
 
-    sal_Int32 IntMax = 2147483647;
+    sal_Int32 IntMax = SAL_MAX_INT32;
 
     xmlNodeSetPtr pXmlNodes[6];
     pXmlNodes[0] = getXPathNode(pXmlDoc,"/w:document[1]/w:body[1]/w:p[1]/w:r[1]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:anchor[1]/wp:positionH[1]/wp:posOffset[1]");
@@ -3519,7 +3519,7 @@ DECLARE_OOXMLEXPORT_TEST(testFdo78957, "fdo78957.docx")
     if(!pXmlHeader)
         return;
 
-    const sal_Int64 IntMax = 2147483647;
+    const sal_Int64 IntMax = SAL_MAX_INT32;
     sal_Int64 cx = 0, cy = 0;
     cx = getXPath(pXmlHeader,"/w:hdr[1]/w:p[1]/w:r[1]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:anchor[1]/wp:extent[1]","cx").toInt64();
     cy = getXPath(pXmlHeader,"/w:hdr[1]/w:p[1]/w:r[1]/mc:AlternateContent[1]/mc:Choice[1]/w:drawing[1]/wp:anchor[1]/wp:extent[1]","cy").toInt64();
diff --git a/sw/source/filter/ww8/docxsdrexport.cxx b/sw/source/filter/ww8/docxsdrexport.cxx
index c8ffe942e5d8..064e652ff497 100644
--- a/sw/source/filter/ww8/docxsdrexport.cxx
+++ b/sw/source/filter/ww8/docxsdrexport.cxx
@@ -437,8 +437,8 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrmFmt* pFrmFmt, const Size& rS
         * climits header defines constants with the limits of integral types for the specific system and compiler implemetation used.
         * Use of this might cause platform dependent problem like posOffset exceed the limit.
         **/
-        const sal_Int64 MAX_INTEGER_VALUE = 2147483647;
-        const sal_Int64 MIN_INTEGER_VALUE = -2147483648;
+        const sal_Int64 MAX_INTEGER_VALUE = SAL_MAX_INT32;
+        const sal_Int64 MIN_INTEGER_VALUE = SAL_MIN_INT32;
         if (alignH != NULL)
         {
             m_pImpl->m_pSerializer->startElementNS(XML_wp, XML_align, FSEND);
@@ -535,7 +535,7 @@ void DocxSdrExport::startDMLAnchorInline(const SwFrmFmt* pFrmFmt, const Size& rS
     **/
     sal_uInt64 cx = 0 ;
     sal_uInt64 cy = 0 ;
-    const sal_Int64 MAX_INTEGER_VALUE = 2147483647;
+    const sal_Int64 MAX_INTEGER_VALUE = SAL_MAX_INT32;
 
     // the 'Size' type uses 'long' for width and height, so on
     // platforms where 'long' is 32 bits they can obviously never be