sw/source/uibase/wrtsh/delete.cxx | 16 ++++++++--------
sw/source/uibase/wrtsh/select.cxx | 10 +++++-----
sw/source/uibase/wrtsh/wrtsh4.cxx | 12 ++++++------
3 files changed, 19 insertions(+), 19 deletions(-)
New commits:
commit c0968aa4673a8ac9a8a09a0e291b58b94bdbb35e
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Sat May 13 09:56:59 2017 +0200
sw: fix gcc-4.8 build
After commit 2308bea5ba38250133d7e344484e688ecaab6d8d (sw: change
SwCursorShell::Pop() parameter from meaningless bool to enum,
2017-05-12).
Change-Id: I64ecdf3ea16383c3938b32acdf69a78a31938ae6
diff --git a/sw/source/uibase/wrtsh/delete.cxx
b/sw/source/uibase/wrtsh/delete.cxx
index d49fb8d299ec..02540d95b22d 100644
--- a/sw/source/uibase/wrtsh/delete.cxx
+++ b/sw/source/uibase/wrtsh/delete.cxx
@@ -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
{
diff --git a/sw/source/uibase/wrtsh/select.cxx
b/sw/source/uibase/wrtsh/select.cxx
index 277a9ba770a3..29bca71acd2b 100644
--- a/sw/source/uibase/wrtsh/select.cxx
+++ b/sw/source/uibase/wrtsh/select.cxx
@@ -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;
diff --git a/sw/source/uibase/wrtsh/wrtsh4.cxx
b/sw/source/uibase/wrtsh/wrtsh4.cxx
index 38d623f9190c..cabec2f89244 100644
--- a/sw/source/uibase/wrtsh/wrtsh4.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh4.cxx
@@ -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() )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
