include/svtools/ctrlbox.hxx | 2 ++
svx/source/tbxctrls/tbunocontroller.cxx | 8 +-------
2 files changed, 3 insertions(+), 7 deletions(-)
New commits:
commit 60146b4fe77013b044ae6a0a95a3a96e774da11c
Author: Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Sun Jun 29 21:33:03 2025 +0100
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Wed Jul 2 08:57:46 2025 +0200
Related: tdf#157738 use InterimItemWindow::GetFocus
reuse the common Focus impl by enabling InitControlBase
Change-Id: Ia281db9c685e25de268ebdfd35e095012e5fcfb8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187158
Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com>
Signed-off-by: Xisco Fauli <xiscofa...@libreoffice.org>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/187171
Tested-by: Jenkins
diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx
index 246e22922320..8bf8a48ae27a 100644
--- a/include/svtools/ctrlbox.hxx
+++ b/include/svtools/ctrlbox.hxx
@@ -498,6 +498,8 @@ public:
void disable_entry_completion() { m_xComboBox->set_entry_completion(false,
false); }
void connect_get_property_tree(const Link<tools::JsonWriter&, void>&
rLink) { m_xComboBox->connect_get_property_tree(rLink); }
+ weld::Widget* getWidget() { return m_xComboBox.get(); }
+
private:
FontSizeBox(const FontSizeBox&) = delete;
FontSizeBox& operator=(const FontSizeBox&) = delete;
diff --git a/svx/source/tbxctrls/tbunocontroller.cxx
b/svx/source/tbxctrls/tbunocontroller.cxx
index 4194acd89310..c58e3053c731 100644
--- a/svx/source/tbxctrls/tbunocontroller.cxx
+++ b/svx/source/tbxctrls/tbunocontroller.cxx
@@ -137,13 +137,6 @@ public:
InterimItemWindow::dispose();
}
- virtual void GetFocus() override
- {
- if (m_xWidget)
- m_xWidget->grab_focus();
- InterimItemWindow::GetFocus();
- }
-
virtual ~SvxFontSizeBox_Impl() override
{
disposeOnce();
@@ -317,6 +310,7 @@ SvxFontSizeBox_Impl::SvxFontSizeBox_Impl(vcl::Window*
pParent,
: InterimItemWindow(pParent, u"svx/ui/fontsizebox.ui"_ustr,
u"FontSizeBox"_ustr, true,
reinterpret_cast<sal_uInt64>(SfxViewShell::Current()))
,
SvxFontSizeBox_Base(m_xBuilder->weld_combo_box(u"fontsizecombobox"_ustr),
rFrame, rCtrl)
{
+ InitControlBase(m_xWidget->getWidget());
}
void SvxFontSizeBox_Impl::DataChanged( const DataChangedEvent& rDCEvt )
