[Libreoffice-commits] core.git: sd/source

[Julien Nabet]

 sd/source/filter/eppt/pptx-epptbase.cxx |   27 ++++++++++++++++-----------
 1 file changed, 16 insertions(+), 11 deletions(-)

New commits:
commit 02d58eb6e07599e48d53a40be225fa31c663640a
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sun Jun 16 21:29:10 2013 +0200

    cppcheck: fix uninitMemberVar + remove macro
    
    Change-Id: Ifce036595a8a5e95406c8a1752dbb77cfe735a3e

diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx
index 7f829e9..d19dad7 100644
--- a/sd/source/filter/eppt/pptx-epptbase.cxx
+++ b/sd/source/filter/eppt/pptx-epptbase.cxx
@@ -129,24 +129,29 @@ static PHLayout pPHLayout[] =
     { EPP_LAYOUT_2COLUMNSANDTITLE,      { 0x0d, 0x16, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00 }, 0x16, 0x0d, 0x12, sal_True, sal_True, sal_False }
 };
 
-#define PPT_WRITER_BASE_INIT_VALUES \
-    maFraction              ( 1, 576 ), \
-    maMapModeSrc            ( MAP_100TH_MM ), \
-    maMapModeDest           ( MAP_INCH, Point(), maFraction, maFraction ), \
-    meLatestPageType        ( NORMAL )
-
 PPTWriterBase::PPTWriterBase() :
-    PPT_WRITER_BASE_INIT_VALUES
+    mXModel (0),
+    mXStatusIndicator (0),
+    mbStatusIndicator (false),
+    maFraction (1, 576),
+    maMapModeSrc (MAP_100TH_MM),
+    maMapModeDest (MAP_INCH, Point(), maFraction, maFraction),
+    meLatestPageType (NORMAL),
+    mpStyleSheet (0)
 {
     DBG(printf ("PPTWriterBase::PPTWriterBase()\n"));
 }
 
 PPTWriterBase::PPTWriterBase( const Reference< XModel > & rXModel,
                               const Reference< XStatusIndicator > & rXStatInd ) :
-    mXModel                 ( rXModel ),
-    mXStatusIndicator       ( rXStatInd ),
-    mbStatusIndicator       ( false ),
-    PPT_WRITER_BASE_INIT_VALUES
+    mXModel (rXModel),
+    mXStatusIndicator (rXStatInd),
+    mbStatusIndicator (false),
+    maFraction (1, 576),
+    maMapModeSrc (MAP_100TH_MM),
+    maMapModeDest (MAP_INCH, Point(), maFraction, maFraction),
+    meLatestPageType (NORMAL),
+    mpStyleSheet (0)
 {
 }