[Libreoffice-commits] core.git: cui/source include/svtools svtools/source svx/source sw/source
Caolán McNamara (via logerrit)
logerrit at kemper.freedesktop.org
Thu Feb 6 12:02:33 UTC 2020
cui/source/inc/chardlg.hxx | 6 +++---
cui/source/tabpages/chardlg.cxx | 18 +++++++++---------
include/svtools/ctrlbox.hxx | 8 ++++----
svtools/source/control/ctrlbox.cxx | 30 +++++++++++++++---------------
svx/source/tbxctrls/tbunocontroller.cxx | 4 ++--
sw/source/ui/config/optpage.cxx | 12 ++++++------
sw/source/uibase/inc/optpage.hxx | 10 +++++-----
7 files changed, 44 insertions(+), 44 deletions(-)
New commits:
commit e35ad8cb96f8299339a7efec4c5ccf389fece919
Author: Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Feb 5 19:49:13 2020 +0000
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Feb 6 13:02:01 2020 +0100
rename SvtFontSizeBox back to FontSizeBox
Change-Id: I2ec0c6dd376f3a192a62dc97f7454af946e2a5ce
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88065
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index 9c43209877b6..05e655855b4e 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -72,7 +72,7 @@ private:
std::unique_ptr<weld::Label> m_xWestFontStyleFT;
std::unique_ptr<FontStyleBox> m_xWestFontStyleLB;
std::unique_ptr<weld::Label> m_xWestFontSizeFT;
- std::unique_ptr<SvtFontSizeBox> m_xWestFontSizeLB;
+ std::unique_ptr<FontSizeBox> m_xWestFontSizeLB;
std::unique_ptr<weld::Label> m_xWestFontLanguageFT;
std::unique_ptr<SvxLanguageBox> m_xWestFontLanguageLB;
std::unique_ptr<weld::Label> m_xWestFontTypeFT;
@@ -84,7 +84,7 @@ private:
std::unique_ptr<weld::Label> m_xEastFontStyleFT;
std::unique_ptr<FontStyleBox> m_xEastFontStyleLB;
std::unique_ptr<weld::Label> m_xEastFontSizeFT;
- std::unique_ptr<SvtFontSizeBox> m_xEastFontSizeLB;
+ std::unique_ptr<FontSizeBox> m_xEastFontSizeLB;
std::unique_ptr<weld::Label> m_xEastFontLanguageFT;
std::unique_ptr<SvxLanguageBox> m_xEastFontLanguageLB;
std::unique_ptr<weld::Label> m_xEastFontTypeFT;
@@ -96,7 +96,7 @@ private:
std::unique_ptr<weld::Label> m_xCTLFontStyleFT;
std::unique_ptr<FontStyleBox> m_xCTLFontStyleLB;
std::unique_ptr<weld::Label> m_xCTLFontSizeFT;
- std::unique_ptr<SvtFontSizeBox> m_xCTLFontSizeLB;
+ std::unique_ptr<FontSizeBox> m_xCTLFontSizeLB;
std::unique_ptr<weld::Label> m_xCTLFontLanguageFT;
std::unique_ptr<SvxLanguageBox> m_xCTLFontLanguageLB;
std::unique_ptr<weld::Label> m_xCTLFontTypeFT;
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 6ef954a9bd1d..f61ddc38b80a 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -221,7 +221,7 @@ SvxCharNamePage::SvxCharNamePage(weld::Container* pPage, weld::DialogController*
, m_xEastFontStyleFT(m_xBuilder->weld_label("eaststyleft"))
, m_xEastFontStyleLB(new FontStyleBox(m_xBuilder->weld_combo_box("eaststylelb")))
, m_xEastFontSizeFT(m_xBuilder->weld_label("eastsizeft"))
- , m_xEastFontSizeLB(new SvtFontSizeBox(m_xBuilder->weld_combo_box("eastsizelb")))
+ , m_xEastFontSizeLB(new FontSizeBox(m_xBuilder->weld_combo_box("eastsizelb")))
, m_xEastFontLanguageFT(m_xBuilder->weld_label("eastlangft"))
, m_xEastFontLanguageLB(new SvxLanguageBox(m_xBuilder->weld_combo_box("eastlanglb")))
, m_xEastFontTypeFT(m_xBuilder->weld_label("eastfontinfo"))
@@ -232,7 +232,7 @@ SvxCharNamePage::SvxCharNamePage(weld::Container* pPage, weld::DialogController*
, m_xCTLFontStyleFT(m_xBuilder->weld_label("ctlstyleft"))
, m_xCTLFontStyleLB(new FontStyleBox(m_xBuilder->weld_combo_box("ctlstylelb")))
, m_xCTLFontSizeFT(m_xBuilder->weld_label("ctlsizeft"))
- , m_xCTLFontSizeLB(new SvtFontSizeBox(m_xBuilder->weld_combo_box("ctlsizelb")))
+ , m_xCTLFontSizeLB(new FontSizeBox(m_xBuilder->weld_combo_box("ctlsizelb")))
, m_xCTLFontLanguageFT(m_xBuilder->weld_label("ctllangft"))
, m_xCTLFontLanguageLB(new SvxLanguageBox(m_xBuilder->weld_combo_box("ctllanglb")))
, m_xCTLFontTypeFT(m_xBuilder->weld_label("ctlfontinfo"))
@@ -258,7 +258,7 @@ SvxCharNamePage::SvxCharNamePage(weld::Container* pPage, weld::DialogController*
m_xWestFontSizeFT = m_xBuilder->weld_label("westsizeft-cjk");
m_xWestFontStyleLB.reset(new FontStyleBox(m_xBuilder->weld_combo_box("weststylelb-cjk")));
- m_xWestFontSizeLB.reset(new SvtFontSizeBox(m_xBuilder->weld_combo_box("westsizelb-cjk")));
+ m_xWestFontSizeLB.reset(new FontSizeBox(m_xBuilder->weld_combo_box("westsizelb-cjk")));
m_xWestFontLanguageFT = m_xBuilder->weld_label("westlangft-cjk");
m_xWestFontLanguageLB.reset(new SvxLanguageBox(m_xBuilder->weld_combo_box("westlanglb-cjk")));
@@ -290,7 +290,7 @@ SvxCharNamePage::SvxCharNamePage(weld::Container* pPage, weld::DialogController*
m_xWestFontNameLB = std::move(xWestFontNameLB);
m_xWestFontStyleLB.reset(new FontStyleBox(std::move(xWestFontStyleLB)));
- m_xWestFontSizeLB.reset(new SvtFontSizeBox(std::move(xWestFontSizeLB)));
+ m_xWestFontSizeLB.reset(new FontSizeBox(std::move(xWestFontSizeLB)));
}
//In MacOSX the standard dialogs name font-name, font-style as
@@ -404,7 +404,7 @@ namespace
SvxCharNamePage const * _pPage,
const weld::ComboBox* _pFontNameLB,
const FontStyleBox* _pFontStyleLB,
- const SvtFontSizeBox* _pFontSizeLB,
+ const FontSizeBox* _pFontSizeLB,
const SvxLanguageBox* _pLanguageLB,
const FontList* _pFontList,
sal_uInt16 _nFontWhich,
@@ -553,7 +553,7 @@ void SvxCharNamePage::FillSizeBox_Impl(const weld::Widget& rNameBox)
DBG_ASSERT( pFontList, "no fontlist" );
FontStyleBox* pStyleBox = nullptr;
- SvtFontSizeBox* pSizeBox = nullptr;
+ FontSizeBox* pSizeBox = nullptr;
OUString sFontName;
if (m_xWestFontNameLB.get() == &rNameBox)
@@ -607,7 +607,7 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp
weld::Label* pStyleLabel = nullptr;
FontStyleBox* pStyleBox = nullptr;
weld::Label* pSizeLabel = nullptr;
- SvtFontSizeBox* pSizeBox = nullptr;
+ FontSizeBox* pSizeBox = nullptr;
weld::Label* pLangFT = nullptr;
SvxLanguageBox* pLangBox = nullptr;
sal_uInt16 nWhich = 0;
@@ -836,7 +836,7 @@ bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp
weld::ComboBox* pNameBox = nullptr;
FontStyleBox* pStyleBox = nullptr;
- SvtFontSizeBox* pSizeBox = nullptr;
+ FontSizeBox* pSizeBox = nullptr;
SvxLanguageBox* pLangBox = nullptr;
sal_uInt16 nWhich = 0;
sal_uInt16 nSlot = 0;
@@ -1231,7 +1231,7 @@ void SvxCharNamePage::SetFontList( const SvxFontListItem& rItem )
namespace
{
- void enableRelativeMode( SvxCharNamePage const * _pPage, SvtFontSizeBox* _pFontSizeLB, sal_uInt16 _nHeightWhich )
+ void enableRelativeMode( SvxCharNamePage const * _pPage, FontSizeBox* _pFontSizeLB, sal_uInt16 _nHeightWhich )
{
_pFontSizeLB->EnableRelativeMode( 5, 995 ); // min 5%, max 995%, step 5
diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx
index 7518688336ee..58cbea913e4c 100644
--- a/include/svtools/ctrlbox.hxx
+++ b/include/svtools/ctrlbox.hxx
@@ -382,7 +382,7 @@ private:
FontStyleBox& operator=(const FontStyleBox&) = delete;
};
-class SVT_DLLPUBLIC SvtFontSizeBox
+class SVT_DLLPUBLIC FontSizeBox
{
FontMetric aFontMetric;
const FontList* pFontList;
@@ -419,7 +419,7 @@ class SVT_DLLPUBLIC SvtFontSizeBox
DECL_LINK(ModifyHdl, weld::ComboBox&, void);
DECL_LINK(ReformatHdl, weld::Widget&, void);
public:
- SvtFontSizeBox(std::unique_ptr<weld::ComboBox> p);
+ FontSizeBox(std::unique_ptr<weld::ComboBox> p);
void Fill(const FontMetric* pFontMetric, const FontList* pList);
@@ -456,8 +456,8 @@ public:
boost::property_tree::ptree get_property_tree() const;
private:
- SvtFontSizeBox(const SvtFontSizeBox&) = delete;
- SvtFontSizeBox& operator=(const SvtFontSizeBox&) = delete;
+ FontSizeBox(const FontSizeBox&) = delete;
+ FontSizeBox& operator=(const FontSizeBox&) = delete;
};
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index 5b0cb9fe018a..779f22a137b5 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -856,7 +856,7 @@ void FontStyleBox::Fill( const OUString& rName, const FontList* pList )
m_xComboBox->thaw();
}
-SvtFontSizeBox::SvtFontSizeBox(std::unique_ptr<weld::ComboBox> p)
+FontSizeBox::FontSizeBox(std::unique_ptr<weld::ComboBox> p)
: pFontList(nullptr)
, nSavedValue(0)
, nMin(20)
@@ -877,16 +877,16 @@ SvtFontSizeBox::SvtFontSizeBox(std::unique_ptr<weld::ComboBox> p)
{
m_xComboBox->set_entry_width_chars(std::ceil(m_xComboBox->get_pixel_size(format_number(105)).Width() /
m_xComboBox->get_approximate_digit_width()));
- m_xComboBox->connect_focus_out(LINK(this, SvtFontSizeBox, ReformatHdl));
- m_xComboBox->connect_changed(LINK(this, SvtFontSizeBox, ModifyHdl));
+ m_xComboBox->connect_focus_out(LINK(this, FontSizeBox, ReformatHdl));
+ m_xComboBox->connect_changed(LINK(this, FontSizeBox, ModifyHdl));
}
-boost::property_tree::ptree SvtFontSizeBox::get_property_tree() const
+boost::property_tree::ptree FontSizeBox::get_property_tree() const
{
return m_xComboBox->get_property_tree();
}
-IMPL_LINK(SvtFontSizeBox, ReformatHdl, weld::Widget&, rWidget, void)
+IMPL_LINK(FontSizeBox, ReformatHdl, weld::Widget&, rWidget, void)
{
FontSizeNames aFontSizeNames(Application::GetSettings().GetUILanguageTag().getLanguageType());
if (!bRelativeMode || !aFontSizeNames.IsEmpty())
@@ -900,7 +900,7 @@ IMPL_LINK(SvtFontSizeBox, ReformatHdl, weld::Widget&, rWidget, void)
m_aFocusOutHdl.Call(rWidget);
}
-IMPL_LINK(SvtFontSizeBox, ModifyHdl, weld::ComboBox&, rBox, void)
+IMPL_LINK(FontSizeBox, ModifyHdl, weld::ComboBox&, rBox, void)
{
if (bRelativeMode)
{
@@ -951,7 +951,7 @@ IMPL_LINK(SvtFontSizeBox, ModifyHdl, weld::ComboBox&, rBox, void)
m_aChangeHdl.Call(rBox);
}
-void SvtFontSizeBox::Fill( const FontMetric* pFontMetric, const FontList* pList )
+void FontSizeBox::Fill( const FontMetric* pFontMetric, const FontList* pList )
{
// remember for relative mode
pFontList = pList;
@@ -1040,7 +1040,7 @@ void SvtFontSizeBox::Fill( const FontMetric* pFontMetric, const FontList* pList
m_xComboBox->thaw();
}
-void SvtFontSizeBox::EnableRelativeMode( sal_uInt16 nNewMin, sal_uInt16 nNewMax, sal_uInt16 nStep )
+void FontSizeBox::EnableRelativeMode( sal_uInt16 nNewMin, sal_uInt16 nNewMax, sal_uInt16 nStep )
{
bRelativeMode = true;
nRelMin = nNewMin;
@@ -1049,7 +1049,7 @@ void SvtFontSizeBox::EnableRelativeMode( sal_uInt16 nNewMin, sal_uInt16 nNewMax,
SetUnit(FieldUnit::POINT);
}
-void SvtFontSizeBox::EnablePtRelativeMode( short nNewMin, short nNewMax, short nStep )
+void FontSizeBox::EnablePtRelativeMode( short nNewMin, short nNewMax, short nStep )
{
bRelativeMode = true;
nPtRelMin = nNewMin;
@@ -1058,13 +1058,13 @@ void SvtFontSizeBox::EnablePtRelativeMode( short nNewMin, short nNewMax, short n
SetUnit(FieldUnit::POINT);
}
-void SvtFontSizeBox::InsertValue(int i)
+void FontSizeBox::InsertValue(int i)
{
OUString sNumber(OUString::number(i));
m_xComboBox->append(sNumber, format_number(i));
}
-void SvtFontSizeBox::SetRelative( bool bNewRelative )
+void FontSizeBox::SetRelative( bool bNewRelative )
{
if ( !bRelativeMode )
return;
@@ -1124,7 +1124,7 @@ void SvtFontSizeBox::SetRelative( bool bNewRelative )
m_xComboBox->select_entry_region(nSelectionStart, nSelectionEnd);
}
-OUString SvtFontSizeBox::format_number(int nValue) const
+OUString FontSizeBox::format_number(int nValue) const
{
OUString sRet;
@@ -1152,7 +1152,7 @@ OUString SvtFontSizeBox::format_number(int nValue) const
return sRet;
}
-void SvtFontSizeBox::SetValue(int nNewValue, FieldUnit eInUnit)
+void FontSizeBox::SetValue(int nNewValue, FieldUnit eInUnit)
{
auto nTempValue = MetricField::ConvertValue(nNewValue, 0, GetDecimalDigits(), eInUnit, GetUnit());
if (nTempValue < nMin)
@@ -1179,12 +1179,12 @@ void SvtFontSizeBox::SetValue(int nNewValue, FieldUnit eInUnit)
m_xComboBox->set_entry_text(aResult);
}
-void SvtFontSizeBox::set_value(int nNewValue)
+void FontSizeBox::set_value(int nNewValue)
{
SetValue(nNewValue, eUnit);
}
-int SvtFontSizeBox::get_value() const
+int FontSizeBox::get_value() const
{
OUString aStr = m_xComboBox->get_active_text();
if (!bRelative)
diff --git a/svx/source/tbxctrls/tbunocontroller.cxx b/svx/source/tbxctrls/tbunocontroller.cxx
index 980c4dd30385..125543a55e88 100644
--- a/svx/source/tbxctrls/tbunocontroller.cxx
+++ b/svx/source/tbxctrls/tbunocontroller.cxx
@@ -110,7 +110,7 @@ private:
OUString m_aCurText;
bool m_bRelease;
uno::Reference< frame::XFrame > m_xFrame;
- std::unique_ptr<SvtFontSizeBox> m_xWidget;
+ std::unique_ptr<FontSizeBox> m_xWidget;
void ReleaseFocus_Impl();
@@ -132,7 +132,7 @@ SvxFontSizeBox_Impl::SvxFontSizeBox_Impl(
m_rCtrl ( _rCtrl ),
m_bRelease ( true ),
m_xFrame ( _xFrame ),
- m_xWidget(new SvtFontSizeBox(m_xBuilder->weld_combo_box("fontsize")))
+ m_xWidget(new FontSizeBox(m_xBuilder->weld_combo_box("fontsize")))
{
set_id("fontsizecombobox");
m_xWidget->set_value(0);
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<weld::ComboBox&>(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<weld::Label> m_xLabelFT;
std::unique_ptr<weld::ComboBox> m_xStandardBox;
- std::unique_ptr<SvtFontSizeBox> m_xStandardHeightLB;
+ std::unique_ptr<FontSizeBox> m_xStandardHeightLB;
std::unique_ptr<weld::ComboBox> m_xTitleBox;
- std::unique_ptr<SvtFontSizeBox> m_xTitleHeightLB;
+ std::unique_ptr<FontSizeBox> m_xTitleHeightLB;
std::unique_ptr<weld::ComboBox> m_xListBox;
- std::unique_ptr<SvtFontSizeBox> m_xListHeightLB;
+ std::unique_ptr<FontSizeBox> m_xListHeightLB;
std::unique_ptr<weld::ComboBox> m_xLabelBox;
- std::unique_ptr<SvtFontSizeBox> m_xLabelHeightLB;
+ std::unique_ptr<FontSizeBox> m_xLabelHeightLB;
std::unique_ptr<weld::ComboBox> m_xIdxBox;
- std::unique_ptr<SvtFontSizeBox> m_xIndexHeightLB;
+ std::unique_ptr<FontSizeBox> m_xIndexHeightLB;
std::unique_ptr<weld::Button> m_xStandardPB;
DECL_LINK(StandardHdl, weld::Button&, void );
More information about the Libreoffice-commits
mailing list