editeng/source/editeng/impedit.cxx | 4 ++--
editeng/source/outliner/outlvw.cxx | 2 +-
forms/source/richtext/richtextviewport.cxx | 6 +++---
include/editeng/editdata.hxx | 2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit 7cc8555e0ac9838d43bb644bac4052008057824d
Author: Jochen Nitschke <j.nitschke+loger...@ok.de>
Date: Sun May 7 13:31:18 2017 +0200
convert EESelectionMode to scoped enum
Change-Id: I4da22d40d5b14878b5efac1f3e4a5c76adec37b3
Reviewed-on: https://gerrit.libreoffice.org/37341
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Jochen Nitschke <j.nitschke+loger...@ok.de>
diff --git a/editeng/source/editeng/impedit.cxx
b/editeng/source/editeng/impedit.cxx
index 71c1471a8961..86b71d6dba26 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -88,7 +88,7 @@ ImpEditView::ImpEditView( EditView* pView, EditEngine* pEng,
vcl::Window* pWindo
pDragAndDropInfo = nullptr;
bReadOnly = false;
bClickedInSelection = false;
- eSelectionMode = EE_SELMODE_TXTONLY;
+ eSelectionMode = EESelectionMode::TxtOnly;
eAnchorMode = EEAnchorMode::TopLeft;
nInvMore = 1;
nTravelXPos = TRAVEL_X_DONTKNOW;
@@ -196,7 +196,7 @@ void lcl_translateTwips(vcl::Window& rParent, vcl::Window&
rChild)
void ImpEditView::DrawSelection( EditSelection aTmpSel, vcl::Region* pRegion,
OutputDevice* pTargetDevice )
{
- if ( eSelectionMode == EE_SELMODE_HIDDEN )
+ if ( eSelectionMode == EESelectionMode::Hidden )
return;
// It must be ensured before rendering the selection, that the contents of
diff --git a/editeng/source/outliner/outlvw.cxx
b/editeng/source/outliner/outlvw.cxx
index 455b04aa85b7..b1410319c3ee 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -54,7 +54,7 @@ OutlinerView::OutlinerView( Outliner* pOut, vcl::Window* pWin
)
pOwner = pOut;
pEditView.reset( new EditView( pOut->pEditEngine, pWin ) );
- pEditView->SetSelectionMode( EE_SELMODE_TXTONLY );
+ pEditView->SetSelectionMode( EESelectionMode::TxtOnly );
}
OutlinerView::~OutlinerView()
diff --git a/forms/source/richtext/richtextviewport.cxx
b/forms/source/richtext/richtextviewport.cxx
index 32f12ebe681f..b4fda6652c91 100644
--- a/forms/source/richtext/richtextviewport.cxx
+++ b/forms/source/richtext/richtextviewport.cxx
@@ -45,7 +45,7 @@ namespace frm
Control::GetFocus();
if (m_pView)
{
- m_pView->SetSelectionMode( EE_SELMODE_STD );
+ m_pView->SetSelectionMode( EESelectionMode::Std );
m_pView->ShowCursor();
}
}
@@ -55,7 +55,7 @@ namespace frm
if (m_pView)
{
m_pView->HideCursor();
- m_pView->SetSelectionMode( m_bHideInactiveSelection ?
EE_SELMODE_HIDDEN : EE_SELMODE_STD );
+ m_pView->SetSelectionMode( m_bHideInactiveSelection ?
EESelectionMode::Hidden : EESelectionMode::Std );
}
Control::LoseFocus();
}
@@ -94,7 +94,7 @@ namespace frm
return;
m_bHideInactiveSelection = _bHide;
if ( !HasFocus() )
- m_pView->SetSelectionMode( m_bHideInactiveSelection ?
EE_SELMODE_HIDDEN : EE_SELMODE_STD );
+ m_pView->SetSelectionMode( m_bHideInactiveSelection ?
EESelectionMode::Hidden : EESelectionMode::Std );
}
} // namespace frm
diff --git a/include/editeng/editdata.hxx b/include/editeng/editdata.hxx
index a13ecf822fcc..9560c2e32863 100644
--- a/include/editeng/editdata.hxx
+++ b/include/editeng/editdata.hxx
@@ -34,7 +34,7 @@ enum class HtmlTokenId : sal_Int16;
enum EETextFormat { EE_FORMAT_TEXT = 0x20, EE_FORMAT_RTF, EE_FORMAT_BIN
= 0x31, EE_FORMAT_HTML, EE_FORMAT_XML };
enum EEHorizontalTextDirection { EE_HTEXTDIR_DEFAULT, EE_HTEXTDIR_L2R,
EE_HTEXTDIR_R2L };
-enum EESelectionMode { EE_SELMODE_STD, EE_SELMODE_TXTONLY,
EE_SELMODE_HIDDEN };
+enum class EESelectionMode { Std, TxtOnly, Hidden };
// EE_SELMODE_HIDDEN can be used to completely hide the selection. This is
useful e.g. when you want show the selection
// only as long as your window (which the edit view works on) has the focus
enum class EESpellState { Ok, LanguageNotInstalled, NoSpeller, ErrorFound };
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
