mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WaE: warning C4146: unary minus operator applied to unsigned type,...

Browse Source 
...result still unsigned at sw/source/filter/ww8/docxsdrexport.cxx(441)

Just use SAL_{MAX,MIN}_INT32 (change -2147483648 to (-2147483647-1)) which fixes this warning for MSVC.

Change-Id: Ia039906602d3b00193a364bddb81626afa928f2d
This commit is contained in:
Thomas Arnhold 2014-05-25 19:19:20 +02:00
parent 3c84ee9cce
commit 762b160dce
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
View File

@ -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();

6
sw/source/filter/ww8/docxsdrexport.cxx
View File

@ -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