Kaydet (Commit) 8d613620 authored tarafından Noel Grandin's avatar Noel Grandin

Revert "no-one passes explicit values for these defaulted params"

This reverts commit 97978f7f.

breaks unit test CppunitTest_sw_ooxmlimport
üst c13f5bc2
...@@ -152,32 +152,33 @@ class VCL_DLLPUBLIC BmpFilterParam ...@@ -152,32 +152,33 @@ class VCL_DLLPUBLIC BmpFilterParam
{ {
public: public:
BmpFilterParam() : BmpFilterParam( sal_uLong nProgressStart = 0, sal_uLong nProgressEnd = 0 ) :
meFilter( BMP_FILTER_UNKNOWN ), mnProgressStart( 0 ), mnProgressEnd( 0 ) {} meFilter( BMP_FILTER_UNKNOWN ), mnProgressStart( nProgressStart ), mnProgressEnd( nProgressEnd ) {}
BmpFilterParam( sal_uInt8 cSolarGreyThreshold) : BmpFilterParam( sal_uInt8 cSolarGreyThreshold, sal_uLong nProgressStart = 0, sal_uLong nProgressEnd = 0 ) :
meFilter( BMP_FILTER_SOLARIZE ), mnProgressStart( 0 ), mnProgressEnd( 0 ), meFilter( BMP_FILTER_SOLARIZE ), mnProgressStart( nProgressStart ), mnProgressEnd( nProgressEnd ),
mcSolarGreyThreshold( cSolarGreyThreshold ) {} mcSolarGreyThreshold( cSolarGreyThreshold ) {}
BmpFilterParam( double nRadius) : BmpFilterParam( double nRadius, sal_uLong nProgressStart = 0, sal_uLong nProgressEnd = 0 ) :
meFilter( BMP_FILTER_SMOOTH ), mnProgressStart( 0 ), mnProgressEnd( 0 ), meFilter( BMP_FILTER_SMOOTH ), mnProgressStart( nProgressStart ), mnProgressEnd( nProgressEnd ),
mnRadius( nRadius ) {} mnRadius( nRadius ) {}
BmpFilterParam( sal_uInt16 nSepiaPercent) : BmpFilterParam( sal_uInt16 nSepiaPercent, sal_uLong nProgressStart = 0, sal_uLong nProgressEnd = 0 ) :
meFilter( BMP_FILTER_SEPIA ), mnProgressStart( 0 ), mnProgressEnd( 0 ), meFilter( BMP_FILTER_SEPIA ), mnProgressStart( nProgressStart ), mnProgressEnd( nProgressEnd ),
mnSepiaPercent( nSepiaPercent ) mnSepiaPercent( nSepiaPercent )
{ {
assert(nSepiaPercent<=100); assert(nSepiaPercent<=100);
} }
BmpFilterParam( const Size& rMosaicTileSize) : BmpFilterParam( const Size& rMosaicTileSize, sal_uLong nProgressStart = 0, sal_uLong nProgressEnd = 0 ) :
meFilter( BMP_FILTER_MOSAIC ), mnProgressStart( 0 ), mnProgressEnd( 0 ) meFilter( BMP_FILTER_MOSAIC ), mnProgressStart( nProgressStart ), mnProgressEnd( nProgressEnd )
{ {
maMosaicTileSize.mnTileWidth = rMosaicTileSize.Width(); maMosaicTileSize.mnTileWidth = rMosaicTileSize.Width();
maMosaicTileSize.mnTileHeight= rMosaicTileSize.Height(); maMosaicTileSize.mnTileHeight= rMosaicTileSize.Height();
} }
BmpFilterParam( sal_uInt16 nEmbossAzimuthAngle100, sal_uInt16 nEmbossElevationAngle100) : BmpFilterParam( sal_uInt16 nEmbossAzimuthAngle100, sal_uInt16 nEmbossElevationAngle100,
meFilter( BMP_FILTER_EMBOSS_GREY ), mnProgressStart( 0 ), mnProgressEnd( 0 ) sal_uLong nProgressStart = 0, sal_uLong nProgressEnd = 0 ) :
meFilter( BMP_FILTER_EMBOSS_GREY ), mnProgressStart( nProgressStart ), mnProgressEnd( nProgressEnd )
{ {
maEmbossAngles.mnAzimuthAngle100 = nEmbossAzimuthAngle100; maEmbossAngles.mnAzimuthAngle100 = nEmbossAzimuthAngle100;
maEmbossAngles.mnElevationAngle100 = nEmbossElevationAngle100; maEmbossAngles.mnElevationAngle100 = nEmbossElevationAngle100;
......
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