diff options
| author | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-01-21 21:20:03 +0100 |
|---|---|---|
| committer | Jochen Nitschke <j.nitschke+logerrit@ok.de> | 2017-01-21 22:41:29 +0000 |
| commit | 8be77aaea168684f48150c821485cb86a2578de2 (patch) | |
| tree | c0156248cdb47076fa60fe5f18e2838366992699 /filter | |
| parent | 77fef04a3d0e62a29eb316d0792bc8b97fd0d646 (diff) | |
cppcheck: funcArgOrderDifferent
fixes
> Function 'Writer' argument order different:
> declaration 'nDocWidthInput, nDocHeightInput, nDocWidth,
> nDocHeight, nJPEGcompressMode'
> definition 'nTWIPWidthOutput, nTWIPHeightOutput, nDocWidthInput,
> nDocHeightInput, nJPEGcompressMode'
use arguments in initializer list
Change-Id: I746da5ef237b62a983df6745e1704342bcea5f9d
Reviewed-on: https://gerrit.libreoffice.org/33381
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Jochen Nitschke <j.nitschke+logerrit@ok.de>
Diffstat (limited to 'filter')
| -rw-r--r-- | filter/source/flash/swfwriter.cxx | 17 | ||||
| -rw-r--r-- | filter/source/flash/swfwriter.hxx | 2 |
2 files changed, 8 insertions, 11 deletions
diff --git a/filter/source/flash/swfwriter.cxx b/filter/source/flash/swfwriter.cxx index 1cd87e5ac097..91cd5e47f9a4 100644 --- a/filter/source/flash/swfwriter.cxx +++ b/filter/source/flash/swfwriter.cxx @@ -38,11 +38,16 @@ static sal_Int32 map100thmm( sal_Int32 n100thMM ) } -Writer::Writer( sal_Int32 nTWIPWidthOutput, sal_Int32 nTWIPHeightOutput, sal_Int32 nDocWidthInput, sal_Int32 nDocHeightInput, sal_Int32 nJPEGcompressMode ) -: mpClipPolyPolygon( nullptr ), +Writer::Writer( sal_Int32 nTWIPWidthOutput, sal_Int32 nTWIPHeightOutput, sal_Int32 nDocWidth, sal_Int32 nDocHeight, sal_Int32 nJPEGcompressMode ) +: mnDocWidth( map100thmm(nDocWidth) ), + mnDocHeight( map100thmm(nDocHeight) ), + mnDocXScale( (double)nTWIPWidthOutput / mnDocWidth ), + mnDocYScale( (double)nTWIPHeightOutput / mnDocHeight ), + mpClipPolyPolygon( nullptr ), mpTag( nullptr ), mpSprite( nullptr ), mnNextId( 1 ), + mnFrames( 0 ), mnGlobalTransparency(0), mnJPEGCompressMode(nJPEGcompressMode) { @@ -54,14 +59,6 @@ Writer::Writer( sal_Int32 nTWIPWidthOutput, sal_Int32 nTWIPHeightOutput, sal_Int mpMovieStream = maMovieTempFile.GetStream( StreamMode::WRITE|StreamMode::TRUNC ); mpFontsStream = maFontsTempFile.GetStream( StreamMode::WRITE|StreamMode::TRUNC ); - mnFrames = 0; - - mnDocWidth = map100thmm( nDocWidthInput ); - mnDocHeight = map100thmm( nDocHeightInput ); - - mnDocXScale = (double)nTWIPWidthOutput / mnDocWidth; - mnDocYScale = (double)nTWIPHeightOutput / mnDocHeight; - // define an invisible button with the size of a page Rectangle aRect( 0, 0, (long)( mnDocWidth * mnDocXScale ), (long)( mnDocHeight * mnDocYScale ) ); tools::Polygon aPoly( aRect ); diff --git a/filter/source/flash/swfwriter.hxx b/filter/source/flash/swfwriter.hxx index 0cbcb019e5f3..f9425162f365 100644 --- a/filter/source/flash/swfwriter.hxx +++ b/filter/source/flash/swfwriter.hxx @@ -247,7 +247,7 @@ public: An invisible shape with the size of the document is placed at depth 1 and it clips all shapes on depth 2 and 3. */ - Writer( sal_Int32 nDocWidthInput, sal_Int32 nDocHeightInput, sal_Int32 nDocWidth, sal_Int32 nDocHeight, sal_Int32 nJPEGcompressMode ); + Writer( sal_Int32 nTWIPWidthOutput, sal_Int32 nTWIPHeightOutput, sal_Int32 nDocWidth, sal_Int32 nDocHeight, sal_Int32 nJPEGcompressMode ); ~Writer(); void storeTo( css::uno::Reference< css::io::XOutputStream > &xOutStream ); |