Kaydet (Commit) ce300bf2 authored tarafından Thomas Arnhold's avatar Thomas Arnhold

SAL_INT64_IS_STRUCT is never defined

Change-Id: I326a429beec5fd1932afff0a1f50522426de15e2
üst 162029e5
...@@ -53,7 +53,6 @@ ...@@ -53,7 +53,6 @@
#include <sfx2/htmlmode.hxx> #include <sfx2/htmlmode.hxx>
#include <svl/urihelper.hxx> #include <svl/urihelper.hxx>
#include <tools/urlobj.hxx> #include <tools/urlobj.hxx>
#include <tools/bigint.hxx>
#include <unotools/charclass.hxx> #include <unotools/charclass.hxx>
#include <i18nlangtag/languagetag.hxx> #include <i18nlangtag/languagetag.hxx>
#include <charfmt.hxx> #include <charfmt.hxx>
...@@ -359,37 +358,6 @@ static void AddUnitPropertyValue(OStringBuffer &rOut, long nVal, ...@@ -359,37 +358,6 @@ static void AddUnitPropertyValue(OStringBuffer &rOut, long nVal,
bool bOutLongVal = true; bool bOutLongVal = true;
if( nVal > LONG_MAX / nMul ) if( nVal > LONG_MAX / nMul )
{ {
// needs a BigInt to translate this unit
#ifdef SAL_INT64_IS_STRUCT
BigInt nBigVal( nVal );
nBigVal *= nMul;
nBigVal /= nDiv;
nBigVal += 5;
nBigVal /= 10;
if( nBigVal.IsLong() )
{
// a long is sufficient
nLongVal = (long)nBigVal;
}
else
{
BigInt nBigFac( nFac );
BigInt nBig10( 10 );
rOut += (long)(nBigVal / nBigFac);
if( !(nBigVal % nBigFac).IsZero() )
{
rOut.append('.');
while( nFac > 1 && !(nBigVal % nBigFac).IsZero() )
{
nFac /= 10;
nBigFac = nFac;
rOut.append(OString::number((nBigVal / nBigFac) % nBig10));
}
}
bOutLongVal = false;
}
#else
sal_Int64 nBigVal( nVal ); sal_Int64 nBigVal( nVal );
nBigVal *= nMul; nBigVal *= nMul;
nBigVal /= nDiv; nBigVal /= nDiv;
...@@ -415,7 +383,6 @@ static void AddUnitPropertyValue(OStringBuffer &rOut, long nVal, ...@@ -415,7 +383,6 @@ static void AddUnitPropertyValue(OStringBuffer &rOut, long nVal,
} }
bOutLongVal = false; bOutLongVal = false;
} }
#endif
} }
else else
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment