Kaydet (Commit) 8be77aae authored tarafından Jochen Nitschke's avatar Jochen Nitschke

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/33381Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarJochen Nitschke <j.nitschke+logerrit@ok.de>
üst 77fef04a
...@@ -38,11 +38,16 @@ static sal_Int32 map100thmm( sal_Int32 n100thMM ) ...@@ -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 ) Writer::Writer( sal_Int32 nTWIPWidthOutput, sal_Int32 nTWIPHeightOutput, sal_Int32 nDocWidth, sal_Int32 nDocHeight, sal_Int32 nJPEGcompressMode )
: mpClipPolyPolygon( nullptr ), : mnDocWidth( map100thmm(nDocWidth) ),
mnDocHeight( map100thmm(nDocHeight) ),
mnDocXScale( (double)nTWIPWidthOutput / mnDocWidth ),
mnDocYScale( (double)nTWIPHeightOutput / mnDocHeight ),
mpClipPolyPolygon( nullptr ),
mpTag( nullptr ), mpTag( nullptr ),
mpSprite( nullptr ), mpSprite( nullptr ),
mnNextId( 1 ), mnNextId( 1 ),
mnFrames( 0 ),
mnGlobalTransparency(0), mnGlobalTransparency(0),
mnJPEGCompressMode(nJPEGcompressMode) mnJPEGCompressMode(nJPEGcompressMode)
{ {
...@@ -54,14 +59,6 @@ Writer::Writer( sal_Int32 nTWIPWidthOutput, sal_Int32 nTWIPHeightOutput, sal_Int ...@@ -54,14 +59,6 @@ Writer::Writer( sal_Int32 nTWIPWidthOutput, sal_Int32 nTWIPHeightOutput, sal_Int
mpMovieStream = maMovieTempFile.GetStream( StreamMode::WRITE|StreamMode::TRUNC ); mpMovieStream = maMovieTempFile.GetStream( StreamMode::WRITE|StreamMode::TRUNC );
mpFontsStream = maFontsTempFile.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 // define an invisible button with the size of a page
Rectangle aRect( 0, 0, (long)( mnDocWidth * mnDocXScale ), (long)( mnDocHeight * mnDocYScale ) ); Rectangle aRect( 0, 0, (long)( mnDocWidth * mnDocXScale ), (long)( mnDocHeight * mnDocYScale ) );
tools::Polygon aPoly( aRect ); tools::Polygon aPoly( aRect );
......
...@@ -247,7 +247,7 @@ public: ...@@ -247,7 +247,7 @@ public:
An invisible shape with the size of the document is placed at depth 1 An invisible shape with the size of the document is placed at depth 1
and it clips all shapes on depth 2 and 3. 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(); ~Writer();
void storeTo( css::uno::Reference< css::io::XOutputStream > &xOutStream ); void storeTo( css::uno::Reference< css::io::XOutputStream > &xOutStream );
......
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