summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2015-06-15 10:01:59 +0200
committerStephan Bergmann <sbergman@redhat.com>2015-06-15 10:01:59 +0200
commit1bd2fe8943a0235b20c6d6fba09ec0cf8b268066 (patch)
tree3c8b2029861dec64d71039adc23ccf88e36a3d49 /vcl
parentd7763d97fe836c013f2026a79f33e49a6b507efc (diff)
Minor clean up
Change-Id: I8e4d123626b5ef750c3b266d1aa1c96e1944b080
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/outdev/map.cxx17
1 files changed, 8 insertions, 9 deletions
diff --git a/vcl/source/outdev/map.cxx b/vcl/source/outdev/map.cxx
index 37db1018a90f..8255c2e77ff2 100644
--- a/vcl/source/outdev/map.cxx
+++ b/vcl/source/outdev/map.cxx
@@ -362,8 +362,7 @@ void OutputDevice::ImplInvalidateViewTransform()
static long ImplLogicToPixel( long n, long nDPI, long nMapNum, long nMapDenom,
long nThres )
{
- // To "use" it...
- (void) nThres;
+ assert(nDPI > 0);
#if (SAL_TYPES_SIZEOFLONG < 8)
if( (+n < nThres) && (-n < nThres) )
{
@@ -377,8 +376,8 @@ static long ImplLogicToPixel( long n, long nDPI, long nMapNum, long nMapDenom,
}
else
#else
+ (void) nThres;
assert(nMapNum >= 0);
- assert(nDPI > 0);
assert(nMapNum == 0 || std::abs(n) < std::numeric_limits<long>::max() / nMapNum / nDPI); //detect overflows
#endif
{
@@ -401,16 +400,16 @@ static long ImplPixelToLogic( long n, long nDPI, long nMapNum, long nMapDenom,
long nThres )
{
assert(nDPI > 0);
- // To "use" it...
- (void) nThres;
- if (nMapNum == 0)
- {
- return 0;
- }
+ if (nMapNum == 0)
+ {
+ return 0;
+ }
#if (SAL_TYPES_SIZEOFLONG < 8)
if( (+n < nThres) && (-n < nThres) )
n = (2 * n * nMapDenom) / (nDPI * nMapNum);
else
+#else
+ (void) nThres;
#endif
{
sal_Int64 n64 = n;