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

[Libreoffice Gerrit user]

 compilerplugins/clang/unusedenumconstants.readonly.results |    2 
 editeng/source/editeng/impedit.cxx                         |   30 -------------
 editeng/source/editeng/impedit.hxx                         |    1 
 include/editeng/editstat.hxx                               |    3 -
 4 files changed, 2 insertions(+), 34 deletions(-)

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

    remove unused EVControlBits enum values
    
    Change-Id: I4e10f0a2f40f9e7b6cc40a810468f43b2ab97aa9
    Reviewed-on: https://gerrit.libreoffice.org/64090
    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 e22ad2930bc0..c1731a325120 100644
--- a/compilerplugins/clang/unusedenumconstants.readonly.results
+++ b/compilerplugins/clang/unusedenumconstants.readonly.results
@@ -310,8 +310,6 @@ include/editeng/editstat.hxx:32
     enum EEControlBits CRSRLEFTPARA
 include/editeng/editstat.hxx:49
     enum EEControlBits AUTOCOMPLETE
-include/editeng/editstat.hxx:64
-    enum EVControlBits BIGSCROLL
 include/editeng/flditem.hxx:94
     enum SvxDateFormat System
 include/editeng/flditem.hxx:96
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index 0f91a4fa24eb..b17c8c9c5386 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -645,10 +645,7 @@ void ImpEditView::SetOutputArea( const tools::Rectangle& rRect )
     if ( aOutArea.Bottom() < aOutArea.Top() )
         aOutArea.SetBottom( aOutArea.Top() );
 
-    if ( DoBigScroll() )
-        SetScrollDiffX( static_cast<sal_uInt16>(aOutArea.GetWidth()) * 3 / 10 );
-    else
-        SetScrollDiffX( static_cast<sal_uInt16>(aOutArea.GetWidth()) * 2 / 10 );
+    SetScrollDiffX( static_cast<sal_uInt16>(aOutArea.GetWidth()) * 2 / 10 );
 }
 
 void ImpEditView::InvalidateAtWindow(const tools::Rectangle& rRect)
@@ -995,31 +992,6 @@ void ImpEditView::ShowCursor( bool bGotoCursor, bool bForceVisCursor )
             long nDiffX = !IsVertical() ? nDocDiffX : (IsTopToBottom() ? -nDocDiffY : nDocDiffY);
             long nDiffY = !IsVertical() ? nDocDiffY : (IsTopToBottom() ? nDocDiffX : -nDocDiffX);
 
-            // Negative: Back to the top or left edge
-            if ( ( std::abs( nDiffY ) > pEditEngine->GetOnePixelInRef() ) && DoBigScroll() )
-            {
-                long nH = aOutArea.GetHeight() / 4;
-                if ( ( nH > aEditCursor.GetHeight() ) && ( std::abs( nDiffY ) < nH ) )
-                {
-                    if ( nDiffY < 0 )
-                        nDiffY -= nH;
-                    else
-                        nDiffY += nH;
-                }
-            }
-
-            if ( ( std::abs( nDiffX ) > pEditEngine->GetOnePixelInRef() ) && DoBigScroll() )
-            {
-                long nW = aOutArea.GetWidth() / 4;
-                if ( std::abs( nDiffX ) < nW )
-                {
-                    if ( nDiffY < 0 )
-                        nDiffY -= nW;
-                    else
-                        nDiffY += nW;
-                }
-            }
-
             if ( nDiffX )
                 pEditEngine->GetInternalEditStatus().GetStatusWord() = pEditEngine->GetInternalEditStatus().GetStatusWord() | EditStatusFlags::HSCROLL;
             if ( nDiffY )
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index dffd2534ef69..418ef91f6814 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -382,7 +382,6 @@ public:
 
     bool        DoSingleLinePaste() const       { return bool( nControl & EVControlBits::SINGLELINEPASTE ); }
     bool        DoAutoScroll() const            { return bool( nControl & EVControlBits::AUTOSCROLL ); }
-    bool        DoBigScroll() const             { return bool( nControl & EVControlBits::BIGSCROLL ); }
     bool        DoAutoSize() const              { return bool( nControl & EVControlBits::AUTOSIZE ); }
     bool        DoAutoWidth() const             { return bool( nControl & EVControlBits::AUTOSIZEX); }
     bool        DoAutoHeight() const            { return bool( nControl & EVControlBits::AUTOSIZEY); }
diff --git a/include/editeng/editstat.hxx b/include/editeng/editstat.hxx
index af8d5944e39e..7a64e817b194 100644
--- a/include/editeng/editstat.hxx
+++ b/include/editeng/editstat.hxx
@@ -61,7 +61,6 @@ namespace o3tl
 enum class EVControlBits
 {
     AUTOSCROLL         = 0x0001,  // Auto scrolling horizontally
-    BIGSCROLL          = 0x0002,  // Scroll further to the cursor
     ENABLEPASTE        = 0x0004,  // Enable Paste
     SINGLELINEPASTE    = 0x0008,  // View: Paste in input line ...
     OVERWRITE          = 0x0010,  // Overwrite mode
@@ -72,7 +71,7 @@ enum class EVControlBits
 };
 namespace o3tl
 {
-    template<> struct typed_flags<EVControlBits> : is_typed_flags<EVControlBits, 0xff> {};
+    template<> struct typed_flags<EVControlBits> : is_typed_flags<EVControlBits, 0xfd> {};
 }
 
 enum class EditStatusFlags