include/svtools/valueset.hxx | 2 --
sc/source/ui/miscdlgs/tabbgcolordlg.cxx | 2 +-
svtools/source/control/valueset.cxx | 10 ++--------
3 files changed, 3 insertions(+), 11 deletions(-)
New commits:
commit 277d05a7188be77162e4a388c7c825daf8d6e326
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Oct 26 17:24:11 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Oct 26 21:04:51 2021 +0200
ValueSet doesn't use WB_NOPOINTERFOCUS anymore
Change-Id: I5d1b1240518aa97d229d56545e353259d226f1e2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124237
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/include/svtools/valueset.hxx b/include/svtools/valueset.hxx
index 186265404131..98e701800f04 100644
--- a/include/svtools/valueset.hxx
+++ b/include/svtools/valueset.hxx
@@ -86,8 +86,6 @@ WB_VSCROLL A scrollbar will be always shown. The
visible number of
lines have to be specified with SetLineCount() if this
flag is set.
WB_BORDER A border will be drawn around the window.
-WB_NOPOINTERFOCUS The focus won't be gathered, if the control was pressed by
- the mouse.
WB_TABSTOP It is possible to jump into the ValueSet with the tab key.
WB_NOTABSTOP It is not possible to jump into the ValueSet with the
tab key.
diff --git a/svtools/source/control/valueset.cxx
b/svtools/source/control/valueset.cxx
index c2baa2d5a483..75665ddd2654 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -486,15 +486,9 @@ bool ValueSet::MouseButtonDown( const MouseEvent&
rMouseEvent )
if (rMouseEvent.GetClicks() == 1)
{
if (pItem)
- {
SelectItem(pItem->mnId);
- bConsumed = true;
- }
- if (!(GetStyle() & WB_NOPOINTERFOCUS))
- {
- GrabFocus();
- bConsumed = true;
- }
+ GrabFocus();
+ bConsumed = true;
}
else if (pItem && rMouseEvent.GetClicks() == 2)
{
commit ff1b1e51e26ff7314e5d77db85b0541626cda4e0
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Tue Oct 26 17:21:18 2021 +0100
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Tue Oct 26 21:04:38 2021 +0200
let focus enter calc sheet bg color dialog's valueset on click
Change-Id: I884c8209e6b26e6c99654c4126ba81cf7e46c69f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124236
Tested-by: Caolán McNamara <caol...@redhat.com>
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
index d5491b50874e..7a346a4e3bb7 100644
--- a/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
+++ b/sc/source/ui/miscdlgs/tabbgcolordlg.cxx
@@ -40,7 +40,7 @@ ScTabBgColorDlg::ScTabBgColorDlg(weld::Window* pParent, const
OUString& rTitle,
m_xDialog->set_title(rTitle);
- const WinBits nBits(m_xTabBgColorSet->GetStyle() | WB_NAMEFIELD |
WB_ITEMBORDER | WB_NONEFIELD | WB_3DLOOK | WB_NO_DIRECTSELECT |
WB_NOPOINTERFOCUS);
+ const WinBits nBits(m_xTabBgColorSet->GetStyle() | WB_NAMEFIELD |
WB_ITEMBORDER | WB_NONEFIELD | WB_3DLOOK | WB_NO_DIRECTSELECT);
m_xTabBgColorSet->SetStyle(nBits);
m_xTabBgColorSet->SetText(rTabBgColorNoColorText);
