rename SvtFontStyleBox back to FontStyleBox
Change-Id: I709f100541964b8740a7d0639a58214b1553458f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87836
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index aa8196ca..9c43209 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -70,7 +70,7 @@ private:
std::unique_ptr<weld::Label> m_xWestFontNameFT;
std::unique_ptr<weld::ComboBox> m_xWestFontNameLB;
std::unique_ptr<weld::Label> m_xWestFontStyleFT;
std::unique_ptr<SvtFontStyleBox> m_xWestFontStyleLB;
std::unique_ptr<FontStyleBox> m_xWestFontStyleLB;
std::unique_ptr<weld::Label> m_xWestFontSizeFT;
std::unique_ptr<SvtFontSizeBox> m_xWestFontSizeLB;
std::unique_ptr<weld::Label> m_xWestFontLanguageFT;
@@ -82,7 +82,7 @@ private:
std::unique_ptr<weld::Label> m_xEastFontNameFT;
std::unique_ptr<weld::ComboBox> m_xEastFontNameLB;
std::unique_ptr<weld::Label> m_xEastFontStyleFT;
std::unique_ptr<SvtFontStyleBox> m_xEastFontStyleLB;
std::unique_ptr<FontStyleBox> m_xEastFontStyleLB;
std::unique_ptr<weld::Label> m_xEastFontSizeFT;
std::unique_ptr<SvtFontSizeBox> m_xEastFontSizeLB;
std::unique_ptr<weld::Label> m_xEastFontLanguageFT;
@@ -94,7 +94,7 @@ private:
std::unique_ptr<weld::Label> m_xCTLFontNameFT;
std::unique_ptr<weld::ComboBox> m_xCTLFontNameLB;
std::unique_ptr<weld::Label> m_xCTLFontStyleFT;
std::unique_ptr<SvtFontStyleBox> m_xCTLFontStyleLB;
std::unique_ptr<FontStyleBox> m_xCTLFontStyleLB;
std::unique_ptr<weld::Label> m_xCTLFontSizeFT;
std::unique_ptr<SvtFontSizeBox> m_xCTLFontSizeLB;
std::unique_ptr<weld::Label> m_xCTLFontLanguageFT;
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index fb2da5a..6ef954a 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -219,7 +219,7 @@ SvxCharNamePage::SvxCharNamePage(weld::Container* pPage, weld::DialogController*
, m_xEastFontNameFT(m_xBuilder->weld_label("eastfontnameft"))
, m_xEastFontNameLB(m_xBuilder->weld_combo_box("eastfontnamelb"))
, m_xEastFontStyleFT(m_xBuilder->weld_label("eaststyleft"))
, m_xEastFontStyleLB(new SvtFontStyleBox(m_xBuilder->weld_combo_box("eaststylelb")))
, 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_xEastFontLanguageFT(m_xBuilder->weld_label("eastlangft"))
@@ -230,7 +230,7 @@ SvxCharNamePage::SvxCharNamePage(weld::Container* pPage, weld::DialogController*
, m_xCTLFontNameFT(m_xBuilder->weld_label("ctlfontnameft"))
, m_xCTLFontNameLB(m_xBuilder->weld_combo_box("ctlfontnamelb"))
, m_xCTLFontStyleFT(m_xBuilder->weld_label("ctlstyleft"))
, m_xCTLFontStyleLB(new SvtFontStyleBox(m_xBuilder->weld_combo_box("ctlstylelb")))
, 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_xCTLFontLanguageFT(m_xBuilder->weld_label("ctllangft"))
@@ -257,7 +257,7 @@ SvxCharNamePage::SvxCharNamePage(weld::Container* pPage, weld::DialogController*
m_xWestFontStyleFT = m_xBuilder->weld_label("weststyleft-cjk");
m_xWestFontSizeFT = m_xBuilder->weld_label("westsizeft-cjk");
m_xWestFontStyleLB.reset(new SvtFontStyleBox(m_xBuilder->weld_combo_box("weststylelb-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_xWestFontLanguageFT = m_xBuilder->weld_label("westlangft-cjk");
@@ -289,7 +289,7 @@ SvxCharNamePage::SvxCharNamePage(weld::Container* pPage, weld::DialogController*
xWestFontSizeLB->set_height_request_by_rows(7);
m_xWestFontNameLB = std::move(xWestFontNameLB);
m_xWestFontStyleLB.reset(new SvtFontStyleBox(std::move(xWestFontStyleLB)));
m_xWestFontStyleLB.reset(new FontStyleBox(std::move(xWestFontStyleLB)));
m_xWestFontSizeLB.reset(new SvtFontSizeBox(std::move(xWestFontSizeLB)));
}
@@ -403,7 +403,7 @@ namespace
FontMetric calcFontMetrics( SvxFont& _rFont,
SvxCharNamePage const * _pPage,
const weld::ComboBox* _pFontNameLB,
const SvtFontStyleBox* _pFontStyleLB,
const FontStyleBox* _pFontStyleLB,
const SvtFontSizeBox* _pFontSizeLB,
const SvxLanguageBox* _pLanguageLB,
const FontList* _pFontList,
@@ -506,7 +506,7 @@ void SvxCharNamePage::FillStyleBox_Impl(const weld::Widget& rNameBox)
const FontList* pFontList = GetFontList();
DBG_ASSERT( pFontList, "no fontlist" );
SvtFontStyleBox* pStyleBox = nullptr;
FontStyleBox* pStyleBox = nullptr;
OUString sFontName;
if (m_xWestFontNameLB.get() == &rNameBox)
@@ -552,7 +552,7 @@ void SvxCharNamePage::FillSizeBox_Impl(const weld::Widget& rNameBox)
const FontList* pFontList = GetFontList();
DBG_ASSERT( pFontList, "no fontlist" );
SvtFontStyleBox* pStyleBox = nullptr;
FontStyleBox* pStyleBox = nullptr;
SvtFontSizeBox* pSizeBox = nullptr;
OUString sFontName;
@@ -605,7 +605,7 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp
{
weld::ComboBox* pNameBox = nullptr;
weld::Label* pStyleLabel = nullptr;
SvtFontStyleBox* pStyleBox = nullptr;
FontStyleBox* pStyleBox = nullptr;
weld::Label* pSizeLabel = nullptr;
SvtFontSizeBox* pSizeBox = nullptr;
weld::Label* pLangFT = nullptr;
@@ -835,7 +835,7 @@ bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp
bool bModified = false;
weld::ComboBox* pNameBox = nullptr;
SvtFontStyleBox* pStyleBox = nullptr;
FontStyleBox* pStyleBox = nullptr;
SvtFontSizeBox* pSizeBox = nullptr;
SvxLanguageBox* pLangBox = nullptr;
sal_uInt16 nWhich = 0;
diff --git a/include/svtools/ctrlbox.hxx b/include/svtools/ctrlbox.hxx
index d5d0f35..8036d51 100644
--- a/include/svtools/ctrlbox.hxx
+++ b/include/svtools/ctrlbox.hxx
@@ -361,11 +361,11 @@ private:
FontNameBox& operator =( const FontNameBox& ) = delete;
};
class SVT_DLLPUBLIC SvtFontStyleBox
class SVT_DLLPUBLIC FontStyleBox
{
std::unique_ptr<weld::ComboBox> m_xComboBox;
public:
SvtFontStyleBox(std::unique_ptr<weld::ComboBox> p);
FontStyleBox(std::unique_ptr<weld::ComboBox> p);
void Fill(const OUString& rName, const FontList* pList);
@@ -379,8 +379,8 @@ public:
int get_count() const { return m_xComboBox->get_count(); }
int find_text(const OUString& rStr) const { return m_xComboBox->find_text(rStr); }
private:
SvtFontStyleBox(const SvtFontStyleBox& ) = delete;
SvtFontStyleBox& operator=(const SvtFontStyleBox&) = delete;
FontStyleBox(const FontStyleBox& ) = delete;
FontStyleBox& operator=(const FontStyleBox&) = delete;
};
class SVT_DLLPUBLIC FontSizeBox : public MetricBox
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index 5474b5c..5f2a188 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -699,7 +699,7 @@ void FontNameBox::UserDraw( const UserDrawEvent& rUDEvt )
}
}
SvtFontStyleBox::SvtFontStyleBox(std::unique_ptr<weld::ComboBox> p)
FontStyleBox::FontStyleBox(std::unique_ptr<weld::ComboBox> p)
: m_xComboBox(std::move(p))
{
//Use the standard texts to get an optimal size and stick to that size.
@@ -715,7 +715,7 @@ SvtFontStyleBox::SvtFontStyleBox(std::unique_ptr<weld::ComboBox> p)
m_xComboBox->set_entry_width_chars(std::ceil(nMaxLen / m_xComboBox->get_approximate_digit_width()));
}
void SvtFontStyleBox::Fill( const OUString& rName, const FontList* pList )
void FontStyleBox::Fill( const OUString& rName, const FontList* pList )
{
m_xComboBox->freeze();
OUString aOldText = m_xComboBox->get_active_text();
