diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-01-28 13:12:00 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-02-04 22:37:06 +0100 |
| commit | 336feec6b0bef15bd3a234c63d63ad8d869a3374 (patch) | |
| tree | 0fcdc82b8367b915a29292a093bb3c2dcaed2d80 /cui | |
| parent | f8bef86cc88e99b32e223b2bd675959c6d8e46ad (diff) | |
Resolves: tdf#122930 paper tray is to update on focus-in
which adds the problem that GtkComboBox doesn't send a focus-in,
but its toggle does, to find and use that instead
Change-Id: I18d46511bf2e6997539a8413f574a94b24b4583f
Reviewed-on: https://gerrit.libreoffice.org/67136
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cui')
| -rw-r--r-- | cui/source/inc/page.hxx | 2 | ||||
| -rw-r--r-- | cui/source/tabpages/page.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx index da7ee7047391..d6fc20577fa7 100644 --- a/cui/source/inc/page.hxx +++ b/cui/source/inc/page.hxx @@ -136,7 +136,7 @@ private: void Init_Impl(); DECL_LINK(LayoutHdl_Impl, weld::ComboBoxText&, void); - DECL_LINK(PaperBinHdl_Impl, weld::ComboBoxText&, void); + DECL_LINK(PaperBinHdl_Impl, weld::Widget&, void); DECL_LINK(SwapOrientation_Impl, weld::Button&, void); void SwapFirstValues_Impl( bool bSet ); DECL_LINK(BorderModify_Impl, weld::MetricSpinButton&, void); diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index 054bc8fb16ed..a3e7a2ebb80e 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -314,7 +314,7 @@ void SvxPageDescPage::Init_Impl() // adjust the handler m_xLayoutBox->connect_changed(LINK(this, SvxPageDescPage, LayoutHdl_Impl)); - m_xPaperTrayBox->connect_changed(LINK(this, SvxPageDescPage, PaperBinHdl_Impl)); + m_xPaperTrayBox->connect_focus_in(LINK(this, SvxPageDescPage, PaperBinHdl_Impl)); m_xPaperSizeBox->connect_changed(LINK(this, SvxPageDescPage, PaperSizeSelect_Impl)); m_xPaperWidthEdit->connect_value_changed( LINK(this, SvxPageDescPage, PaperSizeModify_Impl)); m_xPaperHeightEdit->connect_value_changed(LINK(this, SvxPageDescPage, PaperSizeModify_Impl)); @@ -808,7 +808,7 @@ IMPL_LINK_NOARG(SvxPageDescPage, LayoutHdl_Impl, weld::ComboBoxText&, void) UpdateExample_Impl( true ); } -IMPL_LINK_NOARG(SvxPageDescPage, PaperBinHdl_Impl, weld::ComboBoxText&, void) +IMPL_LINK_NOARG(SvxPageDescPage, PaperBinHdl_Impl, weld::Widget&, void) { if (m_xPaperTrayBox->get_count() > 1) // already filled |