[Libreoffice-commits] core.git: Branch 'distro/collabora/co-22.05' - sw/source

[Mike Kaganski (via logerrit)]

 sw/source/uibase/docvw/edtwin.cxx |   14 +++++++-------
 sw/source/uibase/inc/edtwin.hxx   |    2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 8990b0c97c1266253cdb2464604ab17e4101eccc
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 13:02:22 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>
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141901
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>

diff --git a/sw/source/uibase/docvw/edtwin.cxx 
b/sw/source/uibase/docvw/edtwin.cxx
index c4d129250811..b4b2014cf207 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -2784,7 +2784,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).
@@ -3382,7 +3382,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(
@@ -3393,12 +3393,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(
@@ -3408,7 +3408,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();
@@ -3430,7 +3430,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
@@ -3491,7 +3491,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;
diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx
index e985b5dd4b09..f3361eca3846 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 );