summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-05-01 16:03:24 +0100
committerCaolán McNamara <caolanm@redhat.com>2018-05-01 21:23:32 +0200
commitab4609c8f9756e4fe6959a10e54ebee9105edbf7 (patch)
treeaf85710d0826cba013b52f72b9033dc5ad0dc1ba /vcl
parent43af818557904450b13839350c65ad865b9ee9d2 (diff)
weld ScMoveTableDlg
Change-Id: I4d5601d0fb02a20bf6c83fc10411f610bdb5ce32 Reviewed-on: https://gerrit.libreoffice.org/53698 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/app/salvtables.cxx14
-rw-r--r--vcl/unx/gtk3/gtk3gtkinst.cxx14
2 files changed, 24 insertions, 4 deletions
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 1805559ee3ad..aecefcffbd88 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -1214,7 +1214,7 @@ public:
m_xTreeView->RemoveEntry(pos);
}
- virtual int find(const OUString& rText) const override
+ virtual int find_text(const OUString& rText) const override
{
sal_Int32 nRet = m_xTreeView->GetEntryPos(rText);
if (nRet == LISTBOX_ENTRY_NOTFOUND)
@@ -1272,7 +1272,7 @@ public:
return aRows;
}
- virtual OUString get(int pos) const override
+ virtual OUString get_text(int pos) const override
{
return m_xTreeView->GetEntry(pos);
}
@@ -1758,6 +1758,16 @@ public:
m_xComboBoxText->SetStyle(m_xComboBoxText->GetStyle() | WB_SORT);
}
+ virtual void freeze() override
+ {
+ m_xComboBoxText->SetUpdateMode(false);
+ }
+
+ virtual void thaw() override
+ {
+ m_xComboBoxText->SetUpdateMode(true);
+ }
+
virtual ~SalInstanceComboBoxText() override
{
clear();
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 62ba6f6590f6..bb8b1d862e07 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -3037,7 +3037,7 @@ public:
enable_notify_events();
}
- virtual int find(const OUString& rText) const override
+ virtual int find_text(const OUString& rText) const override
{
Search aSearch(rText, 0);
gtk_tree_model_foreach(GTK_TREE_MODEL(m_pListStore), foreach_find, &aSearch);
@@ -3120,7 +3120,7 @@ public:
return aRows;
}
- virtual OUString get(int pos) const override
+ virtual OUString get_text(int pos) const override
{
return get(pos, 0);
}
@@ -4042,6 +4042,16 @@ public:
g_signal_handler_unblock(pEntry, m_nEntryActivateSignalId);
}
+ virtual void freeze() override
+ {
+ //do nothing for now
+ }
+
+ virtual void thaw() override
+ {
+ //do nothing for now
+ }
+
virtual ~GtkInstanceComboBoxText() override
{
if (GtkEntry* pEntry = get_entry())