summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-02-19 09:39:01 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-02-19 09:39:01 +0000
commitdf889fb50b1a6e52de054847943a34d56ce75221 (patch)
tree72fc24415e8ab8f289f005de45ab334ee0130eef
parentf49a97af3ec737f2465c18e6b682f2b495d9c43a (diff)
coverity#738901 Uninitialized scalar field
Change-Id: If11660802f7c37017aa60bf85be6d77ea6c63f40
-rw-r--r--sw/source/ui/docvw/edtwin.cxx18
-rw-r--r--sw/source/ui/inc/edtwin.hxx16
2 files changed, 24 insertions, 10 deletions
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index af7987532ee4..47c17bf4c316 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -4878,11 +4878,25 @@ SwEditWin::SwEditWin(Window *pParent, SwView &rMyView):
m_nDropAction( 0 ),
m_nDropDestination( 0 ),
+ m_eBezierMode(SID_BEZIER_INSERT),
m_nInsFrmColCount( 1 ),
m_eDrawMode(OBJ_NONE),
- m_bLockInput(sal_False),
- m_bObjectSelect( sal_False ),
+ m_bMBPressed(false),
+ m_bInsDraw(false),
+ m_bInsFrm(false),
+ m_bIsInMove(false),
+ m_bIsInDrag(false),
+ m_bOldIdle(false),
+ m_bOldIdleSet(false),
+ m_bTblInsDelMode(false),
+ m_bTblIsInsMode(false),
+ m_bChainMode(false),
+ m_bWasShdwCrsr(false),
+ m_bLockInput(false),
+ m_bIsRowDrag(false),
+ m_bUseInputLanguage(false),
+ m_bObjectSelect(false),
m_nKS_NUMDOWN_Count(0),
m_nKS_NUMINDENTINC_Count(0),
m_aFrameControlsManager( this )
diff --git a/sw/source/ui/inc/edtwin.hxx b/sw/source/ui/inc/edtwin.hxx
index 934c3f7aedd4..3d16206d9112 100644
--- a/sw/source/ui/inc/edtwin.hxx
+++ b/sw/source/ui/inc/edtwin.hxx
@@ -111,12 +111,12 @@ friend void PageNumNotify( SwViewShell* pVwSh,
int m_aActHitType; // current mouse pointer
- sal_uLong m_nDropFormat; // format from the last QueryDrop
- sal_uInt16 m_nDropAction; // action from the last QueryDrop
- sal_uInt16 m_nDropDestination; // destination from the last QueryDrop
+ sal_uLong m_nDropFormat; // format from the last QueryDrop
+ sal_uInt16 m_nDropAction; // action from the last QueryDrop
+ sal_uInt16 m_nDropDestination; // destination from the last QueryDrop
- sal_uInt16 m_eBezierMode;
- sal_uInt16 m_nInsFrmColCount; // column number for interactive frame
+ sal_uInt16 m_eBezierMode;
+ sal_uInt16 m_nInsFrmColCount; // column number for interactive frame
SdrObjKind m_eDrawMode;
sal_Bool m_bMBPressed : 1,
m_bInsDraw : 1,
@@ -232,13 +232,13 @@ public:
inline void SetSdrDrawMode( SdrObjKind eSdrObjectKind ) { m_eDrawMode = eSdrObjectKind; SetObjectSelect( sal_False ); }
void StdDrawMode( SdrObjKind eSdrObjectKind, sal_Bool bObjSelect );
- sal_Bool IsFrmAction() { return (m_bInsFrm); }
- inline sal_uInt16 GetBezierMode() { return m_eBezierMode; }
+ bool IsFrmAction() const { return (m_bInsFrm); }
+ sal_uInt16 GetBezierMode() const { return m_eBezierMode; }
void SetBezierMode(sal_uInt16 eBezMode) { m_eBezierMode = eBezMode; }
void EnterDrawTextMode(const Point& aDocPos); // turn on DrawTextEditMode
void InsFrm(sal_uInt16 nCols);
void StopInsFrm();
- sal_uInt16 GetFrmColCount() const {return m_nInsFrmColCount;} // column number for interactive frame
+ sal_uInt16 GetFrmColCount() const {return m_nInsFrmColCount;} // column number for interactive frame
void SetChainMode( sal_Bool bOn );