support case sensitive entry completion

Change-Id: Ibaf0962e3d150c67f951e1b20c0e72aacfc7ea78
Reviewed-on: https://gerrit.libreoffice.org/69284
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

4 files changed, 63 insertions, 19 deletions

diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index 75b33607d1dd..0856e4748929 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -478,7 +478,7 @@ public:
     virtual void set_entry_max_length(int nChars) = 0;
     virtual void select_entry_region(int nStartPos, int nEndPos) = 0;
     virtual bool get_entry_selection_bounds(int& rStartPos, int& rEndPos) = 0;
-    virtual void set_entry_completion(bool bEnable) = 0;
+    virtual void set_entry_completion(bool bEnable, bool bCaseSensitive = false) = 0;
 
     virtual bool get_popup_shown() const = 0;
 
diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx
index 1d3eca06ec2d..b0e896c4a022 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -1618,7 +1618,7 @@ SwInsertSectionTabPage::SwInsertSectionTabPage(TabPageParent pParent, const SfxI
     m_xCurName->connect_changed( LINK( this, SwInsertSectionTabPage, NameEditHdl));
     m_xDDECB->connect_toggled( LINK( this, SwInsertSectionTabPage, DDEHdl ));
     ChangeProtectHdl(*m_xProtectCB);
-//TODO    m_xSubRegionED->EnableAutocomplete( true, true );
+    m_xSubRegionED->set_entry_completion(true, true);
 }
 
 SwInsertSectionTabPage::~SwInsertSectionTabPage()
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index de75da50d37b..c2c5ea026936 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -4016,7 +4016,7 @@ public:
         assert(false);
     }
 
-    virtual void set_entry_completion(bool) override
+    virtual void set_entry_completion(bool, bool) override
     {
         assert(false);
     }
@@ -4109,9 +4109,9 @@ public:
         m_xComboBox->SetMaxTextLen(nChars);
     }
 
-    virtual void set_entry_completion(bool bEnable) override
+    virtual void set_entry_completion(bool bEnable, bool bCaseSensitive) override
     {
-        m_xComboBox->EnableAutocomplete(bEnable);
+        m_xComboBox->EnableAutocomplete(bEnable, bCaseSensitive);
     }
 
     virtual void select_entry_region(int nStartPos, int nEndPos) override
@@ -4178,7 +4178,7 @@ public:
         pTreeView->SetStyle(pTreeView->GetStyle() | WB_SORT);
     }
 
-    virtual void set_entry_completion(bool bEnable) override
+    virtual void set_entry_completion(bool bEnable, bool /*bCaseSensitive*/) override
     {
         assert(!bEnable && "not implemented yet"); (void) bEnable;
         Edit& rEntry = m_pEntry->getEntry();
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index d15928180331..488db5a24fb6 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -5428,7 +5428,7 @@ namespace
         return ret;
     }
 
-    int starts_with(GtkTreeModel* pTreeModel, const OUString& rStr, int col, int nStartRow)
+    int starts_with(GtkTreeModel* pTreeModel, const OUString& rStr, int col, int nStartRow, bool bCaseSensitive)
     {
         GtkTreeIter iter;
         if (!gtk_tree_model_iter_nth_child(pTreeModel, &iter, nullptr, nStartRow))
@@ -5442,7 +5442,7 @@ namespace
             gtk_tree_model_get(pTreeModel, &iter, col, &pStr, -1);
             OUString aStr(pStr, pStr ? strlen(pStr) : 0, RTL_TEXTENCODING_UTF8);
             g_free(pStr);
-            const bool bMatch = rI18nHelper.MatchString(rStr, aStr);
+            const bool bMatch = !bCaseSensitive ? rI18nHelper.MatchString(rStr, aStr) : aStr.startsWith(rStr);
             if (bMatch)
                 return nRet;
             ++nRet;
@@ -6644,9 +6644,9 @@ public:
         return gtk_tree_selection_count_selected_rows(gtk_tree_view_get_selection(m_pTreeView));
     }
 
-    int starts_with(const OUString& rStr, int col, int nStartRow)
+    int starts_with(const OUString& rStr, int col, int nStartRow, bool bCaseSensitive)
     {
-        return ::starts_with(GTK_TREE_MODEL(m_pTreeStore), rStr, get_model_col(col), nStartRow);
+        return ::starts_with(GTK_TREE_MODEL(m_pTreeStore), rStr, get_model_col(col), nStartRow, bCaseSensitive);
     }
 
     virtual void disable_notify_events() override
@@ -7444,6 +7444,7 @@ private:
     std::vector<int> m_aSeparatorRows;
     gboolean m_bPopupActive;
     bool m_bAutoComplete;
+    bool m_bAutoCompleteCaseSensitive;
     gulong m_nToggleFocusInSignalId;
     gulong m_nToggleFocusOutSignalId;
     gulong m_nChangedSignalId;
