summaryrefslogtreecommitdiff
path: root/cui/source/inc/page.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/page.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/page.hxx')
-rw-r--r--cui/source/inc/page.hxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx
index 74155a61b0d3..69892a64f699 100644
--- a/cui/source/inc/page.hxx
+++ b/cui/source/inc/page.hxx
@@ -107,7 +107,7 @@ private:
std::unique_ptr<weld::RadioButton> m_xLandscapeBtn;
std::unique_ptr<weld::Label> m_xTextFlowLbl;
std::unique_ptr<svx::SvxFrameDirectionListBox> m_xTextFlowBox;
- std::unique_ptr<weld::ComboBoxText> m_xPaperTrayBox;
+ std::unique_ptr<weld::ComboBox> m_xPaperTrayBox;
// Margins
std::unique_ptr<weld::Label> m_xLeftMarginLbl;
std::unique_ptr<weld::MetricSpinButton> m_xLeftMarginEdit;
@@ -117,7 +117,7 @@ private:
std::unique_ptr<weld::MetricSpinButton> m_xBottomMarginEdit;
// layout settings
std::unique_ptr<weld::Label> m_xPageText;
- std::unique_ptr<weld::ComboBoxText> m_xLayoutBox;
+ std::unique_ptr<weld::ComboBox> m_xLayoutBox;
std::unique_ptr<SvxPageNumberListBox> m_xNumberFormatBox;
//Extras Calc
std::unique_ptr<weld::Label> m_xTblAlignFT;
@@ -128,15 +128,15 @@ private:
//Register Writer
std::unique_ptr<weld::CheckButton> m_xRegisterCB;
std::unique_ptr<weld::Label> m_xRegisterFT;
- std::unique_ptr<weld::ComboBoxText> m_xRegisterLB;
+ std::unique_ptr<weld::ComboBox> m_xRegisterLB;
std::unique_ptr<weld::Label> m_xInsideLbl;
std::unique_ptr<weld::Label> m_xOutsideLbl;
std::unique_ptr<weld::Label> m_xPrintRangeQueryText;
std::unique_ptr<weld::CustomWeld> m_xBspWin;
void Init_Impl();
- DECL_LINK(LayoutHdl_Impl, weld::ComboBoxText&, void);
- DECL_LINK(PaperBinHdl_Impl, weld::ComboBoxText&, void);
+ DECL_LINK(LayoutHdl_Impl, weld::ComboBox&, void);
+ DECL_LINK(PaperBinHdl_Impl, weld::ComboBox&, void);
DECL_LINK(SwapOrientation_Impl, weld::Button&, void);
void SwapFirstValues_Impl( bool bSet );
DECL_LINK(BorderModify_Impl, weld::MetricSpinButton&, void);
@@ -144,10 +144,10 @@ private:
DECL_LINK(CenterHdl_Impl, weld::ToggleButton&, void);
void UpdateExample_Impl( bool bResetbackground = false );
- DECL_LINK(PaperSizeSelect_Impl, weld::ComboBoxText&, void );
+ DECL_LINK(PaperSizeSelect_Impl, weld::ComboBox&, void );
DECL_LINK(PaperSizeModify_Impl, weld::MetricSpinButton&, void);
- DECL_LINK(FrameDirectionModify_Impl, weld::ComboBoxText&, void );
+ DECL_LINK(FrameDirectionModify_Impl, weld::ComboBox&, void );
void ResetBackground_Impl( const SfxItemSet& rSet );