summaryrefslogtreecommitdiff
path: root/cui/source/inc/cuicharmap.hxx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-09-14 15:07:17 +0100
committerCaolán McNamara <caolanm@redhat.com>2018-09-17 15:11:47 +0200
commit76c7cabc42a239dbaf9e72122d36fb213e5a3555 (patch)
tree94eac2ae99855b7410168ad4f7be9ea9a8a02d60 /cui/source/inc/cuicharmap.hxx
parent60a23d5d5f0963cd9bea7711ff4336418e3d6392 (diff)
rename to weld::ComboBox are they are not text only now
Change-Id: Ice26d1fd2ad97a6959c6916fef428777efea9c2d Reviewed-on: https://gerrit.libreoffice.org/60500 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'cui/source/inc/cuicharmap.hxx')
-rw-r--r--cui/source/inc/cuicharmap.hxx10
1 files changed, 5 insertions, 5 deletions
diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx
index cd47e7edaf0a..25ecd6d886d8 100644
--- a/cui/source/inc/cuicharmap.hxx
+++ b/cui/source/inc/cuicharmap.hxx
@@ -91,9 +91,9 @@ private:
std::unique_ptr<weld::Button> m_xOKBtn;
std::unique_ptr<weld::Label> m_xFontText;
- std::unique_ptr<weld::ComboBoxText> m_xFontLB;
+ std::unique_ptr<weld::ComboBox> m_xFontLB;
std::unique_ptr<weld::Label> m_xSubsetText;
- std::unique_ptr<weld::ComboBoxText> m_xSubsetLB;
+ std::unique_ptr<weld::ComboBox> m_xSubsetLB;
std::unique_ptr<weld::Entry> m_xSearchText;
std::unique_ptr<weld::Entry> m_xHexCodeText;
std::unique_ptr<weld::Entry> m_xDecimalCodeText;
@@ -113,8 +113,8 @@ private:
enum class Radix : sal_Int16 {decimal = 10, hexadecimal=16};
- DECL_LINK(FontSelectHdl, weld::ComboBoxText&, void);
- DECL_LINK(SubsetSelectHdl, weld::ComboBoxText&, void);
+ DECL_LINK(FontSelectHdl, weld::ComboBox&, void);
+ DECL_LINK(SubsetSelectHdl, weld::ComboBox&, void);
DECL_LINK(CharDoubleClickHdl, SvxShowCharSet*,void);
DECL_LINK(CharSelectHdl, SvxShowCharSet*, void);
DECL_LINK(CharHighlightHdl, SvxShowCharSet*, void);
@@ -136,7 +136,7 @@ private:
DECL_LINK(SearchUpdateHdl, weld::Entry&, void);
DECL_LINK(SearchFieldGetFocusHdl, weld::Widget&, void);
- static void fillAllSubsets(weld::ComboBoxText& rListBox);
+ static void fillAllSubsets(weld::ComboBox& rListBox);
void selectCharByCode(Radix radix);
public: