diff options
author | Caolán McNamara <caolanm@redhat.com> | 2020-02-04 11:34:29 +0000 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2020-02-06 12:26:37 +0100 |
commit | 8950cb8ae6a1621729ec43a6dd1c29cf04260797 (patch) | |
tree | 2f0a50e6778ab425813ad626e634cd8b233514ca /svtools | |
parent | 415c1b05242b80ca883596952caa0e179a07b409 (diff) |
weld SvxFontSizeBox_Impl
which enables making a native gtk widget a member of a toolbar
This widget wants to distinguish between a value getting selected
by the menu or not, which is fairly tricky
Change-Id: I9014785530bd0d82ffa66842f940feb2d3237e68
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87971
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'svtools')
-rw-r--r-- | svtools/source/control/ctrlbox.cxx | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index b47b3ba74e2e..6ecbfd596bc5 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -52,6 +52,8 @@ #include <rtl/bootstrap.hxx> +#include <boost/property_tree/ptree.hpp> + #include <borderline.hrc> #include <stdio.h> @@ -1025,7 +1027,12 @@ SvtFontSizeBox::SvtFontSizeBox(std::unique_ptr<weld::ComboBox> p) m_xComboBox->connect_changed(LINK(this, SvtFontSizeBox, ModifyHdl)); } -IMPL_LINK_NOARG(SvtFontSizeBox, ReformatHdl, weld::Widget&, void) +boost::property_tree::ptree SvtFontSizeBox::get_property_tree() const +{ + return m_xComboBox->get_property_tree(); +} + +IMPL_LINK(SvtFontSizeBox, ReformatHdl, weld::Widget&, rWidget, void) { FontSizeNames aFontSizeNames(Application::GetSettings().GetUILanguageTag().getLanguageType()); if (!bRelativeMode || !aFontSizeNames.IsEmpty()) @@ -1035,6 +1042,8 @@ IMPL_LINK_NOARG(SvtFontSizeBox, ReformatHdl, weld::Widget&, void) } set_value(get_value()); + + m_aFocusOutHdl.Call(rWidget); } IMPL_LINK(SvtFontSizeBox, ModifyHdl, weld::ComboBox&, rBox, void) |