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 /cui/source/inc/swpossizetabpage.hxx | |
parent | 60a23d5d5f0963cd9bea7711ff4336418e3d6392 (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/swpossizetabpage.hxx')
-rw-r--r-- | cui/source/inc/swpossizetabpage.hxx | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx index d9e326dee456..9171ddf6cf04 100644 --- a/cui/source/inc/swpossizetabpage.hxx +++ b/cui/source/inc/swpossizetabpage.hxx @@ -72,26 +72,26 @@ class SvxSwPosSizeTabPage : public SfxTabPage std::unique_ptr<weld::CheckButton> m_xSizeCB; std::unique_ptr<weld::Widget> m_xPosFrame; std::unique_ptr<weld::Label> m_xHoriFT; - std::unique_ptr<weld::ComboBoxText> m_xHoriLB; + std::unique_ptr<weld::ComboBox> m_xHoriLB; std::unique_ptr<weld::Label> m_xHoriByFT; std::unique_ptr<weld::MetricSpinButton> m_xHoriByMF; std::unique_ptr<weld::Label> m_xHoriToFT; - std::unique_ptr<weld::ComboBoxText> m_xHoriToLB; + std::unique_ptr<weld::ComboBox> m_xHoriToLB; std::unique_ptr<weld::CheckButton> m_xHoriMirrorCB; std::unique_ptr<weld::Label> m_xVertFT; - std::unique_ptr<weld::ComboBoxText> m_xVertLB; + std::unique_ptr<weld::ComboBox> m_xVertLB; std::unique_ptr<weld::Label> m_xVertByFT; std::unique_ptr<weld::MetricSpinButton> m_xVertByMF; std::unique_ptr<weld::Label> m_xVertToFT; - std::unique_ptr<weld::ComboBoxText> m_xVertToLB; + std::unique_ptr<weld::ComboBox> m_xVertToLB; std::unique_ptr<weld::CheckButton> m_xFollowCB; std::unique_ptr<weld::CustomWeld> m_xExampleWN; DECL_LINK(RangeModifyHdl, weld::Widget&, void); DECL_LINK(RangeModifyClickHdl, weld::ToggleButton&, void); DECL_LINK(AnchorTypeHdl, weld::ToggleButton&, void); - DECL_LINK(PosHdl, weld::ComboBoxText&, void); - DECL_LINK(RelHdl, weld::ComboBoxText&, void); + DECL_LINK(PosHdl, weld::ComboBox&, void); + DECL_LINK(RelHdl, weld::ComboBox&, void); DECL_LINK(MirrorHdl, weld::ToggleButton&, void); DECL_LINK(ModifyHdl, weld::MetricSpinButton&, void); DECL_LINK(ProtectHdl, weld::ToggleButton&, void); @@ -99,12 +99,12 @@ class SvxSwPosSizeTabPage : public SfxTabPage void InitPos(RndStdIds nAnchorType, sal_uInt16 nH, sal_uInt16 nHRel, sal_uInt16 nV, sal_uInt16 nVRel, long nX, long nY); - static sal_uInt16 GetMapPos(FrmMap const *pMap, const weld::ComboBoxText& rAlignLB); - static short GetAlignment(FrmMap const *pMap, sal_uInt16 nMapPos, const weld::ComboBoxText& rRelationLB); - static short GetRelation(const weld::ComboBoxText& rRelationLB); + static sal_uInt16 GetMapPos(FrmMap const *pMap, const weld::ComboBox& rAlignLB); + static short GetAlignment(FrmMap const *pMap, sal_uInt16 nMapPos, const weld::ComboBox& rRelationLB); + static short GetRelation(const weld::ComboBox& rRelationLB); RndStdIds GetAnchorType(bool* pbHasChanged = nullptr); - void FillRelLB(FrmMap const *pMap, sal_uInt16 nLBSelPos, sal_uInt16 nAlign, sal_uInt16 nRel, weld::ComboBoxText& rLB, weld::Label& rFT); - sal_uInt16 FillPosLB(FrmMap const *pMap, sal_uInt16 nAlign, const sal_uInt16 _nRel, weld::ComboBoxText& rLB); + void FillRelLB(FrmMap const *pMap, sal_uInt16 nLBSelPos, sal_uInt16 nAlign, sal_uInt16 nRel, weld::ComboBox& rLB, weld::Label& rFT); + sal_uInt16 FillPosLB(FrmMap const *pMap, sal_uInt16 nAlign, const sal_uInt16 _nRel, weld::ComboBox& rLB); void UpdateExample(); |