[Libreoffice-commits] .: sw/source

[Julien Nabet]

 sw/source/core/text/inftxt.hxx |    4 ++--
 sw/source/core/text/txtfly.hxx |   13 +++----------
 2 files changed, 5 insertions(+), 12 deletions(-)

New commits:
commit c9ea543a6ffbabf9827aa10974703c1fe6434325
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Sun Feb 20 15:05:44 2011 +0100

    Some cppcheck cleaning

diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx
index 1fefd00..a0b5985 100644
--- a/sw/source/core/text/inftxt.hxx
+++ b/sw/source/core/text/inftxt.hxx
@@ -152,7 +152,7 @@ class SwTxtInfo
     xub_StrLen nTxtStart;				  // TxtOfst bei Follows
 
 protected:
-    inline SwTxtInfo() { }
+    inline SwTxtInfo() : pPara(0) {}
 public:
     void CtorInitTxtInfo( SwTxtFrm *pFrm );
     SwTxtInfo( const SwTxtInfo &rInf );
@@ -216,7 +216,7 @@ protected:
     void CtorInitTxtSizeInfo( SwTxtFrm *pFrm, SwFont *pFnt = 0,
                    const xub_StrLen nIdx = 0,
                    const xub_StrLen nLen = STRING_LEN );
-    SwTxtSizeInfo() {}
+    SwTxtSizeInfo() : pKanaComp(0), pVsh(0), pOut(0), pRef(0), pFnt(0), pUnderFnt(0), pFrm(0), pOpt(0), pTxt(0) {}
 public:
     SwTxtSizeInfo( const SwTxtSizeInfo &rInf );
     SwTxtSizeInfo( const SwTxtSizeInfo &rInf, const XubString &rTxt,
diff --git a/sw/source/core/text/txtfly.hxx b/sw/source/core/text/txtfly.hxx
index d822c7d..82f78c3 100644
--- a/sw/source/core/text/txtfly.hxx
+++ b/sw/source/core/text/txtfly.hxx
@@ -82,7 +82,7 @@ class SwContourCache
 public:
     SwContourCache();
     ~SwContourCache();
-    const SdrObject* GetObject( MSHORT nPos ){ return pSdrObj[ nPos ]; }
+    const SdrObject* GetObject( MSHORT nPos ) const{ return pSdrObj[ nPos ]; }
     MSHORT GetCount() const { return nObjCnt; }
     void ClrObject( MSHORT nPos );
     static const SwRect CalcBoundRect( const SwAnchoredObject* pAnchoredObj,
@@ -143,15 +143,8 @@ class SwTxtFly
     const SwCntntFrm* _GetMaster();
 
 public:
-    inline SwTxtFly()
-    {
-        mbIgnoreCurrentFrame = sal_False;
-        mbIgnoreCurrentFrame = sal_False;
-        mbIgnoreObjsInHeaderFooter = sal_False;
-        mpCurrAnchoredObj = 0;
-        mpAnchoredObjList = 0;
-        pMaster = 0;
-    }
+    inline SwTxtFly() : pPage(0), mpCurrAnchoredObj(0), pCurrFrm(0), pMaster(0), mpAnchoredObjList(0), nMinBottom(0), nNextTop(0),
+    nIndex(0) {}
     inline SwTxtFly( const SwTxtFrm *pFrm )
         { CtorInitTxtFly( pFrm ); }