From 2b9f23b9b8a62d82691233d789e830b3bde7b3da Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Sat, 13 Oct 2018 21:39:00 +0100 Subject: weld SwFrameAddPage MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Ia63e22d01c6bcc08f50d3e1b12943094660c7fd0 Reviewed-on: https://gerrit.libreoffice.org/61758 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- cui/source/inc/align.hxx | 2 +- cui/source/inc/page.hxx | 2 +- cui/source/inc/paragrph.hxx | 2 +- cui/source/tabpages/align.cxx | 2 +- cui/source/tabpages/page.cxx | 2 +- cui/source/tabpages/paragrph.cxx | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) (limited to 'cui') diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx index 5c96ec25aa30..1f5257e9d2c1 100644 --- a/cui/source/inc/align.hxx +++ b/cui/source/inc/align.hxx @@ -98,7 +98,7 @@ private: std::unique_ptr m_xBtnWrap; std::unique_ptr m_xBtnHyphen; std::unique_ptr m_xBtnShrink; - std::unique_ptr m_xLbFrameDir; + std::unique_ptr m_xLbFrameDir; // hidden labels/string std::unique_ptr m_xFtBotLock; diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx index 69892a64f699..e6105af52c08 100644 --- a/cui/source/inc/page.hxx +++ b/cui/source/inc/page.hxx @@ -106,7 +106,7 @@ private: std::unique_ptr m_xPortraitBtn; std::unique_ptr m_xLandscapeBtn; std::unique_ptr m_xTextFlowLbl; - std::unique_ptr m_xTextFlowBox; + std::unique_ptr m_xTextFlowBox; std::unique_ptr m_xPaperTrayBox; // Margins std::unique_ptr m_xLeftMarginLbl; diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx index b656f8d52b05..8acc4f4ea4bd 100644 --- a/cui/source/inc/paragrph.hxx +++ b/cui/source/inc/paragrph.hxx @@ -157,7 +157,7 @@ class SvxParaAlignTabPage : public SfxTabPage std::unique_ptr m_xVertAlignLB; std::unique_ptr m_xPropertiesFL; - std::unique_ptr m_xTextDirectionLB; + std::unique_ptr m_xTextDirectionLB; DECL_LINK(AlignHdl_Impl, weld::ToggleButton&, void); DECL_LINK(LastLineHdl_Impl, weld::ComboBox&, void); diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx index 76581331f0a5..821e9abf875a 100644 --- a/cui/source/tabpages/align.cxx +++ b/cui/source/tabpages/align.cxx @@ -123,7 +123,7 @@ AlignmentTabPage::AlignmentTabPage(TabPageParent pParent, const SfxItemSet& rCor , m_xBtnWrap(m_xBuilder->weld_check_button("checkWrapTextAuto")) , m_xBtnHyphen(m_xBuilder->weld_check_button("checkHyphActive")) , m_xBtnShrink(m_xBuilder->weld_check_button("checkShrinkFitCellSize")) - , m_xLbFrameDir(new SvxFrameDirectionListBox(m_xBuilder->weld_combo_box("comboTextDirBox"))) + , m_xLbFrameDir(new svx::FrameDirectionListBox(m_xBuilder->weld_combo_box("comboTextDirBox"))) //ValueSet hover strings , m_xFtBotLock(m_xBuilder->weld_label("labelSTR_BOTTOMLOCK")) , m_xFtTopLock(m_xBuilder->weld_label("labelSTR_TOPLOCK")) diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx index be2f6ff317f2..030e70a51eae 100644 --- a/cui/source/tabpages/page.cxx +++ b/cui/source/tabpages/page.cxx @@ -157,7 +157,7 @@ SvxPageDescPage::SvxPageDescPage(TabPageParent pParent, const SfxItemSet& rAttr) , m_xPortraitBtn(m_xBuilder->weld_radio_button("radiobuttonPortrait")) , m_xLandscapeBtn(m_xBuilder->weld_radio_button("radiobuttonLandscape")) , m_xTextFlowLbl(m_xBuilder->weld_label("labelTextFlow")) - , m_xTextFlowBox(new svx::SvxFrameDirectionListBox(m_xBuilder->weld_combo_box("comboTextFlowBox"))) + , m_xTextFlowBox(new svx::FrameDirectionListBox(m_xBuilder->weld_combo_box("comboTextFlowBox"))) , m_xPaperTrayBox(m_xBuilder->weld_combo_box("comboPaperTray")) , m_xLeftMarginLbl(m_xBuilder->weld_label("labelLeftMargin")) , m_xLeftMarginEdit(m_xBuilder->weld_metric_spin_button("spinMargLeft", FUNIT_CM)) diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx index ffb7e831e755..2b5572fd1874 100644 --- a/cui/source/tabpages/paragrph.cxx +++ b/cui/source/tabpages/paragrph.cxx @@ -1006,7 +1006,7 @@ SvxParaAlignTabPage::SvxParaAlignTabPage(TabPageParent pParent, const SfxItemSet , m_xVertAlignFL(m_xBuilder->weld_widget("frameFL_VERTALIGN")) , m_xVertAlignLB(m_xBuilder->weld_combo_box("comboLB_VERTALIGN")) , m_xPropertiesFL(m_xBuilder->weld_widget("framePROPERTIES")) - , m_xTextDirectionLB(new svx::SvxFrameDirectionListBox(m_xBuilder->weld_combo_box("comboLB_TEXTDIRECTION"))) + , m_xTextDirectionLB(new svx::FrameDirectionListBox(m_xBuilder->weld_combo_box("comboLB_TEXTDIRECTION"))) { SetExchangeSupport(); -- cgit