diff options
author | sj <sj@openoffice.org> | 2010-08-26 11:18:29 +0200 |
---|---|---|
committer | sj <sj@openoffice.org> | 2010-08-26 11:18:29 +0200 |
commit | c67e63ceaacf2af96fdc1a32584629e89bf083d8 (patch) | |
tree | 6f9cb0376cbc877944166dbe309baa54a46b3c30 | |
parent | c2823b2321863724e0357c10f23a24cb8021073d (diff) |
impress186: #i4499# fixed compile error
-rwxr-xr-x | svtools/source/filter.vcl/filter/exportdialog.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/svtools/source/filter.vcl/filter/exportdialog.cxx b/svtools/source/filter.vcl/filter/exportdialog.cxx index 94e778c9be84..c04b587b6278 100755 --- a/svtools/source/filter.vcl/filter/exportdialog.cxx +++ b/svtools/source/filter.vcl/filter/exportdialog.cxx @@ -1226,23 +1226,23 @@ void ExportDialog::updatePreview() Size aSize; if ( fXRatio > 1.0 ) { - aSize.Width() = ::std::max( maSize.Width, aFixedBitmapSize.Width() ); + aSize.Width() = maSize.Width > aFixedBitmapSize.Width() ? maSize.Width : aFixedBitmapSize.Width(); aSize.Width() /= fXRatio; } else { - aSize.Width() = ::std::min( maSize.Width, aFixedBitmapSize.Width() ); + aSize.Width() = maSize.Width < aFixedBitmapSize.Width() ? maSize.Width : aFixedBitmapSize.Width(); aSize.Width() /= fXRatio; } if ( fYRatio > 1.0 ) { - aSize.Height() = ::std::max( maSize.Height, aFixedBitmapSize.Height() ); + aSize.Height() = maSize.Height > aFixedBitmapSize.Height() ? maSize.Height : aFixedBitmapSize.Height(); aSize.Height() /= fYRatio; } else { - aSize.Height() = ::std::min( maSize.Height, aFixedBitmapSize.Height() ); + aSize.Height() = maSize.Height < aFixedBitmapSize.Height() ? maSize.Height : aFixedBitmapSize.Height(); aSize.Height() /= fYRatio; } |