From e35ad8cb96f8299339a7efec4c5ccf389fece919 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Wed, 5 Feb 2020 19:49:13 +0000 Subject: rename SvtFontSizeBox back to FontSizeBox MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I2ec0c6dd376f3a192a62dc97f7454af946e2a5ce Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88065 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- sw/source/ui/config/optpage.cxx | 12 ++++++------ sw/source/uibase/inc/optpage.hxx | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) (limited to 'sw') diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx index fd5f04d57321..637c583db442 100644 --- a/sw/source/ui/config/optpage.cxx +++ b/sw/source/ui/config/optpage.cxx @@ -497,15 +497,15 @@ SwStdFontTabPage::SwStdFontTabPage(weld::Container* pPage, weld::DialogControlle , m_sScriptComplex(SwResId(ST_SCRIPT_CTL)) , m_xLabelFT(m_xBuilder->weld_label("label1")) , m_xStandardBox(m_xBuilder->weld_combo_box("standardbox")) - , m_xStandardHeightLB(new SvtFontSizeBox(m_xBuilder->weld_combo_box("standardheight"))) + , m_xStandardHeightLB(new FontSizeBox(m_xBuilder->weld_combo_box("standardheight"))) , m_xTitleBox(m_xBuilder->weld_combo_box("titlebox")) - , m_xTitleHeightLB(new SvtFontSizeBox(m_xBuilder->weld_combo_box("titleheight"))) + , m_xTitleHeightLB(new FontSizeBox(m_xBuilder->weld_combo_box("titleheight"))) , m_xListBox(m_xBuilder->weld_combo_box("listbox")) - , m_xListHeightLB(new SvtFontSizeBox(m_xBuilder->weld_combo_box("listheight"))) + , m_xListHeightLB(new FontSizeBox(m_xBuilder->weld_combo_box("listheight"))) , m_xLabelBox(m_xBuilder->weld_combo_box("labelbox")) - , m_xLabelHeightLB(new SvtFontSizeBox(m_xBuilder->weld_combo_box("labelheight"))) + , m_xLabelHeightLB(new FontSizeBox(m_xBuilder->weld_combo_box("labelheight"))) , m_xIdxBox(m_xBuilder->weld_combo_box("idxbox")) - , m_xIndexHeightLB(new SvtFontSizeBox(m_xBuilder->weld_combo_box("indexheight"))) + , m_xIndexHeightLB(new FontSizeBox(m_xBuilder->weld_combo_box("indexheight"))) , m_xStandardPB(m_xBuilder->weld_button("standard")) { m_xStandardBox->make_sorted(); @@ -948,7 +948,7 @@ IMPL_LINK( SwStdFontTabPage, ModifyHdl, weld::ComboBox&, rBox, void ) IMPL_LINK( SwStdFontTabPage, LoseFocusHdl, weld::Widget&, rControl, void ) { weld::ComboBox& rBox = dynamic_cast(rControl); - SvtFontSizeBox* pHeightLB = nullptr; + FontSizeBox* pHeightLB = nullptr; const OUString sEntry = rBox.get_active_text(); if (&rBox == m_xStandardBox.get()) { diff --git a/sw/source/uibase/inc/optpage.hxx b/sw/source/uibase/inc/optpage.hxx index 5670f02b8c9b..8ba45508a06c 100644 --- a/sw/source/uibase/inc/optpage.hxx +++ b/sw/source/uibase/inc/optpage.hxx @@ -149,15 +149,15 @@ class SwStdFontTabPage : public SfxTabPage std::unique_ptr m_xLabelFT; std::unique_ptr m_xStandardBox; - std::unique_ptr m_xStandardHeightLB; + std::unique_ptr m_xStandardHeightLB; std::unique_ptr m_xTitleBox; - std::unique_ptr m_xTitleHeightLB; + std::unique_ptr m_xTitleHeightLB; std::unique_ptr m_xListBox; - std::unique_ptr m_xListHeightLB; + std::unique_ptr m_xListHeightLB; std::unique_ptr m_xLabelBox; - std::unique_ptr m_xLabelHeightLB; + std::unique_ptr m_xLabelHeightLB; std::unique_ptr m_xIdxBox; - std::unique_ptr m_xIndexHeightLB; + std::unique_ptr m_xIndexHeightLB; std::unique_ptr m_xStandardPB; DECL_LINK(StandardHdl, weld::Button&, void ); -- cgit