diff options
author | Philipp Riemer <ruderphilipp@gmail.com> | 2012-07-09 04:14:47 +0200 |
---|---|---|
committer | Philipp Riemer <ruderphilipp@gmail.com> | 2013-09-07 23:25:37 +0000 |
commit | 9349f5cd7ffdf10d5be3644762d888c0fdd8ccb4 (patch) | |
tree | c63b6b36443c3a27c099b0e5eac61b917274bf9a /sw/source | |
parent | 3a33d89c9728e8947f60bc6b574bf876875dc507 (diff) |
add/remove blank lines and braces (in sw/source/core/crsr/)
Change-Id: I4dea8ea84d83c28eb258d0e8ddc2966476a50223
Reviewed-on: https://gerrit.libreoffice.org/272
Reviewed-by: Philipp Riemer <ruderphilipp@gmail.com>
Tested-by: Philipp Riemer <ruderphilipp@gmail.com>
Diffstat (limited to 'sw/source')
-rw-r--r-- | sw/source/core/crsr/BlockCursor.cxx | 1 | ||||
-rw-r--r-- | sw/source/core/crsr/bookmrk.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/crsr/callnk.cxx | 4 | ||||
-rw-r--r-- | sw/source/core/crsr/crbm.cxx | 3 | ||||
-rw-r--r-- | sw/source/core/crsr/crsrsh.cxx | 13 | ||||
-rw-r--r-- | sw/source/core/crsr/crstrvl.cxx | 3 | ||||
-rw-r--r-- | sw/source/core/crsr/crstrvl1.cxx | 6 | ||||
-rw-r--r-- | sw/source/core/crsr/findattr.cxx | 10 | ||||
-rw-r--r-- | sw/source/core/crsr/findcoll.cxx | 1 | ||||
-rw-r--r-- | sw/source/core/crsr/findtxt.cxx | 6 | ||||
-rw-r--r-- | sw/source/core/crsr/pam.cxx | 6 | ||||
-rw-r--r-- | sw/source/core/crsr/swcrsr.cxx | 10 | ||||
-rw-r--r-- | sw/source/core/crsr/trvlfnfl.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/crsr/trvlreg.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/crsr/trvltbl.cxx | 5 | ||||
-rw-r--r-- | sw/source/core/crsr/unocrsr.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/crsr/viscrs.cxx | 4 |
17 files changed, 31 insertions, 49 deletions
diff --git a/sw/source/core/crsr/BlockCursor.cxx b/sw/source/core/crsr/BlockCursor.cxx index 5edbd9f11e58..9c7f44359041 100644 --- a/sw/source/core/crsr/BlockCursor.cxx +++ b/sw/source/core/crsr/BlockCursor.cxx @@ -31,6 +31,7 @@ class SwBlockCursor : public IBlockCursor SwShellCrsr aCursor; Point *pStartPt; Point *pEndPt; + public: SwBlockCursor( const SwCrsrShell& rCrsrSh, const SwPosition &rPos ) : aCursor( rCrsrSh, rPos ), pStartPt(0), pEndPt(0) {} diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx index e67b5dc291a9..11e62108b71e 100644 --- a/sw/source/core/crsr/bookmrk.cxx +++ b/sw/source/core/crsr/bookmrk.cxx @@ -66,6 +66,7 @@ namespace { SwPosition& rStart = pField->GetMarkStart(); SwPosition& rEnd = pField->GetMarkEnd(); + SwTxtNode const*const pStartTxtNode = rStart.nNode.GetNode().GetTxtNode(); SwTxtNode const*const pEndTxtNode = rEnd.nNode.GetNode().GetTxtNode(); @@ -76,6 +77,7 @@ namespace const sal_Unicode ch_end = pEndTxtNode->GetTxt()[nEndPos]; SwPaM aStartPaM(rStart); SwPaM aEndPaM(rEnd); + io_pDoc->GetIDocumentUndoRedo().StartUndo(UNDO_UI_REPLACE, NULL); if( ( ch_start != aStartMark ) && ( aEndMark != CH_TXT_ATR_FORMELEMENT ) ) { diff --git a/sw/source/core/crsr/callnk.cxx b/sw/source/core/crsr/callnk.cxx index 0ac66f5f7d1b..04f616bb3978 100644 --- a/sw/source/core/crsr/callnk.cxx +++ b/sw/source/core/crsr/callnk.cxx @@ -18,7 +18,6 @@ */ #include <hintids.hxx> - #include <com/sun/star/i18n/ScriptType.hpp> #include <fmtcntnt.hxx> #include <txatbase.hxx> @@ -35,7 +34,6 @@ #include <ndtxt.hxx> #include <flyfrm.hxx> #include <breakit.hxx> - #include<vcl/window.hxx> SwCallLink::SwCallLink( SwCrsrShell & rSh, sal_uLong nAktNode, xub_StrLen nAktCntnt, @@ -162,9 +160,9 @@ SwCallLink::~SwCallLink() { if( nCmp == nAktCntnt && pCurCrsr->HasMark() ) // left & select ++nCmp; + if ( ((SwTxtNode*)pCNd)->HasHints() ) { - const SwpHints &rHts = ((SwTxtNode*)pCNd)->GetSwpHints(); sal_uInt16 n; xub_StrLen nStart; diff --git a/sw/source/core/crsr/crbm.cxx b/sw/source/core/crsr/crbm.cxx index ba96a352bd3e..219d8607b0d1 100644 --- a/sw/source/core/crsr/crbm.cxx +++ b/sw/source/core/crsr/crbm.cxx @@ -20,7 +20,6 @@ #include "crsrsh.hxx" #include "ndtxt.hxx" #include <docary.hxx> - #include "IMark.hxx" #include "callnk.hxx" #include "swcrsr.hxx" @@ -110,6 +109,7 @@ bool SwCrsrShell::GotoMark(const ::sw::mark::IMark* const pMark, bool bAtStart) *(aCrsrSt.m_pCrsr)->GetPoint() = pMark->GetMarkStart(); else *(aCrsrSt.m_pCrsr)->GetPoint() = pMark->GetMarkEnd(); + if(aCrsrSt.RollbackIfIllegal()) return false; UpdateCrsr(SwCrsrShell::SCROLLWIN|SwCrsrShell::CHKRANGE|SwCrsrShell::READONLY); @@ -239,6 +239,7 @@ bool SwCrsrShell::GotoFieldmark(::sw::mark::IFieldmark const * const pMark) aCrsrSt.SetCrsrToMark(pMark); aCrsrSt.m_pCrsr->GetPoint()->nContent++; aCrsrSt.m_pCrsr->GetMark()->nContent--; + if(aCrsrSt.RollbackIfIllegal()) return false; UpdateCrsr(SwCrsrShell::SCROLLWIN|SwCrsrShell::CHKRANGE|SwCrsrShell::READONLY); diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index 56134b1e3b5a..f9aa315cc7e8 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -19,10 +19,10 @@ #include <com/sun/star/util/SearchOptions.hpp> #include <com/sun/star/text/XTextRange.hpp> + #include <hintids.hxx> #include <svx/svdmodel.hxx> #include <editeng/frmdiritem.hxx> - #include <SwSmartTagMgr.hxx> #include <doc.hxx> #include <rootfrm.hxx> @@ -57,7 +57,6 @@ #include <vcl/svapp.hxx> #include <numrule.hxx> #include <IGrammarContact.hxx> - #include <globals.hrc> #include <comcore.hrc> @@ -111,6 +110,7 @@ void CheckRange( SwCursor* pCurCrsr ) // ----------- // SwCrsrShell // ----------- + SwPaM * SwCrsrShell::CreateCrsr() { // don't create Crsr in a table Selection (sic!) @@ -375,6 +375,7 @@ sal_Bool SwCrsrShell::LeftRight( sal_Bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMo { UpdateCrsr(); } + return bRet; } @@ -754,7 +755,6 @@ int SwCrsrShell::SetCrsr( const Point &rLPt, sal_Bool bOnlyText, bool bBlock ) } } } - return bRet; } @@ -1046,7 +1046,6 @@ void SwCrsrShell::GetPageNum( sal_uInt16 &rnPhyNum, sal_uInt16 &rnVirtNum, sal_uInt16 SwCrsrShell::GetNextPrevPageNum( sal_Bool bNext ) { SET_CURR_SHELL( this ); - // page number: first visible page or the one at the cursor const SwPageFrm *pPg = Imp()->GetFirstVisPage(); if( pPg ) @@ -1126,7 +1125,6 @@ sal_Bool SwCrsrShell::GoPrevCrsr() UpdateCrsr(); m_pCurCrsr->Show(); } - return sal_True; } @@ -1271,10 +1269,10 @@ class SwNotifyAccAboutInvalidTextSelections mrCrsrSh.InvalidateAccessibleParaTextSelection(); } }; + void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool bIdleEnd ) { SET_CURR_SHELL( this ); - ClearUpCrsrs(); // In a BasicAction the cursor must be updated, e.g. to create the @@ -3082,14 +3080,11 @@ void SwCrsrShell::ClearUpCrsrs() while (pCrsr != pStartCrsr) { pTmpCrsr = (SwPaM *) pCrsr->GetNext(); - if ( ! lcl_CrsrOk(*pCrsr)) { delete pCrsr; - bChanged = true; } - pCrsr = pTmpCrsr; } diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx index 3deb5730ba5b..f70e564c6b6b 100644 --- a/sw/source/core/crsr/crstrvl.cxx +++ b/sw/source/core/crsr/crstrvl.cxx @@ -155,6 +155,7 @@ sal_Bool SwCrsrShell::GotoHeaderTxt() // found header, search 1. content frame while( pFrm && !pFrm->IsCntntFrm() ) pFrm = pFrm->GetLower(); + if( pFrm ) { SET_CURR_SHELL( this ); @@ -533,6 +534,7 @@ sal_Bool SwCrsrShell::GotoNxtPrvTOXMark( sal_Bool bNext ) // also at collection use only the first frame aCurGEF.SetBodyPos( *rPos.nNode.GetNode(). GetCntntNode()->getLayoutFrm( GetLayout(), &aPt, &rPos, sal_False ) ); + { const SfxPoolItem* pItem; const SwCntntFrm* pCFrm; @@ -2096,6 +2098,7 @@ bool SwCrsrShell::SelectNxtPrvHyperlink( bool bNext ) } } } + // then check all the Flys with a URL or imapge map { const SwFrmFmts* pFmts = GetDoc()->GetSpzFrmFmts(); diff --git a/sw/source/core/crsr/crstrvl1.cxx b/sw/source/core/crsr/crstrvl1.cxx index 4ccb0fac1cb3..93597f7ad215 100644 --- a/sw/source/core/crsr/crstrvl1.cxx +++ b/sw/source/core/crsr/crstrvl1.cxx @@ -25,7 +25,6 @@ sal_Bool SwCrsrShell::IsStartWord( sal_Int16 nWordType ) const { return m_pCurCrsr->IsStartWord( nWordType ); } - sal_Bool SwCrsrShell::IsEndWord( sal_Int16 nWordType ) const { return m_pCurCrsr->IsEndWord( nWordType ); @@ -40,7 +39,6 @@ sal_Bool SwCrsrShell::IsStartSentence() const { return m_pCurCrsr->IsStartEndSentence( false ); } - sal_Bool SwCrsrShell::IsEndSentence() const { return m_pCurCrsr->IsStartEndSentence( true ); @@ -54,6 +52,7 @@ sal_Bool SwCrsrShell::GoEndWord() { return CallCrsrFN( &SwCursor::GoEndWord ); } + sal_Bool SwCrsrShell::GoNextWord() { return CallCrsrFN( &SwCursor::GoNextWord ); @@ -62,15 +61,16 @@ sal_Bool SwCrsrShell::GoPrevWord() { return CallCrsrFN( &SwCursor::GoPrevWord ); } + sal_Bool SwCrsrShell::GoNextSentence() { return CallCrsrFN( &SwCursor::GoNextSentence ); } + sal_Bool SwCrsrShell::GoEndSentence() { return CallCrsrFN( &SwCursor::GoEndSentence ); } - sal_Bool SwCrsrShell::GoStartSentence() { return CallCrsrFN( &SwCursor::GoStartSentence ); diff --git a/sw/source/core/crsr/findattr.cxx b/sw/source/core/crsr/findattr.cxx index 347c5f352cda..d224cfba5acf 100644 --- a/sw/source/core/crsr/findattr.cxx +++ b/sw/source/core/crsr/findattr.cxx @@ -138,6 +138,7 @@ static sal_Bool lcl_Search( const SwTxtNode& rTxtNd, SwPaM& rPam, { if ( !rTxtNd.HasHints() ) return sal_False; + const SwTxtAttr *pTxtHt = 0; sal_Bool bForward = fnMove == fnMoveForward; sal_uInt16 nPos = bForward ? 0 : rTxtNd.GetSwpHints().Count(); @@ -202,7 +203,6 @@ SwAttrCheckArr::SwAttrCheckArr( const SfxItemSet& rSet, int bFwd, { aCmpSet.Put( rSet, sal_False ); bNoColls = 0 != bNoCollections; - bForward = 0 != bFwd; // determine area of Fnd/Stack array (Min/Max) @@ -340,6 +340,7 @@ int SwAttrCheckArr::SetAttrFwd( const SwTxtAttr& rAttr ) } else pTmpItem = &rAttr.GetAttr(); + while( pTmpItem ) { SfxItemState eState = aCmpSet.GetItemState( nWhch, sal_False, &pItem ); @@ -491,6 +492,7 @@ int SwAttrCheckArr::SetAttrBwd( const SwTxtAttr& rAttr ) } else pTmpItem = &rAttr.GetAttr(); + while( pTmpItem ) { SfxItemState eState = aCmpSet.GetItemState( nWhch, sal_False, &pItem ); @@ -713,12 +715,14 @@ static int lcl_SearchForward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr, *( pAttr = rHtArr.GetStart( nPos ))->GetStart() && rCmpArr.SetAttrFwd( *pAttr ) ) ; + if( !rCmpArr.Found() ) continue; // then we have our search area if( (nSttPos = rCmpArr.Start()) > (nEndPos = rCmpArr.End()) ) return sal_False; + lcl_SetAttrPam( rPam, nSttPos, &nEndPos, sal_True ); return sal_True; } @@ -726,6 +730,7 @@ static int lcl_SearchForward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr, if( !rCmpArr.CheckStack() || (nSttPos = rCmpArr.Start()) > (nEndPos = rCmpArr.End()) ) return sal_False; + lcl_SetAttrPam( rPam, nSttPos, &nEndPos, sal_True ); return sal_True; } @@ -794,6 +799,7 @@ static int lcl_SearchBackward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr, // then we have our search area if( (nSttPos = rCmpArr.Start()) > (nEndPos = rCmpArr.End()) ) return sal_False; + lcl_SetAttrPam( rPam, nSttPos, &nEndPos, sal_False ); return sal_True; } @@ -801,6 +807,7 @@ static int lcl_SearchBackward( const SwTxtNode& rTxtNd, SwAttrCheckArr& rCmpArr, if( !rCmpArr.CheckStack() || (nSttPos = rCmpArr.Start()) > (nEndPos = rCmpArr.End()) ) return sal_False; + lcl_SetAttrPam( rPam, nSttPos, &nEndPos, sal_False ); return sal_True; } @@ -1173,7 +1180,6 @@ int SwFindParaAttr::Find( SwPaM* pCrsr, SwMoveFn fnMove, const SwPaM* pRegion, return FIND_NO_RING; } - else return FIND_FOUND; } diff --git a/sw/source/core/crsr/findcoll.cxx b/sw/source/core/crsr/findcoll.cxx index 1dc6884f4ce2..0c0f6ca79d7d 100644 --- a/sw/source/core/crsr/findcoll.cxx +++ b/sw/source/core/crsr/findcoll.cxx @@ -18,7 +18,6 @@ */ #include <tools/resid.hxx> - #include <swcrsr.hxx> #include <doc.hxx> #include <IDocumentUndoRedo.hxx> diff --git a/sw/source/core/crsr/findtxt.cxx b/sw/source/core/crsr/findtxt.cxx index 16a62be9b688..d4110e6c7b15 100644 --- a/sw/source/core/crsr/findtxt.cxx +++ b/sw/source/core/crsr/findtxt.cxx @@ -19,9 +19,7 @@ #include <com/sun/star/util/SearchOptions.hpp> #include <com/sun/star/util/SearchFlags.hpp> - #include <comphelper/string.hxx> - #include <vcl/svapp.hxx> #include <vcl/window.hxx> @@ -38,7 +36,6 @@ #include <swundo.hxx> #include <UndoInsert.hxx> #include <breakit.hxx> - #include <docsh.hxx> #include <PostItMgr.hxx> #include <viewsh.hxx> @@ -81,7 +78,6 @@ lcl_CleanStr(const SwTxtNode& rNd, xub_StrLen const nStart, xub_StrLen& rEnd, bNewHint = false; bNewSoftHyphen = false; - xub_StrLen nStt = 0; // Check if next stop is a hint. @@ -417,6 +413,7 @@ bool SwPaM::DoSearch( const SearchOptions& rSearchOpt, utl::TextSearch& rSTxt, // if the search string contains a soft hypen, // we don't strip them from the text: bool bRemoveSoftHyphens = true; + if ( bRegSearch ) { const OUString a00AD("\\x00AD"); @@ -500,6 +497,7 @@ bool SwPaM::DoSearch( const SearchOptions& rSearchOpt, utl::TextSearch& rSTxt, n < aFltArr.size() && aFltArr[ n ] <= nStart; ++n, ++nNew ) ; + nStart = nNew; for( n = 0, nNew = nEnd; n < aFltArr.size() && aFltArr[ n ] < nEnd; diff --git a/sw/source/core/crsr/pam.cxx b/sw/source/core/crsr/pam.cxx index ccbb0a90154c..1ed0a95f481a 100644 --- a/sw/source/core/crsr/pam.cxx +++ b/sw/source/core/crsr/pam.cxx @@ -41,7 +41,6 @@ #include <IMark.hxx> #include <hints.hxx> - #include <xmloff/odffields.hxx> // for the dump "MSC-" compiler @@ -70,7 +69,6 @@ SwPosition::SwPosition( SwCntntNode & rNode, const xub_StrLen nOffset ) { } - SwPosition::SwPosition( const SwPosition & rPos ) : nNode( rPos.nNode ), nContent( rPos.nContent ) { @@ -347,7 +345,6 @@ SwPaM::SwPaM( const SwNodeIndex& rMark, const SwNodeIndex& rPoint, { m_pPoint->nNode += nPointOffset; } - m_Bound1.nContent.Assign( m_Bound1.nNode.GetNode().GetCntntNode(), 0 ); m_Bound2.nContent.Assign( m_Bound2.nNode.GetNode().GetCntntNode(), 0 ); } @@ -369,7 +366,6 @@ SwPaM::SwPaM( const SwNode& rMark, const SwNode& rPoint, { m_pPoint->nNode += nPointOffset; } - m_Bound1.nContent.Assign( m_Bound1.nNode.GetNode().GetCntntNode(), 0 ); m_Bound2.nContent.Assign( m_Bound2.nNode.GetNode().GetCntntNode(), 0 ); } @@ -484,7 +480,6 @@ bool SwPaM::Move( SwMoveFn fnMove, SwGoInDoc fnGo ) const bool bRet = (*fnGo)( *this, fnMove ); m_bIsInFrontOfLabel = false; - return bRet; } @@ -530,7 +525,6 @@ SwPaM & SwPaM::Normalize(bool bPointFirst) { Exchange(); } - return *this; } diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx index 2cbe92571257..0e8fec363a9f 100644 --- a/sw/source/core/crsr/swcrsr.cxx +++ b/sw/source/core/crsr/swcrsr.cxx @@ -522,6 +522,7 @@ sal_Bool SwCursor::IsInProtectTable( sal_Bool bMove, sal_Bool bChgCrsr ) if( bChgCrsr ) // restore the last save position RestoreSavePos(); + return sal_True; // Crsr stays at old position } @@ -1029,18 +1030,15 @@ void SwCursor::FillFindPos( SwDocPositions ePos, SwPosition& rPos ) const rPos.nNode = *rNds.GetEndOfContent().StartOfSectionNode(); pCNd = rNds.GoNext( &rPos.nNode ); break; - case DOCPOS_END: rPos.nNode = rNds.GetEndOfContent(); pCNd = rNds.GoPrevious( &rPos.nNode ); bIsStart = false; break; - case DOCPOS_OTHERSTART: rPos.nNode = *rNds[ sal_uLong(0) ]; pCNd = rNds.GoNext( &rPos.nNode ); break; - case DOCPOS_OTHEREND: rPos.nNode = *rNds.GetEndOfContent().StartOfSectionNode(); pCNd = rNds.GoPrevious( &rPos.nNode ); @@ -1173,7 +1171,6 @@ sal_Bool SwCursor::IsStartEndSentence( bool bEnd ) const aCrsr.GoSentence( bEnd ? SwCursor::END_SENT : SwCursor::START_SENT ); bRet = aOrigPos == *aCrsr.GetPoint(); } - return bRet; } @@ -1347,7 +1344,6 @@ sal_Bool SwCursor::SelectWordWT( ViewShell* pViewShell, sal_Int16 nWordType, con return bRet; } - static String lcl_MaskDeletedRedlines( const SwTxtNode* pTxtNd ) { String aRes; @@ -1607,7 +1603,6 @@ sal_Bool SwCursor::LeftRight( sal_Bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode, break; } } - mnRowSpanOffset = 0; } } @@ -1639,7 +1634,6 @@ sal_Bool SwCursor::LeftRight( sal_Bool bLeft, sal_uInt16 nCnt, sal_uInt16 nMode, } } } - --nCnt; } @@ -1802,7 +1796,6 @@ sal_Bool SwCursor::UpDown( sal_Bool bUp, sal_uInt16 nCnt, DoSetBidiLevelUpDown(); // calculate cursor bidi level } - return bRet; } @@ -1848,7 +1841,6 @@ sal_Bool SwCursor::SttEndDoc( sal_Bool bStt ) !IsSelOvr( nsSwCursorSelOverFlags::SELOVER_TOGGLE | nsSwCursorSelOverFlags::SELOVER_CHANGEPOS | nsSwCursorSelOverFlags::SELOVER_ENABLEREVDIREKTION ); - return bRet; } diff --git a/sw/source/core/crsr/trvlfnfl.cxx b/sw/source/core/crsr/trvlfnfl.cxx index 23d74f9f31c0..a22797da1f53 100644 --- a/sw/source/core/crsr/trvlfnfl.cxx +++ b/sw/source/core/crsr/trvlfnfl.cxx @@ -137,7 +137,6 @@ sal_Bool SwCursor::GotoFtnAnchor() SwCrsrSaveState aSaveState( *this ); SwTxtNode& rTNd = (SwTxtNode&)pTxtFtn->GetTxtNode(); - GetPoint()->nNode = rTNd; GetPoint()->nContent.Assign( &rTNd, *pTxtFtn->GetStart() ); @@ -168,6 +167,7 @@ inline sal_Bool CmpLE( const SwTxtFtn& rFtn, sal_uLong nNd, xub_StrLen nCnt ) sal_uLong nTNd = rFtn.GetTxtNode().GetIndex(); return nTNd < nNd || ( nTNd == nNd && *rFtn.GetStart() <= nCnt ); } + inline sal_Bool CmpL( const SwTxtFtn& rFtn, sal_uLong nNd, xub_StrLen nCnt ) { sal_uLong nTNd = rFtn.GetTxtNode().GetIndex(); diff --git a/sw/source/core/crsr/trvlreg.cxx b/sw/source/core/crsr/trvlreg.cxx index eeee75605fa0..634a4a563a3d 100644 --- a/sw/source/core/crsr/trvlreg.cxx +++ b/sw/source/core/crsr/trvlreg.cxx @@ -73,7 +73,6 @@ sal_Bool GotoPrevRegion( SwPaM& rCurCrsr, SwPosRegion fnPosRegion, } rCurCrsr.GetPoint()->nContent.Assign( pCNd, pCNd->Len() ); } - rCurCrsr.GetPoint()->nNode = aIdx; return sal_True; } @@ -128,7 +127,6 @@ sal_Bool GotoNextRegion( SwPaM& rCurCrsr, SwPosRegion fnPosRegion, } rCurCrsr.GetPoint()->nContent.Assign( pCNd, pCNd->Len() ); } - rCurCrsr.GetPoint()->nNode = aIdx; return sal_True; } diff --git a/sw/source/core/crsr/trvltbl.cxx b/sw/source/core/crsr/trvltbl.cxx index 6330fe96344c..49c89d7c331b 100644 --- a/sw/source/core/crsr/trvltbl.cxx +++ b/sw/source/core/crsr/trvltbl.cxx @@ -297,7 +297,6 @@ sal_Bool SwCrsrShell::SelTblBox() OSL_ENSURE( !pFrm->IsInTab() == !(pStartNode != NULL), "Schroedinger's table: We're in a box, and also we aren't." ); #endif - if( pStartNode == NULL ) return sal_False; @@ -313,7 +312,6 @@ sal_Bool SwCrsrShell::SelTblBox() // select the complete box with our shiny new m_pTblCrsr // 1. delete mark, and move point to first content node in box - m_pTblCrsr->DeleteMark(); *(m_pTblCrsr->GetPoint()) = SwPosition( *pStartNode ); m_pTblCrsr->Move( fnMoveForward, fnGoNode ); @@ -415,7 +413,6 @@ static bool lcl_FindNextCell( SwNodeIndex& rIdx, sal_Bool bInReadOnly ) aTmp.Assign( *pCNd->EndOfSectionNode(), +1 ); } } - rIdx = *pCNd; return true; } @@ -475,7 +472,6 @@ static bool lcl_FindPrevCell( SwNodeIndex& rIdx, sal_Bool bInReadOnly ) aTmp.Assign( *pCNd->StartOfSectionNode(), - 1 ); } } - rIdx = *pCNd; return true; } @@ -703,7 +699,6 @@ bool SwCrsrShell::IsTblComplexForChart() sSel = GetBoxNms(); bRet = pTNd->GetTable().IsTblComplexForChart( sSel ); } - EndAction(); return bRet; diff --git a/sw/source/core/crsr/unocrsr.cxx b/sw/source/core/crsr/unocrsr.cxx index 1b2d541f4b07..230e33a4f713 100644 --- a/sw/source/core/crsr/unocrsr.cxx +++ b/sw/source/core/crsr/unocrsr.cxx @@ -30,7 +30,6 @@ SwUnoCrsr::SwUnoCrsr( const SwPosition &rPos, SwPaM* pRing ) bRemainInSection( sal_True ), bSkipOverHiddenSections( sal_False ), bSkipOverProtectSections( sal_False ) - {} SwUnoCrsr::~SwUnoCrsr() @@ -172,6 +171,7 @@ sal_Bool SwUnoCrsr::IsSelOvr( int eFlags ) sal_uInt16 nCnt = 0; if( pCNd && !bMoveDown ) nCnt = pCNd->Len(); + GetPoint()->nContent.Assign( pCNd, nCnt ); } else diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx index b2d4801744aa..8f73dc9cd68d 100644 --- a/sw/source/core/crsr/viscrs.cxx +++ b/sw/source/core/crsr/viscrs.cxx @@ -138,7 +138,6 @@ void SwVisCrsr::_SetPosAndShow() CURSOR_DIRECTION_RTL : CURSOR_DIRECTION_LTR ); } - if ( pFrm->IsRightToLeft() ) { const OutputDevice *pOut = m_pCrsrShell->GetOut(); @@ -351,7 +350,6 @@ SwShellCrsr::SwShellCrsr( SwShellCrsr& rICrsr ) : SwCursor(rICrsr), SwSelPaintRects(*rICrsr.GetShell()), aMkPt(rICrsr.GetMkPos()), aPtPt(rICrsr.GetPtPos()), pPt(SwPaM::GetPoint()) {} - SwShellCrsr::~SwShellCrsr() {} bool SwShellCrsr::IsReadOnlyAvailable() const @@ -509,10 +507,12 @@ SwCursor* SwShellTableCrsr::Create( SwPaM* pRing ) const { return SwShellCrsr::Create( pRing ); } + short SwShellTableCrsr::MaxReplaceArived() { return SwShellCrsr::MaxReplaceArived(); } + void SwShellTableCrsr::SaveTblBoxCntnt( const SwPosition* pPos ) { SwShellCrsr::SaveTblBoxCntnt( pPos ); |