summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2017-09-28 13:06:51 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-09-29 08:53:03 +0200
commit8a8864aeb710e4d17852dc9c0e02b03804a8bf3c (patch)
treebdec37c347a8dd6f63fdb169abe28ae667af85f6 /svx
parentce301dadcbbf8d0f0a71c7eaebca9bfad2e08801 (diff)
convert IsEqual/etc methods on ESelection to operators
Change-Id: Ia8424e701b6f22d0536ee7f3bdb0ecaaed94a3b9 Reviewed-on: https://gerrit.libreoffice.org/42904 Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx')
-rw-r--r--svx/source/accessibility/AccessibleTextHelper.cxx2
-rw-r--r--svx/source/svdraw/textchaincursor.cxx4
-rw-r--r--svx/source/svdraw/textchainflow.cxx2
-rw-r--r--svx/source/table/tablecontroller.cxx2
4 files changed, 5 insertions, 5 deletions
diff --git a/svx/source/accessibility/AccessibleTextHelper.cxx b/svx/source/accessibility/AccessibleTextHelper.cxx
index f14d5bbd4c01..0bc3a55b39ee 100644
--- a/svx/source/accessibility/AccessibleTextHelper.cxx
+++ b/svx/source/accessibility/AccessibleTextHelper.cxx
@@ -506,7 +506,7 @@ namespace accessibility
ESelection aSelection;
if( GetEditViewForwarder().GetSelection( aSelection ) )
{
- if( !maLastSelection.IsEqual( aSelection ) &&
+ if( maLastSelection != aSelection &&
aSelection.nEndPara < maParaManager.GetNum() )
{
// #103998# Not that important, changed from assertion to trace
diff --git a/svx/source/svdraw/textchaincursor.cxx b/svx/source/svdraw/textchaincursor.cxx
index 0560ae087e08..d6d1f4de2894 100644
--- a/svx/source/svdraw/textchaincursor.cxx
+++ b/svx/source/svdraw/textchaincursor.cxx
@@ -84,7 +84,7 @@ void TextChainCursorManager::impDetectEvent(const KeyEvent& rKEvt,
sal_Int32 nLastParaLen = aLastParaText.getLength();
ESelection aEndSel = ESelection(nLastPara, nLastParaLen);
- bool bAtEndOfTextContent = aCurSel.IsEqual(aEndSel);
+ bool bAtEndOfTextContent = aCurSel == aEndSel;
// Possibility: Are we "pushing" at the end of the object?
if (nCode == KEY_RIGHT && bAtEndOfTextContent && pNextLink)
@@ -106,7 +106,7 @@ void TextChainCursorManager::impDetectEvent(const KeyEvent& rKEvt,
}
ESelection aStartSel = ESelection(0, 0);
- bool bAtStartOfTextContent = aCurSel.IsEqual(aStartSel);
+ bool bAtStartOfTextContent = aCurSel == aStartSel;
// Possibility: Are we "pushing" at the start of the object?
if (nCode == KEY_LEFT && bAtStartOfTextContent && pPrevLink)
diff --git a/svx/source/svdraw/textchainflow.cxx b/svx/source/svdraw/textchainflow.cxx
index 559e6b9bd210..b87d2a7f02ed 100644
--- a/svx/source/svdraw/textchainflow.cxx
+++ b/svx/source/svdraw/textchainflow.cxx
@@ -294,7 +294,7 @@ void EditingTextChainFlow::impBroadcastCursorInfo() const
ESelection aPreChainingSel = GetTextChain()->GetPreChainingSel(GetLinkTarget()) ;
// Test whether the cursor is out of the box.
- bool bCursorOut = mbPossiblyCursorOut && maOverflowPosSel.IsLess(aPreChainingSel);
+ bool bCursorOut = mbPossiblyCursorOut && maOverflowPosSel < aPreChainingSel;
// NOTE: I handled already the stuff for the comments below. They will be kept temporarily till stuff settles down.
// Possibility: 1) why don't we stop passing the actual event to the TextChain and instead we pass
diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx
index 8e6a59ce34ff..7c8e2992f698 100644
--- a/svx/source/table/tablecontroller.cxx
+++ b/svx/source/table/tablecontroller.cxx
@@ -1589,7 +1589,7 @@ SvxTableController::TblAction SvxTableController::getKeyboardAction(const KeyEve
// during text edit, check if we navigate out of the cell
ESelection aOldSelection = pOLV->GetSelection();
pOLV->PostKeyEvent(rKEvt);
- bTextMove = pOLV && ( aOldSelection.IsEqual(pOLV->GetSelection()) );
+ bTextMove = pOLV && (aOldSelection == pOLV->GetSelection());
if( !bTextMove )
{
nAction = TblAction::NONE;