@@ -7478,12 +7479,28 @@ private:
         if (nStart == -1)
             nStart = 0;
 
-        // Try match case insensitive from current position
-        int nPos = starts_with(m_pTreeModel, aStartText, 0, nStart);
-        if (nPos == -1 && nStart != 0)
+        int nPos = -1;
+
+        if (!m_bAutoCompleteCaseSensitive)
         {
-            // Try match case insensitive, but from start
-            nPos = starts_with(m_pTreeModel, aStartText, 0, 0);
+            // Try match case insensitive from current position
+            nPos = starts_with(m_pTreeModel, aStartText, 0, nStart, false);
+            if (nPos == -1 && nStart != 0)
+            {
+                // Try match case insensitive, but from start
+                nPos = starts_with(m_pTreeModel, aStartText, 0, 0, false);
+            }
+        }
+
+        if (nPos == -1)
+        {
+            // Try match case sensitive from current position
+            nPos = starts_with(m_pTreeModel, aStartText, 0, nStart, true);
+            if (nPos == -1 && nStart != 0)
+            {
+                // Try match case sensitive, but from start
+                nPos = starts_with(m_pTreeModel, aStartText, 0, 0, true);
+            }
         }
 
         if (nPos != -1)
@@ -7817,6 +7834,7 @@ public:
         , m_aQuickSelectionEngine(*this)
         , m_bPopupActive(false)
         , m_bAutoComplete(false)
+        , m_bAutoCompleteCaseSensitive(false)
         , m_nToggleFocusInSignalId(0)
         , m_nToggleFocusOutSignalId(0)
         , m_nChangedSignalId(g_signal_connect(m_pComboBox, "changed", G_CALLBACK(signalChanged), this))
@@ -8131,9 +8149,10 @@ public:
         return gtk_editable_get_selection_bounds(GTK_EDITABLE(pEntry), &rStartPos, &rEndPos);
     }
 
-    virtual void set_entry_completion(bool bEnable) override
+    virtual void set_entry_completion(bool bEnable, bool bCaseSensitive) override
     {
         m_bAutoComplete = bEnable;
+        m_bAutoCompleteCaseSensitive = bCaseSensitive;
     }
 
     virtual void disable_notify_events() override
@@ -8250,6 +8269,7 @@ private:
     gulong m_nKeyPressSignalId;
     gulong m_nEntryInsertTextSignalId;
     guint m_nAutoCompleteIdleId;
+    bool m_bAutoCompleteCaseSensitive;
 
     gboolean signal_key_press(GdkEventKey* pEvent)
     {
@@ -8311,11 +8331,33 @@ private:
             nStart = 0;
 
         // Try match case insensitive from current position
-        int nPos = m_pTreeView->starts_with(aStartText, 0, nStart);
+        int nPos = m_pTreeView->starts_with(aStartText, 0, nStart, true);
         if (nPos == -1 && nStart != 0)
         {
             // Try match case insensitive, but from start
-            nPos = m_pTreeView->starts_with(aStartText, 0, 0);
+            nPos = m_pTreeView->starts_with(aStartText, 0, 0, true);
+        }
+
+        if (!m_bAutoCompleteCaseSensitive)
+        {
+            // Try match case insensitive from current position
+            nPos = m_pTreeView->starts_with(aStartText, 0, nStart, false);
+            if (nPos == -1 && nStart != 0)
+            {
+                // Try match case insensitive, but from start
+                nPos = m_pTreeView->starts_with(aStartText, 0, 0, false);
+            }
+        }
+
+        if (nPos == -1)
+        {
+            // Try match case sensitive from current position
+            nPos = m_pTreeView->starts_with(aStartText, 0, nStart, true);
+            if (nPos == -1 && nStart != 0)
+            {
+                // Try match case sensitive, but from start
+                nPos = m_pTreeView->starts_with(aStartText, 0, 0, true);
+            }
         }
 
         if (nPos != -1)
@@ -8352,6 +8394,7 @@ public:
         , m_pEntry(dynamic_cast<GtkInstanceEntry*>(m_xEntry.get()))
         , m_pTreeView(dynamic_cast<GtkInstanceTreeView*>(m_xTreeView.get()))
         , m_nAutoCompleteIdleId(0)
+        , m_bAutoCompleteCaseSensitive(false)
     {
         assert(m_pEntry);
         GtkWidget* pWidget = m_pEntry->getWidget();
@@ -8372,9 +8415,10 @@ public:
         gtk_tree_sortable_set_sort_column_id(pSortable, 1, GTK_SORT_ASCENDING);
     }
 
-    virtual void set_entry_completion(bool bEnable) override
+    virtual void set_entry_completion(bool bEnable, bool bCaseSensitive) override
     {
         assert(!bEnable && "not implemented yet"); (void)bEnable;
+        m_bAutoCompleteCaseSensitive = bCaseSensitive;
     }
 
     virtual void grab_focus() override { m_xEntry->grab_focus(); }