mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sw: fix gcc-4.8 build

Browse Source 
After commit 2308bea5ba (sw: change
SwCursorShell::Pop() parameter from meaningless bool to enum,
2017-05-12).

Change-Id: I64ecdf3ea16383c3938b32acdf69a78a31938ae6
This commit is contained in:
Miklos Vajna
2017-05-13 09:56:59 +02:00
parent 26c83bbc00
commit c0968aa467
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sw/source/uibase/wrtsh/delete.cxx
View File

@@ -94,7 +94,7 @@ void SwWrtShell::DelLine()
SwCursorShell::RightMargin();
long nRet = Delete();
Pop(PopMode::DeleteCurrent);
Pop(SwCursorShell::PopMode::DeleteCurrent);
if( nRet )
UpdateAttr();
}
@@ -293,7 +293,7 @@ long SwWrtShell::DelRight()
}
// restore cursor
SwCursorShell::Pop(PopMode::DeleteCurrent);
SwCursorShell::Pop(SwCursorShell::PopMode::DeleteCurrent);
if( bDelFull )
{
@@ -338,7 +338,7 @@ long SwWrtShell::DelRight()
}
// restore cursor
SwCursorShell::Pop(PopMode::DeleteCurrent);
SwCursorShell::Pop(SwCursorShell::PopMode::DeleteCurrent);
}
// If we are just ahead of a fieldmark, then remove it completely
@@ -417,11 +417,11 @@ void SwWrtShell::DelToEndOfPara()
SetMark();
if( !MovePara(GoCurrPara,fnParaEnd))
{
Pop(PopMode::DeleteCurrent);
Pop(SwCursorShell::PopMode::DeleteCurrent);
return;
}
long nRet = Delete();
Pop(PopMode::DeleteCurrent);
Pop(SwCursorShell::PopMode::DeleteCurrent);
if( nRet )
UpdateAttr();
}
@@ -434,11 +434,11 @@ void SwWrtShell::DelToStartOfPara()
SetMark();
if( !MovePara(GoCurrPara,fnParaStart))
{
Pop(PopMode::DeleteCurrent);
Pop(SwCursorShell::PopMode::DeleteCurrent);
return;
}
long nRet = Delete();
Pop(PopMode::DeleteCurrent);
Pop(SwCursorShell::PopMode::DeleteCurrent);
if( nRet )
UpdateAttr();
}
@@ -480,7 +480,7 @@ long SwWrtShell::DelToEndOfSentence()
nRet = DelFullPara() ? 1 : 0;
}
}
Pop(PopMode::DeleteCurrent);
Pop(SwCursorShell::PopMode::DeleteCurrent);
}
else
{

10
sw/source/uibase/wrtsh/select.cxx
View File

@@ -150,7 +150,7 @@ long SwWrtShell::SelAll()
bool bIsFullSel = !MoveSection( GoCurrSection, fnSectionStart);
SwapPam();
bIsFullSel &= !MoveSection( GoCurrSection, fnSectionEnd);
Pop(PopMode::DeleteCurrent);
Pop(SwCursorShell::PopMode::DeleteCurrent);
GoStart(true, &bMoveTable, false, !bIsFullSel);
}
else
@@ -445,7 +445,7 @@ long SwWrtShell::ExtSelWrd(const Point *pPt, bool )
default: bMoveCursor = false; break;
}
SwCursorShell::Pop(PopMode::DeleteCurrent); // restore the saved cursor
SwCursorShell::Pop(SwCursorShell::PopMode::DeleteCurrent); // restore the saved cursor
if( bMoveCursor )
{
@@ -464,7 +464,7 @@ long SwWrtShell::ExtSelWrd(const Point *pPt, bool )
}
else
{
SwCursorShell::Pop(PopMode::DeleteCurrent);
SwCursorShell::Pop(SwCursorShell::PopMode::DeleteCurrent);
if( bToTop )
SwapPam();
}
@@ -889,7 +889,7 @@ int SwWrtShell::IntelligentCut(SelectionType nSelection, bool bCut)
SetMark();
SwCursorShell::Left(1,CRSR_SKIP_CHARS);
SwFEShell::Delete();
Pop(PopMode::DeleteCurrent);
Pop(SwCursorShell::PopMode::DeleteCurrent);
}
}
else if(cWord == WORD_NO_SPACE && cNext == ' ')
@@ -903,7 +903,7 @@ int SwWrtShell::IntelligentCut(SelectionType nSelection, bool bCut)
SetMark();
SwCursorShell::Right(1,CRSR_SKIP_CHARS);
SwFEShell::Delete();
Pop(PopMode::DeleteCurrent);
Pop(SwCursorShell::PopMode::DeleteCurrent);
}
}
return cWord;

12
sw/source/uibase/wrtsh/wrtsh4.cxx
View File

@@ -71,7 +71,7 @@ bool SwWrtShell::NxtWrd_()
{
if(!SwCursorShell::Right(1,CRSR_SKIP_CHARS)) // Document - end ??
{
Pop(PopMode::DeleteCurrent);
Pop(SwCursorShell::PopMode::DeleteCurrent);
return bRet;
}
bRet = IsStartWord();
@@ -102,7 +102,7 @@ bool SwWrtShell::PrvWrd_()
{ // if already at the beginning, then the next???
if(!SwCursorShell::Left(1,CRSR_SKIP_CHARS))
{ // Document - beginning ??
Pop(PopMode::DeleteCurrent);
Pop(SwCursorShell::PopMode::DeleteCurrent);
return bRet;
}
bRet = IsStartWord() || IsEndPara();
@@ -134,7 +134,7 @@ bool SwWrtShell::NxtWrdForDelete()
{
if ( !SwCursorShell::Right(1,CRSR_SKIP_CHARS) )
{
Pop(PopMode::DeleteCurrent);
Pop(SwCursorShell::PopMode::DeleteCurrent);
return false;
}
return true;
@@ -157,7 +157,7 @@ bool SwWrtShell::PrvWrdForDelete()
{
if ( !SwCursorShell::Left(1,CRSR_SKIP_CHARS) )
{
Pop(PopMode::DeleteCurrent);
Pop(SwCursorShell::PopMode::DeleteCurrent);
return false;
}
return true;
@@ -179,7 +179,7 @@ bool SwWrtShell::FwdSentence_()
ClearMark();
if(!SwCursorShell::Right(1,CRSR_SKIP_CHARS))
{
Pop(PopMode::DeleteCurrent);
Pop(SwCursorShell::PopMode::DeleteCurrent);
return false;
}
if( !GoNextSentence() && !IsEndPara() )
@@ -196,7 +196,7 @@ bool SwWrtShell::BwdSentence_()
ClearMark();
if(!SwCursorShell::Left(1,CRSR_SKIP_CHARS))
{
Pop(PopMode::DeleteCurrent);
Pop(SwCursorShell::PopMode::DeleteCurrent);
return false;
}
if( !GoStartSentence() && !IsSttPara() )