diff options
author | Caolán McNamara <caolanm@redhat.com> | 2020-02-04 11:34:29 +0000 |
---|---|---|
committer | Szymon Kłos <eszkadev@gmail.com> | 2020-06-03 12:28:37 +0200 |
commit | f3ad8a70c3c15fd57891b0d2fe0bb0a5d2aa39a2 (patch) | |
tree | fc3659da96c6c372617c74a2881b3a0d6c696848 /svtools | |
parent | bc6b978eded974e6b05de16ee86682539c15b781 (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 8efb03a0e568..95347ffcb0bb 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> @@ -1104,7 +1106,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()) @@ -1114,6 +1121,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) |