summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2012-02-27 20:43:27 +0100
committerMichael Stahl <mstahl@redhat.com>2012-02-27 20:45:05 +0100
commitf430b71c46186b53a6364a60b237c81245f3eabb (patch)
tree688992fe1c9b87384847a9e0a1510663fdd5aa74
parentebb74441790a9852b1a1532d6e025c324666f6fc (diff)
SwSectionFrm: initialised members are happy members
Valgrind complained about uninitialised use in SwSectionFrm::_CheckClipping (sectfrm.cxx:1111).
-rw-r--r--sw/source/core/inc/sectfrm.hxx2
-rw-r--r--sw/source/core/layout/sectfrm.cxx13
2 files changed, 10 insertions, 5 deletions
diff --git a/sw/source/core/inc/sectfrm.hxx b/sw/source/core/inc/sectfrm.hxx
index f9a080513867..9bbe9f943420 100644
--- a/sw/source/core/inc/sectfrm.hxx
+++ b/sw/source/core/inc/sectfrm.hxx
@@ -71,7 +71,7 @@ protected:
public:
SwSectionFrm( SwSection &, SwFrm* ); //Inhalt wird nicht erzeugt!
SwSectionFrm( SwSectionFrm &, sal_Bool bMaster );//_Nur_ zum Erzeugen von Master/Follows
- ~SwSectionFrm();
+ virtual ~SwSectionFrm();
void Init();
virtual void CheckDirection( sal_Bool bVert );
diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx
index ef1f3793fcb5..63f2bbdaa1c2 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -71,10 +71,15 @@ SV_IMPL_PTRARR_SORT( SwDestroyList, SwSectionFrmPtr )
|* SwSectionFrm::SwSectionFrm(), ~SwSectionFrm()
|*
|*************************************************************************/
-SwSectionFrm::SwSectionFrm( SwSection &rSect, SwFrm* pSib ) :
- SwLayoutFrm( rSect.GetFmt(), pSib ),
- SwFlowFrm( (SwFrm&)*this ),
- pSection( &rSect )
+SwSectionFrm::SwSectionFrm( SwSection &rSect, SwFrm* pSib )
+ : SwLayoutFrm( rSect.GetFmt(), pSib )
+ , SwFlowFrm( static_cast<SwFrm&>(*this) )
+ , pSection( &rSect )
+ , bFtnAtEnd(false)
+ , bEndnAtEnd(false)
+ , bCntntLock(false)
+ , bOwnFtnNum(false)
+ , bFtnLock(false)
{
nType = FRMC_SECTION;