sw/inc/crsrsh.hxx | 3 ++- sw/source/core/crsr/crsrsh.cxx | 9 ++++----- 2 files changed, 6 insertions(+), 6 deletions(-)
New commits: commit f1d303c63e857109253b98d9c32202d2c53e8747 Author: Stephan Bergmann <sberg...@redhat.com> Date: Mon Dec 2 13:38:09 2013 +0100 Uninitialized value Change-Id: I060fb2f8dda4a79b70e2fdf255e95b47b0d5630b diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index 0e3c06b..160ae4d 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -230,6 +230,8 @@ private: bool m_bMacroExecAllowed : 1; + SwFrm* m_oldColFrm; + SW_DLLPRIVATE void UpdateCrsr( sal_uInt16 eFlags = SwCrsrShell::SCROLLWIN|SwCrsrShell::CHKRANGE, sal_Bool bIdleEnd = sal_False ); @@ -825,7 +827,6 @@ public: sal_Bool IsInRightToLeftText( const Point* pPt = 0 ) const; void FirePageChangeEvent(sal_uInt16 nOldPage, sal_uInt16 nNewPage); - SwFrm* oldColFrm; bool bColumnChange(); void FireSectionChangeEvent(sal_uInt16 nOldSection, sal_uInt16 nNewSection); void FireColumnChangeEvent(sal_uInt16 nOldColumn, sal_uInt16 nNewColumn); diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index cab3dec..b6e0c32 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -491,11 +491,11 @@ bool SwCrsrShell::bColumnChange() } } - if(oldColFrm == pCurrCol) + if(m_oldColFrm == pCurrCol) return sal_False; else { - oldColFrm = pCurrCol; + m_oldColFrm = pCurrCol; return sal_True; } } @@ -2581,7 +2581,7 @@ SwCrsrShell::SwCrsrShell( SwCrsrShell& rShell, Window *pInitWin ) m_pBoxIdx( 0 ), m_pBoxPtr( 0 ), m_nCrsrMove( 0 ), m_nBasicActionCnt( 0 ), m_eMvState( MV_NONE ), m_sMarkedListId(), - m_nMarkedListLevel( 0 ) + m_nMarkedListLevel( 0 ), m_oldColFrm(0) { SET_CURR_SHELL( this ); // only keep the position of the current cursor of the copy shell @@ -2596,7 +2596,6 @@ SwCrsrShell::SwCrsrShell( SwCrsrShell& rShell, Window *pInitWin ) m_bSetCrsrInReadOnly = sal_True; m_pVisCrsr = new SwVisCrsr( this ); m_bMacroExecAllowed = rShell.IsMacroExecAllowed(); - oldColFrm = NULL; #if defined(ANDROID) || defined(IOS) HideCrsr(); @@ -2611,7 +2610,7 @@ SwCrsrShell::SwCrsrShell( SwDoc& rDoc, Window *pInitWin, m_pBoxIdx( 0 ), m_pBoxPtr( 0 ), m_nCrsrMove( 0 ), m_nBasicActionCnt( 0 ), m_eMvState( MV_NONE ), // state for crsr-travelling - GetCrsrOfst m_sMarkedListId(), - m_nMarkedListLevel( 0 ) + m_nMarkedListLevel( 0 ), m_oldColFrm(0) { SET_CURR_SHELL( this ); // create initial cursor and set it to first content position _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits