[Libreoffice-commits] core.git: include/vcl svtools/source vcl/source

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Mon Apr 20 17:49:23 UTC 2020


 include/vcl/combobox.hxx           |    1 -
 include/vcl/edit.hxx               |    3 ---
 svtools/source/control/ctrlbox.cxx |    1 -
 vcl/source/control/combobox.cxx    |    4 ----
 vcl/source/control/edit.cxx        |   15 ---------------
 5 files changed, 24 deletions(-)

New commits:
commit 5dbb5f7266a8af21544fdd795adbc01e14cfe219
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sat Apr 18 20:15:32 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Apr 20 19:48:49 2020 +0200

    drop EnableSelectAll
    
    Change-Id: I57dcca28daf7fe8544ee524b8b41bbc1fe591fac
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92489
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/include/vcl/combobox.hxx b/include/vcl/combobox.hxx
index 45d59dc35156..562072baa9ef 100644
--- a/include/vcl/combobox.hxx
+++ b/include/vcl/combobox.hxx
@@ -89,7 +89,6 @@ public:
     void            RemoveEntryAt(sal_Int32  nPos);
 
     void            Clear();
-    void            EnableSelectAll();
     sal_Int32       GetEntryPos( const OUString& rStr ) const;
     Image           GetEntryImage( sal_Int32  nPos ) const;
     OUString        GetEntry( sal_Int32  nPos ) const;
diff --git a/include/vcl/edit.hxx b/include/vcl/edit.hxx
index a5f12d44f7b0..1f59b7382a77 100644
--- a/include/vcl/edit.hxx
+++ b/include/vcl/edit.hxx
@@ -71,7 +71,6 @@ private:
     sal_Int32           mnMaxWidthChars;
     sal_Unicode         mcEchoChar;
     bool                mbModified:1,
-                        mbSelectAllSingleClick:1,
                         mbInternModified:1,
                         mbReadOnly:1,
                         mbInsertMode:1,
@@ -179,8 +178,6 @@ public:
     virtual void        SetReadOnly( bool bReadOnly = true );
     virtual bool        IsReadOnly() const { return mbReadOnly; }
 
-    void                SetSelectAllSingleClick( bool bSelectAllSingleClick );
-
     void                SetInsertMode( bool bInsert );
     bool                IsInsertMode() const;
 
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index 0fe1a5d47a5c..51895051551f 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -332,7 +332,6 @@ void DrawLine( OutputDevice& rDev, const basegfx::B2DPoint& rP1, const basegfx::
 FontNameBox::FontNameBox( vcl::Window* pParent, WinBits nWinStyle ) :
     ComboBox( pParent, nWinStyle )
 {
-    EnableSelectAll();
     mbWYSIWYG = false;
     InitFontMRUEntriesFile();
 }
diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index c3e8c522a129..36f35704c4cf 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -529,10 +529,6 @@ void ComboBox::EnableAutoSize( bool bAuto )
         }
     }
 }
-void ComboBox::EnableSelectAll()
-{
-    m_pImpl->m_pSubEdit->SetSelectAllSingleClick(true);
-}
 
 void ComboBox::SetDropDownLineCount( sal_uInt16 nLines )
 {
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index f9ef8642a8a9..d8b6eab9e5ef 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -261,7 +261,6 @@ void Edit::ImplInitEditData()
     mbModified              = false;
     mbInternModified        = false;
     mbReadOnly              = false;
-    mbSelectAllSingleClick  = false;
     mbInsertMode            = true;
     mbClickedInSelection    = false;
     mbActivePopup           = false;
@@ -1844,11 +1843,6 @@ void Edit::GetFocus()
     else if ( !mbActivePopup )
     {
         maUndoText = maText.toString();
-        if(mbSelectAllSingleClick)
-        {
-            maSelection.Min() = 0;
-            maSelection.Max() = maText.getLength();
-        }
         SelectionOptions nSelOptions = GetSettings().GetStyleSettings().GetSelectionOptions();
         if ( !( GetStyle() & (WB_NOHIDESELECTION|WB_READONLY) )
                 && ( GetGetFocusFlags() & (GetFocusFlags::Init|GetFocusFlags::Tab|GetFocusFlags::CURSOR|GetFocusFlags::Mnemonic) ) )
@@ -2359,15 +2353,6 @@ void Edit::SetReadOnly( bool bReadOnly )
     }
 }
 
-void Edit::SetSelectAllSingleClick( bool bSelectAllSingleClick )
-{
-    if ( mbSelectAllSingleClick != bSelectAllSingleClick )
-    {
-        mbSelectAllSingleClick = bSelectAllSingleClick;
-        if ( mpSubEdit )
-            mpSubEdit->SetSelectAllSingleClick( bSelectAllSingleClick );
-    }
-}
 void Edit::SetInsertMode( bool bInsert )
 {
     if ( bInsert != mbInsertMode )


More information about the Libreoffice-commits mailing list