sw/source/uibase/docvw/edtwin.cxx | 16 ++++++++--------
sw/source/uibase/inc/edtwin.hxx | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 97cd814ce88cac93f28408e983f3cfc0f94bb6bf
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Thu Oct 27 10:10:30 2022 +0300
Commit: Mike Kaganski <mike.kagan...@collabora.com>
CommitDate: Thu Oct 27 10:30:23 2022 +0200
RstMBDownFlags -> ResetMouseButtonDownFlags
Change-Id: I2488422d2de8a67c69ec4e60c0f289bc0b784f7a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141897
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kagan...@collabora.com>
diff --git a/sw/source/uibase/docvw/edtwin.cxx
b/sw/source/uibase/docvw/edtwin.cxx
index 3b70464c8c27..1f2ebc2151db 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -2808,7 +2808,7 @@ KEYINPUT_CHECKTABLE_INSDEL:
/**
* MouseEvents
*/
-void SwEditWin::RstMBDownFlags()
+void SwEditWin::ResetMouseButtonDownFlags()
{
// Not on all systems a MouseButtonUp is used ahead
// of the modal dialog (like on WINDOWS).
@@ -3406,7 +3406,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
switch ( rSh.GetSelectionType() & ~SelectionType(
SelectionType::FontWork | SelectionType::ExtrudedCustomShape ) )
{
case SelectionType::Graphic:
- RstMBDownFlags();
+ ResetMouseButtonDownFlags();
if (!comphelper::LibreOfficeKit::isActive())
{
GetView().GetViewFrame()->GetBindings().Execute(
@@ -3417,12 +3417,12 @@ void SwEditWin::MouseButtonDown(const MouseEvent&
_rMEvt)
// double click on OLE object --> OLE-InPlace
case SelectionType::Ole:
- RstMBDownFlags();
+ ResetMouseButtonDownFlags();
rSh.LaunchOLEObj();
return;
case SelectionType::Frame:
- RstMBDownFlags();
+ ResetMouseButtonDownFlags();
if (!comphelper::LibreOfficeKit::isActive())
{
GetView().GetViewFrame()->GetBindings().Execute(
@@ -3432,7 +3432,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
return;
case SelectionType::DrawObject:
- RstMBDownFlags();
+ ResetMouseButtonDownFlags();
EnterDrawTextMode(aDocPos);
if ( auto pSwDrawTextShell = dynamic_cast<
SwDrawTextShell *>( m_rView.GetCurShell() ) )
pSwDrawTextShell->Init();
@@ -3454,7 +3454,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
(nullptr != (pField = rSh.GetCurField(true)) ||
( bFootnote = rSh.GetCurFootnote() ) ) )
{
- RstMBDownFlags();
+ ResetMouseButtonDownFlags();
if( bFootnote )
GetView().GetViewFrame()->GetBindings().Execute( FN_EDIT_FOOTNOTE );
else
@@ -3515,7 +3515,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
IFieldmark *pFieldBM = const_cast< IFieldmark* > (
aContentAtPos.aFnd.pFieldmark );
if ( pFieldBM->GetFieldname( ) == ODF_FORMDROPDOWN
|| pFieldBM->GetFieldname( ) == ODF_FORMDATE )
{
- RstMBDownFlags();
+ ResetMouseButtonDownFlags();
rSh.getIDocumentMarkAccess()->ClearFieldActivation();
GetView().GetViewFrame()->GetBindings().Execute(SID_FM_CTL_PROPERTIES);
return;
@@ -3533,7 +3533,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
=
aToxContentAtPos.pFndTextAttr->GetTOXMark().GetTOXType();
if (pTType && pTType->GetType() ==
TOXTypes::TOX_INDEX)
{
- RstMBDownFlags();
+ ResetMouseButtonDownFlags();
GetView().GetViewFrame()->GetBindings().Execute(
FN_EDIT_IDX_ENTRY_DLG);
return;
diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx
index 64c9f0c38ed9..f4dda4c92165 100644
--- a/sw/source/uibase/inc/edtwin.hxx
+++ b/sw/source/uibase/inc/edtwin.hxx
@@ -134,7 +134,7 @@ class SW_DLLPUBLIC SwEditWin final : public vcl::Window,
void JustifyAreaTimer();
inline void EnterArea();
- void RstMBDownFlags();
+ void ResetMouseButtonDownFlags();
void ChangeFly( sal_uInt8 nDir, bool bWeb );
void ChangeDrawing( sal_uInt8 nDir );
