rename LanguageBox back to SvxLanguageBox

Change-Id: I9bd29b7377fdf0e1ba36cc021e7e78f83bb1c12c
Reviewed-on: https://gerrit.libreoffice.org/80960
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

16 files changed, 37 insertions, 37 deletions

diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 366c2662b865..9c65d47cf6da 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -165,7 +165,7 @@ SpellDialog::SpellDialog(SpellDialogChildWindow* pChildWindow,
     , m_xResumeFT(m_xBuilder->weld_label("resumeft"))
     , m_xNoSuggestionsFT(m_xBuilder->weld_label("nosuggestionsft"))
     , m_xLanguageFT(m_xBuilder->weld_label("languageft"))
-    , m_xLanguageLB(new LanguageBox(m_xBuilder->weld_combo_box("languagelb")))
+    , m_xLanguageLB(new SvxLanguageBox(m_xBuilder->weld_combo_box("languagelb")))
     , m_xExplainFT(m_xBuilder->weld_label("explain"))
     , m_xExplainLink(m_xBuilder->weld_link_button("explainlink"))
     , m_xNotInDictFT(m_xBuilder->weld_label("notindictft"))
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index b38880ee5869..61adf31f8afa 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -148,7 +148,7 @@ private:
     std::unique_ptr<weld::Label> m_xNoSuggestionsFT;
     std::unique_ptr<weld::Label> m_xIgnoreOnceFT;
     std::unique_ptr<weld::Label> m_xLanguageFT;
-    std::unique_ptr<LanguageBox> m_xLanguageLB;
+    std::unique_ptr<SvxLanguageBox> m_xLanguageLB;
     std::unique_ptr<weld::Label> m_xExplainFT;
     std::unique_ptr<weld::LinkButton> m_xExplainLink;
     std::unique_ptr<weld::Label> m_xNotInDictFT;
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index 3254573a6d3a..083f3824713c 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -36,7 +36,7 @@ namespace editeng { class SortedAutoCompleteStrings; }
 class OfaAutoCorrDlg : public SfxTabDialogController
 {
     std::unique_ptr<weld::Widget> m_xLanguageBox;
-    std::unique_ptr<LanguageBox>  m_xLanguageLB;
+    std::unique_ptr<SvxLanguageBox> m_xLanguageLB;
 
     DECL_LINK(SelectLanguageHdl, weld::ComboBox&, void);
 public:
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index 7cf7f8e315ec..9e4419d4406e 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -74,7 +74,7 @@ private:
     std::unique_ptr<weld::Label> m_xWestFontSizeFT;
     std::unique_ptr<SvtFontSizeBox> m_xWestFontSizeLB;
     std::unique_ptr<weld::Label> m_xWestFontLanguageFT;
-    std::unique_ptr<LanguageBox> m_xWestFontLanguageLB;
+    std::unique_ptr<SvxLanguageBox> m_xWestFontLanguageLB;
     std::unique_ptr<weld::Label> m_xWestFontTypeFT;
     std::unique_ptr<weld::Button> m_xWestFontFeaturesButton;
 
@@ -86,7 +86,7 @@ private:
     std::unique_ptr<weld::Label> m_xEastFontSizeFT;
     std::unique_ptr<SvtFontSizeBox> m_xEastFontSizeLB;
     std::unique_ptr<weld::Label> m_xEastFontLanguageFT;
-    std::unique_ptr<LanguageBox> m_xEastFontLanguageLB;
+    std::unique_ptr<SvxLanguageBox> m_xEastFontLanguageLB;
     std::unique_ptr<weld::Label> m_xEastFontTypeFT;
     std::unique_ptr<weld::Button> m_xEastFontFeaturesButton;
 
@@ -98,7 +98,7 @@ private:
     std::unique_ptr<weld::Label> m_xCTLFontSizeFT;
     std::unique_ptr<SvtFontSizeBox> m_xCTLFontSizeLB;
     std::unique_ptr<weld::Label> m_xCTLFontLanguageFT;
-    std::unique_ptr<LanguageBox> m_xCTLFontLanguageLB;
+    std::unique_ptr<SvxLanguageBox> m_xCTLFontLanguageLB;
     std::unique_ptr<weld::Label> m_xCTLFontTypeFT;
     std::unique_ptr<weld::Button> m_xCTLFontFeaturesButton;
 
diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx
index 9a493371731e..4ff56250ea9f 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -112,7 +112,7 @@ private:
     std::unique_ptr<weld::Button> m_xIbRemove;
     std::unique_ptr<weld::Label> m_xFtComment;
     std::unique_ptr<weld::Entry> m_xEdComment;
-    std::unique_ptr<LanguageBox> m_xLbLanguage;
+    std::unique_ptr<SvxLanguageBox> m_xLbLanguage;
     std::unique_ptr<weld::CustomWeld> m_xWndPreview;
 
     void    Init_Impl();
diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx
index f46a7d1a34db..d8febfb7bb60 100644
--- a/cui/source/inc/optasian.hxx
+++ b/cui/source/inc/optasian.hxx
@@ -34,7 +34,7 @@ class SvxAsianLayoutPage : public SfxTabPage
     std::unique_ptr<weld::RadioButton> m_xPunctCompressionRB;
     std::unique_ptr<weld::RadioButton> m_xPunctKanaCompressionRB;
     std::unique_ptr<weld::Label> m_xLanguageFT;
-    std::unique_ptr<LanguageBox> m_xLanguageLB;
+    std::unique_ptr<SvxLanguageBox> m_xLanguageLB;
     std::unique_ptr<weld::CheckButton> m_xStandardCB;
     std::unique_ptr<weld::Label> m_xStartFT;
     std::unique_ptr<weld::Entry> m_xStartED;
diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx
index 4aed3f4305d0..f6a11212b14a 100644
--- a/cui/source/inc/optdict.hxx
+++ b/cui/source/inc/optdict.hxx
@@ -39,7 +39,7 @@ class SvxNewDictionaryDialog : public weld::GenericDialogController
 {
 private:
     std::unique_ptr<weld::Entry> m_xNameEdit;
-    std::unique_ptr<LanguageBox> m_xLanguageLB;
+    std::unique_ptr<SvxLanguageBox> m_xLanguageLB;
     std::unique_ptr<weld::CheckButton> m_xExceptBtn;
     std::unique_ptr<weld::Button> m_xOKBtn;
     css::uno::Reference<css::linguistic2::XDictionary> m_xNewDic;
@@ -73,7 +73,7 @@ private:
     weld::TreeView* m_pWordsLB;
     std::unique_ptr<weld::ComboBox> m_xAllDictsLB;
     std::unique_ptr<weld::Label> m_xLangFT;
-    std::unique_ptr<LanguageBox> m_xLangLB;
+    std::unique_ptr<SvxLanguageBox> m_xLangLB;
     std::unique_ptr<weld::Entry> m_xWordED;
     std::unique_ptr<weld::Label> m_xReplaceFT;
     std::unique_ptr<weld::Entry> m_xReplaceED;
diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx
index 1571ae8a243d..d4d568708bea 100644
--- a/cui/source/inc/optlingu.hxx
+++ b/cui/source/inc/optlingu.hxx
@@ -59,7 +59,7 @@ class SvxEditModulesDlg : public weld::GenericDialogController
     std::unique_ptr<weld::Button> m_xBackPB;
     std::unique_ptr<weld::LinkButton> m_xMoreDictsLink;
     std::unique_ptr<weld::Button> m_xClosePB;
-    std::unique_ptr<LanguageBox> m_xLanguageLB;
+    std::unique_ptr<SvxLanguageBox> m_xLanguageLB;
 
     DECL_LINK( SelectHdl_Impl, weld::TreeView&, void );
     DECL_LINK( UpDownHdl_Impl, weld::Button&, void );
@@ -68,7 +68,7 @@ class SvxEditModulesDlg : public weld::GenericDialogController
     DECL_LINK( LangSelectListBoxHdl_Impl, weld::ComboBox&, void );
     typedef std::pair<int, int> row_col;
     DECL_LINK( BoxCheckButtonHdl_Impl, const row_col&, void );
-    void LangSelectHdl_Impl(const LanguageBox* pBox);
+    void LangSelectHdl_Impl(const SvxLanguageBox* pBox);
 
 public:
     SvxEditModulesDlg(weld::Window* pParent, SvxLinguData_Impl& rData);
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index 9c57cac8eaac..89feb5760f41 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -109,7 +109,7 @@ SvxAsianLayoutPage::SvxAsianLayoutPage(weld::Container* pPage, weld::DialogContr
     , m_xPunctCompressionRB(m_xBuilder->weld_radio_button("punctcompression"))
     , m_xPunctKanaCompressionRB(m_xBuilder->weld_radio_button("punctkanacompression"))
     , m_xLanguageFT(m_xBuilder->weld_label("languageft"))
-    , m_xLanguageLB(new LanguageBox(m_xBuilder->weld_combo_box("language")))
+    , m_xLanguageLB(new SvxLanguageBox(m_xBuilder->weld_combo_box("language")))
     , m_xStandardCB(m_xBuilder->weld_check_button("standard"))
     , m_xStartFT(m_xBuilder->weld_label("startft"))
     , m_xStartED(m_xBuilder->weld_entry("start"))
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index 7c04a4a7d7da..07080a75184a 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -90,7 +90,7 @@ static CDE_RESULT cmpDicEntry_Impl( const OUString &rText1, const OUString &rTex
 SvxNewDictionaryDialog::SvxNewDictionaryDialog(weld::Window* pParent)
     : GenericDialogController(pParent, "cui/ui/optnewdictionarydialog.ui", "OptNewDictionaryDialog")
     , m_xNameEdit(m_xBuilder->weld_entry("nameedit"))
-    , m_xLanguageLB(new LanguageBox(m_xBuilder->weld_combo_box("language")))
+    , m_xLanguageLB(new SvxLanguageBox(m_xBuilder->weld_combo_box("language")))
     , m_xExceptBtn(m_xBuilder->weld_check_button("except"))
     , m_xOKBtn(m_xBuilder->weld_button("ok"))
 {
@@ -202,7 +202,7 @@ SvxEditDictionaryDialog::SvxEditDictionaryDialog(weld::Window* pParent, const OU
     , bDicIsReadonly(false)
     , m_xAllDictsLB(m_xBuilder->weld_combo_box("book"))
     , m_xLangFT(m_xBuilder->weld_label("lang_label"))
-    , m_xLangLB(new LanguageBox(m_xBuilder->weld_combo_box("lang")))
+    , m_xLangLB(new SvxLanguageBox(m_xBuilder->weld_combo_box("lang")))
     , m_xWordED(m_xBuilder->weld_entry("word"))
     , m_xReplaceFT(m_xBuilder->weld_label("replace_label"))
     , m_xReplaceED(m_xBuilder->weld_entry("replace"))
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 1aae24ea20e1..3c039792ec57 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -1100,16 +1100,16 @@ OfaLanguagesTabPage::OfaLanguagesTabPage(weld::Container* pPage, weld::DialogCon
     , m_bDatePatternsValid(false)
     , m_xUserInterfaceLB(m_xBuilder->weld_combo_box("userinterface"))
     , m_xLocaleSettingFT(m_xBuilder->weld_label("localesettingFT"))
-    , m_xLocaleSettingLB(new LanguageBox(m_xBuilder->weld_combo_box("localesetting")))
+    , m_xLocaleSettingLB(new SvxLanguageBox(m_xBuilder->weld_combo_box("localesetting")))
     , m_xDecimalSeparatorCB(m_xBuilder->weld_check_button("decimalseparator"))
     , m_xCurrencyFT(m_xBuilder->weld_label("defaultcurrency"))
     , m_xCurrencyLB(m_xBuilder->weld_combo_box("currencylb"))
     , m_xDatePatternsFT(m_xBuilder->weld_label("dataaccpatterns"))
     , m_xDatePatternsED(m_xBuilder->weld_entry("datepatterns"))
-    , m_xWesternLanguageLB(new LanguageBox(m_xBuilder->weld_combo_box("westernlanguage")))
+    , m_xWesternLanguageLB(new SvxLanguageBox(m_xBuilder->weld_combo_box("westernlanguage")))
     , m_xWesternLanguageFT(m_xBuilder->weld_label("western"))
-    , m_xAsianLanguageLB(new LanguageBox(m_xBuilder->weld_combo_box("asianlanguage")))
-    , m_xComplexLanguageLB(new LanguageBox(m_xBuilder->weld_combo_box("complexlanguage")))
+    , m_xAsianLanguageLB(new SvxLanguageBox(m_xBuilder->weld_combo_box("asianlanguage")))
+    , m_xComplexLanguageLB(new SvxLanguageBox(m_xBuilder->weld_combo_box("complexlanguage")))
     , m_xCurrentDocCB(m_xBuilder->weld_check_button("currentdoc"))
     , m_xAsianSupportCB(m_xBuilder->weld_check_button("asiansupport"))
     , m_xCTLSupportCB(m_xBuilder->weld_check_button("ctlsupport"))
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 33029f1acb4a..5c591e7c876f 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -145,17 +145,17 @@ class OfaLanguagesTabPage : public SfxTabPage
 
     std::unique_ptr<weld::ComboBox> m_xUserInterfaceLB;
     std::unique_ptr<weld::Label> m_xLocaleSettingFT;
-    std::unique_ptr<LanguageBox> m_xLocaleSettingLB;
+    std::unique_ptr<SvxLanguageBox> m_xLocaleSettingLB;
     std::unique_ptr<weld::CheckButton> m_xDecimalSeparatorCB;
     std::unique_ptr<weld::Label> m_xCurrencyFT;
     std::unique_ptr<weld::ComboBox> m_xCurrencyLB;
     std::unique_ptr<weld::Label> m_xDatePatternsFT;
     std::unique_ptr<weld::Entry> m_xDatePatternsED;
 
-    std::unique_ptr<LanguageBox> m_xWesternLanguageLB;
+    std::unique_ptr<SvxLanguageBox> m_xWesternLanguageLB;
     std::unique_ptr<weld::Label> m_xWesternLanguageFT;
-    std::unique_ptr<LanguageBox> m_xAsianLanguageLB;
-    std::unique_ptr<LanguageBox> m_xComplexLanguageLB;
+    std::unique_ptr<SvxLanguageBox> m_xAsianLanguageLB;
+    std::unique_ptr<SvxLanguageBox> m_xComplexLanguageLB;
     std::unique_ptr<weld::CheckButton> m_xCurrentDocCB;
     std::unique_ptr<weld::CheckButton> m_xAsianSupportCB;
     std::unique_ptr<weld::CheckButton> m_xCTLSupportCB;
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index c8ee82ad43dd..2026c73826a9 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1537,7 +1537,7 @@ SvxEditModulesDlg::SvxEditModulesDlg(weld::Window* pParent, SvxLinguData_Impl& r
     , m_xBackPB(m_xBuilder->weld_button("back"))
     , m_xMoreDictsLink(m_xBuilder->weld_link_button("moredictslink"))
     , m_xClosePB(m_xBuilder->weld_button("close"))
-    , m_xLanguageLB(new LanguageBox(m_xBuilder->weld_combo_box("language")))
+    , m_xLanguageLB(new SvxLanguageBox(m_xBuilder->weld_combo_box("language")))
 {
     m_xModulesCLB->set_size_request(m_xModulesCLB->get_approximate_digit_width() * 40,
                                     m_xModulesCLB->get_height_rows(12));
@@ -1636,7 +1636,7 @@ IMPL_LINK_NOARG(SvxEditModulesDlg, LangSelectListBoxHdl_Impl, weld::ComboBox&, v
     LangSelectHdl_Impl(m_xLanguageLB.get());
 }
 
-void SvxEditModulesDlg::LangSelectHdl_Impl(const LanguageBox* pBox)
+void SvxEditModulesDlg::LangSelectHdl_Impl(const SvxLanguageBox* pBox)
 {
     LanguageType  eCurLanguage = m_xLanguageLB->get_active_id();
     static Locale aLastLocale;
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 1f5f78dfdce2..cae7b77fdd40 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -55,7 +55,7 @@ using namespace ::com::sun::star;
 OfaAutoCorrDlg::OfaAutoCorrDlg(weld::Window* pParent, const SfxItemSet* _pSet )
     : SfxTabDialogController(pParent, "cui/ui/autocorrectdialog.ui", "AutoCorrectDialog", _pSet)
     , m_xLanguageBox(m_xBuilder->weld_widget("langbox"))
-    , m_xLanguageLB(new LanguageBox(m_xBuilder->weld_combo_box("lang")))
+    , m_xLanguageLB(new SvxLanguageBox(m_xBuilder->weld_combo_box("lang")))
 {
     bool bShowSWOptions = false;
     bool bOpenSmartTagOptions = false;
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index c97057e502e6..d7dca728de87 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -223,7 +223,7 @@ SvxCharNamePage::SvxCharNamePage(weld::Container* pPage, weld::DialogController*
     , m_xEastFontSizeFT(m_xBuilder->weld_label("eastsizeft"))
     , m_xEastFontSizeLB(new SvtFontSizeBox(m_xBuilder->weld_combo_box("eastsizelb")))
     , m_xEastFontLanguageFT(m_xBuilder->weld_label("eastlangft"))
-    , m_xEastFontLanguageLB(new LanguageBox(m_xBuilder->weld_combo_box("eastlanglb")))
+    , m_xEastFontLanguageLB(new SvxLanguageBox(m_xBuilder->weld_combo_box("eastlanglb")))
     , m_xEastFontTypeFT(m_xBuilder->weld_label("eastfontinfo"))
     , m_xEastFontFeaturesButton(m_xBuilder->weld_button("east_features_button"))
     , m_xCTLFrame(m_xBuilder->weld_widget("ctl"))
@@ -234,7 +234,7 @@ SvxCharNamePage::SvxCharNamePage(weld::Container* pPage, weld::DialogController*
     , m_xCTLFontSizeFT(m_xBuilder->weld_label("ctlsizeft"))
     , m_xCTLFontSizeLB(new SvtFontSizeBox(m_xBuilder->weld_combo_box("ctlsizelb")))
     , m_xCTLFontLanguageFT(m_xBuilder->weld_label("ctllangft"))
-    , m_xCTLFontLanguageLB(new LanguageBox(m_xBuilder->weld_combo_box("ctllanglb")))
+    , m_xCTLFontLanguageLB(new SvxLanguageBox(m_xBuilder->weld_combo_box("ctllanglb")))
     , m_xCTLFontTypeFT(m_xBuilder->weld_label("ctlfontinfo"))
     , m_xCTLFontFeaturesButton(m_xBuilder->weld_button("ctl_features_button"))
 {
@@ -261,7 +261,7 @@ SvxCharNamePage::SvxCharNamePage(weld::Container* pPage, weld::DialogController*
         m_xWestFontSizeLB.reset(new SvtFontSizeBox(m_xBuilder->weld_combo_box("westsizelb-cjk")));
 
         m_xWestFontLanguageFT = m_xBuilder->weld_label("westlangft-cjk");
-        m_xWestFontLanguageLB.reset(new LanguageBox(m_xBuilder->weld_combo_box("westlanglb-cjk")));
+        m_xWestFontLanguageLB.reset(new SvxLanguageBox(m_xBuilder->weld_combo_box("westlanglb-cjk")));
         m_xWestFontTypeFT = m_xBuilder->weld_label("westfontinfo-cjk");
 
         m_xWestFontFeaturesButton = m_xBuilder->weld_button("west_features_button-cjk");
@@ -274,7 +274,7 @@ SvxCharNamePage::SvxCharNamePage(weld::Container* pPage, weld::DialogController*
         m_xWestFontSizeFT = m_xBuilder->weld_label("westsizeft-nocjk");
 
         m_xWestFontLanguageFT = m_xBuilder->weld_label("westlangft-nocjk");
-        m_xWestFontLanguageLB.reset(new LanguageBox(m_xBuilder->weld_combo_box("westlanglb-nocjk")));
+        m_xWestFontLanguageLB.reset(new SvxLanguageBox(m_xBuilder->weld_combo_box("westlanglb-nocjk")));
         m_xWestFontTypeFT = m_xBuilder->weld_label("westfontinfo-nocjk");
 
         m_xWestFontFeaturesButton = m_xBuilder->weld_button("west_features_button-nocjk");
@@ -405,7 +405,7 @@ namespace
                     const weld::ComboBox* _pFontNameLB,
                     const SvtFontStyleBox* _pFontStyleLB,
                     const SvtFontSizeBox* _pFontSizeLB,
-                    const LanguageBox* _pLanguageLB,
+                    const SvxLanguageBox* _pLanguageLB,
                     const FontList* _pFontList,
                     sal_uInt16 _nFontWhich,
                     sal_uInt16 _nFontHeightWhich)
@@ -609,7 +609,7 @@ void SvxCharNamePage::Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp
     weld::Label* pSizeLabel = nullptr;
     SvtFontSizeBox* pSizeBox = nullptr;
     weld::Label* pLangFT = nullptr;
-    LanguageBox* pLangBox = nullptr;
+    SvxLanguageBox* pLangBox = nullptr;
     sal_uInt16 nWhich = 0;
 
     switch ( eLangGrp )
@@ -837,7 +837,7 @@ bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp
     weld::ComboBox* pNameBox = nullptr;
     SvtFontStyleBox* pStyleBox = nullptr;
     SvtFontSizeBox* pSizeBox = nullptr;
-    LanguageBox* pLangBox = nullptr;
+    SvxLanguageBox* pLangBox = nullptr;
     sal_uInt16 nWhich = 0;
     sal_uInt16 nSlot = 0;
 
@@ -1078,17 +1078,17 @@ bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp
     {
         switch (pLangBox->GetEditedAndValid())
         {
-            case LanguageBox::EditedAndValid::No:
+            case SvxLanguageBox::EditedAndValid::No:
                 ;   // nothing to do
                 break;
-            case LanguageBox::EditedAndValid::Valid:
+            case SvxLanguageBox::EditedAndValid::Valid:
                 {
                     const int nPos = pLangBox->SaveEditedAsEntry();
                     if (nPos != -1)
                         pLangBox->set_active(nPos);
                 }
                 break;
-            case LanguageBox::EditedAndValid::Invalid:
+            case SvxLanguageBox::EditedAndValid::Invalid:
                 pLangBox->set_active_id(pLangBox->get_saved_active_id());
                 break;
         }
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 3a7dc1b053d4..a666ce2a508f 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -216,7 +216,7 @@ SvxNumberFormatTabPage::SvxNumberFormatTabPage(weld::Container* pPage, weld::Dia
     , m_xIbRemove(m_xBuilder->weld_button("delete"))
     , m_xFtComment(m_xBuilder->weld_label("commentft"))
     , m_xEdComment(m_xBuilder->weld_entry("commented"))
-    , m_xLbLanguage(new LanguageBox(m_xBuilder->weld_combo_box("languagelb")))
+    , m_xLbLanguage(new SvxLanguageBox(m_xBuilder->weld_combo_box("languagelb")))
     , m_xWndPreview(new weld::CustomWeld(*m_xBuilder, "preview", m_aWndPreview))
 {
     for (size_t i = 0; i < SAL_N_ELEMENTS(NUM_CATEGORIES); ++i)