diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-09-14 15:07:17 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-09-17 15:11:47 +0200 |
| commit | 76c7cabc42a239dbaf9e72122d36fb213e5a3555 (patch) | |
| tree | 94eac2ae99855b7410168ad4f7be9ea9a8a02d60 /include/sfx2 | |
| parent | Qt5 just implement a non-native file picker (diff) | |
| download | core-76c7cabc42a239dbaf9e72122d36fb213e5a3555.tar.gz core-76c7cabc42a239dbaf9e72122d36fb213e5a3555.zip | |
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 'include/sfx2')
| -rw-r--r-- | include/sfx2/mgetempl.hxx | 12 | ||||
| -rw-r--r-- | include/sfx2/newstyle.hxx | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/include/sfx2/mgetempl.hxx b/include/sfx2/mgetempl.hxx index d63b1a05ed0a..b0ea05e2ee87 100644 --- a/include/sfx2/mgetempl.hxx +++ b/include/sfx2/mgetempl.hxx @@ -52,13 +52,13 @@ class SfxManageStyleSheetPage final : public SfxTabPage std::unique_ptr<weld::Entry> m_xName; std::unique_ptr<weld::CheckButton> m_xAutoCB; std::unique_ptr<weld::Label> m_xFollowFt; - std::unique_ptr<weld::ComboBoxText> m_xFollowLb; + std::unique_ptr<weld::ComboBox> m_xFollowLb; std::unique_ptr<weld::Button> m_xEditStyleBtn; std::unique_ptr<weld::Label> m_xBaseFt; - std::unique_ptr<weld::ComboBoxText> m_xBaseLb; + std::unique_ptr<weld::ComboBox> m_xBaseLb; std::unique_ptr<weld::Button> m_xEditLinkStyleBtn; std::unique_ptr<weld::Label> m_xFilterFt; - std::unique_ptr<weld::ComboBoxText> m_xFilterLb; + std::unique_ptr<weld::ComboBox> m_xFilterLb; std::unique_ptr<weld::Label> m_xDescFt; std::unique_ptr<weld::Label> m_xNameFt; @@ -67,12 +67,12 @@ friend class SfxStyleDialogController; DECL_LINK(GetFocusHdl, weld::Widget&, void); DECL_LINK(LoseFocusHdl, weld::Widget&, void); - DECL_LINK(EditStyleSelectHdl_Impl, weld::ComboBoxText&, void); + DECL_LINK(EditStyleSelectHdl_Impl, weld::ComboBox&, void); DECL_LINK(EditStyleHdl_Impl, weld::Button&, void); - DECL_LINK(EditLinkStyleSelectHdl_Impl, weld::ComboBoxText&, void); + DECL_LINK(EditLinkStyleSelectHdl_Impl, weld::ComboBox&, void); DECL_LINK(EditLinkStyleHdl_Impl, weld::Button&, void); - void UpdateName_Impl(weld::ComboBoxText*, const OUString &rNew); + void UpdateName_Impl(weld::ComboBox*, const OUString &rNew); void SetDescriptionText_Impl(); virtual ~SfxManageStyleSheetPage() override; diff --git a/include/sfx2/newstyle.hxx b/include/sfx2/newstyle.hxx index 5cd9e24b41e7..8e7489881c47 100644 --- a/include/sfx2/newstyle.hxx +++ b/include/sfx2/newstyle.hxx @@ -38,7 +38,7 @@ private: DECL_DLLPRIVATE_LINK(OKHdl, weld::TreeView&, void); DECL_DLLPRIVATE_LINK(OKClickHdl, weld::Button&, void); - DECL_DLLPRIVATE_LINK(ModifyHdl, weld::ComboBoxText&, void); + DECL_DLLPRIVATE_LINK(ModifyHdl, weld::ComboBox&, void); public: SfxNewStyleDlg(weld::Window* pParent, SfxStyleSheetBasePool&); |