include/vcl/bitmap.hxx | 25 +++++++++++++------------
1 file changed, 13 insertions(+), 12 deletions(-)
New commits:
commit 8d6136206f26dbee773ffaea18a0f37c17e55024
Author: Noel Grandin <n...@peralex.com>
Date: Thu Nov 26 10:01:20 2015 +0200
Revert "no-one passes explicit values for these defaulted params"
This reverts commit 97978f7f015e042e72ec2bf0f3ba1652ecbcc5c5.
breaks unit test CppunitTest_sw_ooxmlimport
diff --git a/include/vcl/bitmap.hxx b/include/vcl/bitmap.hxx
index 142795b..c49b4f0 100644
--- a/include/vcl/bitmap.hxx
+++ b/include/vcl/bitmap.hxx
@@ -152,32 +152,33 @@ class VCL_DLLPUBLIC BmpFilterParam
{
public:
- BmpFilterParam() :
- meFilter( BMP_FILTER_UNKNOWN ), mnProgressStart( 0 ), mnProgressEnd( 0
) {}
+ BmpFilterParam( sal_uLong nProgressStart = 0, sal_uLong nProgressEnd = 0 )
:
+ meFilter( BMP_FILTER_UNKNOWN ), mnProgressStart( nProgressStart ),
mnProgressEnd( nProgressEnd ) {}
- BmpFilterParam( sal_uInt8 cSolarGreyThreshold) :
- meFilter( BMP_FILTER_SOLARIZE ), mnProgressStart( 0 ), mnProgressEnd(
0 ),
+ BmpFilterParam( sal_uInt8 cSolarGreyThreshold, sal_uLong nProgressStart =
0, sal_uLong nProgressEnd = 0 ) :
+ meFilter( BMP_FILTER_SOLARIZE ), mnProgressStart( nProgressStart ),
mnProgressEnd( nProgressEnd ),
mcSolarGreyThreshold( cSolarGreyThreshold ) {}
- BmpFilterParam( double nRadius) :
- meFilter( BMP_FILTER_SMOOTH ), mnProgressStart( 0 ), mnProgressEnd( 0
),
+ BmpFilterParam( double nRadius, sal_uLong nProgressStart = 0, sal_uLong
nProgressEnd = 0 ) :
+ meFilter( BMP_FILTER_SMOOTH ), mnProgressStart( nProgressStart ),
mnProgressEnd( nProgressEnd ),
mnRadius( nRadius ) {}
- BmpFilterParam( sal_uInt16 nSepiaPercent) :
- meFilter( BMP_FILTER_SEPIA ), mnProgressStart( 0 ), mnProgressEnd( 0 ),
+ BmpFilterParam( sal_uInt16 nSepiaPercent, sal_uLong nProgressStart = 0,
sal_uLong nProgressEnd = 0 ) :
+ meFilter( BMP_FILTER_SEPIA ), mnProgressStart( nProgressStart ),
mnProgressEnd( nProgressEnd ),
mnSepiaPercent( nSepiaPercent )
{
assert(nSepiaPercent<=100);
}
- BmpFilterParam( const Size& rMosaicTileSize) :
- meFilter( BMP_FILTER_MOSAIC ), mnProgressStart( 0 ), mnProgressEnd( 0 )
+ BmpFilterParam( const Size& rMosaicTileSize, sal_uLong nProgressStart = 0,
sal_uLong nProgressEnd = 0 ) :
+ meFilter( BMP_FILTER_MOSAIC ), mnProgressStart( nProgressStart ),
mnProgressEnd( nProgressEnd )
{
maMosaicTileSize.mnTileWidth = rMosaicTileSize.Width();
maMosaicTileSize.mnTileHeight= rMosaicTileSize.Height();
}
- BmpFilterParam( sal_uInt16 nEmbossAzimuthAngle100, sal_uInt16
nEmbossElevationAngle100) :
- meFilter( BMP_FILTER_EMBOSS_GREY ), mnProgressStart( 0 ),
mnProgressEnd( 0 )
+ BmpFilterParam( sal_uInt16 nEmbossAzimuthAngle100, sal_uInt16
nEmbossElevationAngle100,
+ sal_uLong nProgressStart = 0, sal_uLong nProgressEnd = 0 )
:
+ meFilter( BMP_FILTER_EMBOSS_GREY ), mnProgressStart( nProgressStart ),
mnProgressEnd( nProgressEnd )
{
maEmbossAngles.mnAzimuthAngle100 = nEmbossAzimuthAngle100;
maEmbossAngles.mnElevationAngle100 = nEmbossElevationAngle100;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
