[Libreoffice-commits] core.git: compilerplugins/clang editeng/source include/editeng

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Nov 27 13:42:09 UTC 2018


 compilerplugins/clang/unusedenumconstants.readonly.results |    2 --
 editeng/source/editeng/editstt2.hxx                        |    3 ---
 editeng/source/editeng/impedit.cxx                         |   10 ----------
 editeng/source/editeng/impedit2.cxx                        |    5 -----
 include/editeng/editstat.hxx                               |    3 +--
 5 files changed, 1 insertion(+), 22 deletions(-)

New commits:
commit b6449c65daa2854b8241e14c0966721412f16515
Author:     Noel Grandin <noel.grandin at collabora.co.uk>
AuthorDate: Mon Nov 26 13:45:26 2018 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Tue Nov 27 14:41:41 2018 +0100

    remove unused EEControlBits enum value
    
    Change-Id: Ic363903bb6e32c029f5aac6810f69d590df1bf79
    Reviewed-on: https://gerrit.libreoffice.org/64091
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/compilerplugins/clang/unusedenumconstants.readonly.results b/compilerplugins/clang/unusedenumconstants.readonly.results
index c1731a325120..bbb57be316e4 100644
--- a/compilerplugins/clang/unusedenumconstants.readonly.results
+++ b/compilerplugins/clang/unusedenumconstants.readonly.results
@@ -306,8 +306,6 @@ include/editeng/editeng.hxx:126
     enum GetAttribsFlags STYLESHEET
 include/editeng/editeng.hxx:127
     enum GetAttribsFlags PARAATTRIBS
-include/editeng/editstat.hxx:32
-    enum EEControlBits CRSRLEFTPARA
 include/editeng/editstat.hxx:49
     enum EEControlBits AUTOCOMPLETE
 include/editeng/flditem.hxx:94
diff --git a/editeng/source/editeng/editstt2.hxx b/editeng/source/editeng/editstt2.hxx
index 15726ef24032..48d5f1e81da6 100644
--- a/editeng/source/editeng/editstt2.hxx
+++ b/editeng/source/editeng/editstt2.hxx
@@ -35,9 +35,6 @@ public:
     bool    UseCharAttribs() const
                 { return bool( nControlBits & EEControlBits::USECHARATTRIBS ); }
 
-    bool    NotifyCursorMovements() const
-                { return bool( nControlBits & EEControlBits::CRSRLEFTPARA ); }
-
     bool    UseIdleFormatter() const
                 { return bool( nControlBits & EEControlBits::DOIDLEFORMAT); }
 
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index b17c8c9c5386..390f524ddab4 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -1302,14 +1302,6 @@ bool ImpEditView::PostKeyEvent( const KeyEvent& rKeyEvent, vcl::Window const * p
 
 bool ImpEditView::MouseButtonUp( const MouseEvent& rMouseEvent )
 {
-    if ( pEditEngine->GetInternalEditStatus().NotifyCursorMovements() )
-    {
-        if ( pEditEngine->GetInternalEditStatus().GetPrevParagraph() != pEditEngine->GetEditDoc().GetPos( GetEditSelection().Max().GetNode() ) )
-        {
-            pEditEngine->GetInternalEditStatus().GetStatusWord() = pEditEngine->GetInternalEditStatus().GetStatusWord() | EditStatusFlags::CRSRLEFTPARA;
-            pEditEngine->pImpEditEngine->CallStatusHdl();
-        }
-    }
     nTravelXPos = TRAVEL_X_DONTKNOW;
     nCursorBidiLevel = CURSOR_BIDILEVEL_DONTKNOW;
     nExtraCursorFlags = GetCursorFlags::NONE;
@@ -1338,8 +1330,6 @@ void ImpEditView::ReleaseMouse()
 bool ImpEditView::MouseButtonDown( const MouseEvent& rMouseEvent )
 {
     pEditEngine->CheckIdleFormatter();  // If fast typing and mouse button downs
-    if ( pEditEngine->GetInternalEditStatus().NotifyCursorMovements() )
-        pEditEngine->GetInternalEditStatus().GetPrevParagraph() = pEditEngine->GetEditDoc().GetPos( GetEditSelection().Max().GetNode() );
     nTravelXPos         = TRAVEL_X_DONTKNOW;
     nExtraCursorFlags   = GetCursorFlags::NONE;
     nCursorBidiLevel    = CURSOR_BIDILEVEL_DONTKNOW;
diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx
index d892953fb062..8dcf586d3a54 100644
--- a/editeng/source/editeng/impedit2.cxx
+++ b/editeng/source/editeng/impedit2.cxx
@@ -902,11 +902,6 @@ EditSelection const & ImpEditEngine::MoveCursor( const KeyEvent& rKeyEvent, Edit
     if ( aOldPaM != aPaM )
     {
         CursorMoved( aOldPaM.GetNode() );
-        if ( aStatus.NotifyCursorMovements() && ( aOldPaM.GetNode() != aPaM.GetNode() ) )
-        {
-            aStatus.GetStatusWord() = aStatus.GetStatusWord() | EditStatusFlags::CRSRLEFTPARA;
-            aStatus.GetPrevParagraph() = aEditDoc.GetPos( aOldPaM.GetNode() );
-        }
     }
     else
         aStatus.GetStatusWord() = aStatus.GetStatusWord() | EditStatusFlags::CRSRMOVEFAIL;
diff --git a/include/editeng/editstat.hxx b/include/editeng/editstat.hxx
index 7a64e817b194..f6894923c2e5 100644
--- a/include/editeng/editstat.hxx
+++ b/include/editeng/editstat.hxx
@@ -29,7 +29,6 @@ enum class EEControlBits
 {
     NONE               = 0x00000000,
     USECHARATTRIBS     = 0x00000001,  // Use of hard character attributes
-    CRSRLEFTPARA       = 0x00000004,  // Cursor is moved to another paragraph
     DOIDLEFORMAT       = 0x00000008,  // Formatting idle
     PASTESPECIAL       = 0x00000010,  // Allow PasteSpecial
     AUTOINDENTING      = 0x00000020,  // Automatic indenting
@@ -55,7 +54,7 @@ enum class EEControlBits
 };
 namespace o3tl
 {
-    template<> struct typed_flags<EEControlBits> : is_typed_flags<EEControlBits, 0x037efffd> {};
+    template<> struct typed_flags<EEControlBits> : is_typed_flags<EEControlBits, 0x037efff9> {};
 }
 
 enum class EVControlBits


More information about the Libreoffice-commits mailing list