filter/source/flash/swfwriter.cxx | 17 +++++++----------
filter/source/flash/swfwriter.hxx | 2 +-
2 files changed, 8 insertions(+), 11 deletions(-)
New commits:
commit 8be77aaea168684f48150c821485cb86a2578de2
Author: Jochen Nitschke <j.nitschke+loger...@ok.de>
Date: Sat Jan 21 21:20:03 2017 +0100
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 <c...@libreoffice.org>
Reviewed-by: Jochen Nitschke <j.nitschke+loger...@ok.de>
diff --git a/filter/source/flash/swfwriter.cxx
b/filter/source/flash/swfwriter.cxx
index 1cd87e5..91cd5e4 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 0cbcb01..f942516 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 );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
