From 77c9c2c993da3bc9302131cef4345db114696333 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 17 Oct 2019 13:56:16 +0100 Subject: rename LanguageBox back to SvxLanguageBox MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I9bd29b7377fdf0e1ba36cc021e7e78f83bb1c12c Reviewed-on: https://gerrit.libreoffice.org/80960 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- basctl/source/dlged/managelang.cxx | 2 +- basctl/source/inc/managelang.hxx | 4 ++-- cui/source/dialogs/SpellDialog.cxx | 2 +- cui/source/inc/SpellDialog.hxx | 2 +- cui/source/inc/autocdlg.hxx | 2 +- cui/source/inc/chardlg.hxx | 6 ++--- cui/source/inc/numfmt.hxx | 2 +- cui/source/inc/optasian.hxx | 2 +- cui/source/inc/optdict.hxx | 4 ++-- cui/source/inc/optlingu.hxx | 4 ++-- cui/source/options/optasian.cxx | 2 +- cui/source/options/optdict.cxx | 4 ++-- cui/source/options/optgdlg.cxx | 8 +++---- cui/source/options/optgdlg.hxx | 8 +++---- cui/source/options/optlingu.cxx | 4 ++-- cui/source/tabpages/autocdlg.cxx | 2 +- cui/source/tabpages/chardlg.cxx | 20 ++++++++--------- cui/source/tabpages/numfmt.cxx | 2 +- include/svx/langbox.hxx | 4 ++-- sc/source/ui/dbgui/scuiasciiopt.cxx | 2 +- sc/source/ui/dbgui/textimportoptions.cxx | 2 +- sc/source/ui/dbgui/tpsort.cxx | 2 +- sc/source/ui/inc/scuiasciiopt.hxx | 2 +- sc/source/ui/inc/textimportoptions.hxx | 4 ++-- sc/source/ui/inc/tpsort.hxx | 2 +- sd/source/ui/dlg/dlgfield.cxx | 2 +- sd/source/ui/dlg/headerfooterdlg.cxx | 4 ++-- sd/source/ui/inc/dlgfield.hxx | 4 ++-- svx/source/dialog/langbox.cxx | 38 ++++++++++++++++---------------- sw/source/ui/dialog/ascfldlg.cxx | 2 +- sw/source/ui/index/cnttab.cxx | 2 +- sw/source/ui/misc/srtdlg.cxx | 2 +- sw/source/uibase/inc/ascfldlg.hxx | 2 +- sw/source/uibase/inc/srtdlg.hxx | 2 +- sw/source/uibase/inc/swuicnttab.hxx | 2 +- 35 files changed, 79 insertions(+), 79 deletions(-) diff --git a/basctl/source/dlged/managelang.cxx b/basctl/source/dlged/managelang.cxx index 2c10c81c0eab..1d87ab94039f 100644 --- a/basctl/source/dlged/managelang.cxx +++ b/basctl/source/dlged/managelang.cxx @@ -227,7 +227,7 @@ SetDefaultLanguageDialog::SetDefaultLanguageDialog(weld::Window* pParent, std::s , m_xDefinedFT(m_xBuilder->weld_label("defined")) , m_xAddedFT(m_xBuilder->weld_label("added")) , m_xAltTitle(m_xBuilder->weld_label("alttitle")) - , m_xLanguageCB(new LanguageBox(m_xBuilder->weld_combo_box("hidden"))) + , m_xLanguageCB(new SvxLanguageBox(m_xBuilder->weld_combo_box("hidden"))) { m_xLanguageLB->set_size_request(-1, m_xLanguageLB->get_height_rows(10)); m_xCheckLangLB->set_size_request(-1, m_xCheckLangLB->get_height_rows(10)); diff --git a/basctl/source/inc/managelang.hxx b/basctl/source/inc/managelang.hxx index 24f408336e17..d605be858ad7 100644 --- a/basctl/source/inc/managelang.hxx +++ b/basctl/source/inc/managelang.hxx @@ -22,7 +22,7 @@ #include -class LanguageBox; +class SvxLanguageBox; namespace basctl { @@ -84,7 +84,7 @@ private: std::unique_ptr m_xDefinedFT; std::unique_ptr m_xAddedFT; std::unique_ptr m_xAltTitle; - std::unique_ptr<::LanguageBox> m_xLanguageCB; + std::unique_ptr m_xLanguageCB; public: SetDefaultLanguageDialog(weld::Window* pParent, std::shared_ptr const & xLMgr); 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 m_xNoSuggestionsFT; std::unique_ptr m_xIgnoreOnceFT; std::unique_ptr m_xLanguageFT; - std::unique_ptr m_xLanguageLB; + std::unique_ptr m_xLanguageLB; std::unique_ptr m_xExplainFT; std::unique_ptr m_xExplainLink; std::unique_ptr 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 m_xLanguageBox; - std::unique_ptr m_xLanguageLB; + std::unique_ptr 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 m_xWestFontSizeFT; std::unique_ptr m_xWestFontSizeLB; std::unique_ptr m_xWestFontLanguageFT; - std::unique_ptr m_xWestFontLanguageLB; + std::unique_ptr m_xWestFontLanguageLB; std::unique_ptr m_xWestFontTypeFT; std::unique_ptr m_xWestFontFeaturesButton; @@ -86,7 +86,7 @@ private: std::unique_ptr m_xEastFontSizeFT; std::unique_ptr m_xEastFontSizeLB; std::unique_ptr m_xEastFontLanguageFT; - std::unique_ptr m_xEastFontLanguageLB; + std::unique_ptr m_xEastFontLanguageLB; std::unique_ptr m_xEastFontTypeFT; std::unique_ptr m_xEastFontFeaturesButton; @@ -98,7 +98,7 @@ private: std::unique_ptr m_xCTLFontSizeFT; std::unique_ptr m_xCTLFontSizeLB; std::unique_ptr m_xCTLFontLanguageFT; - std::unique_ptr m_xCTLFontLanguageLB; + std::unique_ptr m_xCTLFontLanguageLB; std::unique_ptr m_xCTLFontTypeFT; std::unique_ptr 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 m_xIbRemove; std::unique_ptr m_xFtComment; std::unique_ptr m_xEdComment; - std::unique_ptr m_xLbLanguage; + std::unique_ptr m_xLbLanguage; std::unique_ptr 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 m_xPunctCompressionRB; std::unique_ptr m_xPunctKanaCompressionRB; std::unique_ptr m_xLanguageFT; - std::unique_ptr m_xLanguageLB; + std::unique_ptr m_xLanguageLB; std::unique_ptr m_xStandardCB; std::unique_ptr m_xStartFT; std::unique_ptr 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 m_xNameEdit; - std::unique_ptr m_xLanguageLB; + std::unique_ptr m_xLanguageLB; std::unique_ptr m_xExceptBtn; std::unique_ptr m_xOKBtn; css::uno::Reference m_xNewDic; @@ -73,7 +73,7 @@ private: weld::TreeView* m_pWordsLB; std::unique_ptr m_xAllDictsLB; std::unique_ptr m_xLangFT; - std::unique_ptr m_xLangLB; + std::unique_ptr m_xLangLB; std::unique_ptr m_xWordED; std::unique_ptr m_xReplaceFT; std::unique_ptr 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 m_xBackPB; std::unique_ptr m_xMoreDictsLink; std::unique_ptr m_xClosePB; - std::unique_ptr m_xLanguageLB; + std::unique_ptr 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 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 m_xUserInterfaceLB; std::unique_ptr m_xLocaleSettingFT; - std::unique_ptr m_xLocaleSettingLB; + std::unique_ptr m_xLocaleSettingLB; std::unique_ptr m_xDecimalSeparatorCB; std::unique_ptr m_xCurrencyFT; std::unique_ptr m_xCurrencyLB; std::unique_ptr m_xDatePatternsFT; std::unique_ptr m_xDatePatternsED; - std::unique_ptr m_xWesternLanguageLB; + std::unique_ptr m_xWesternLanguageLB; std::unique_ptr m_xWesternLanguageFT; - std::unique_ptr m_xAsianLanguageLB; - std::unique_ptr m_xComplexLanguageLB; + std::unique_ptr m_xAsianLanguageLB; + std::unique_ptr m_xComplexLanguageLB; std::unique_ptr m_xCurrentDocCB; std::unique_ptr m_xAsianSupportCB; std::unique_ptr 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) diff --git a/include/svx/langbox.hxx b/include/svx/langbox.hxx index ad686bf39cd0..d693e684e1be 100644 --- a/include/svx/langbox.hxx +++ b/include/svx/langbox.hxx @@ -89,7 +89,7 @@ protected: SVX_DLLPRIVATE virtual sal_Int32 ImplGetEntryPos( const void* pData ) const = 0; }; -class SVX_DLLPUBLIC LanguageBox +class SVX_DLLPUBLIC SvxLanguageBox { public: enum class EditedAndValid @@ -119,7 +119,7 @@ private: SVX_DLLPRIVATE void ImplClear(); DECL_LINK(ChangeHdl, weld::ComboBox&, void); public: - LanguageBox(std::unique_ptr pControl); + SvxLanguageBox(std::unique_ptr pControl); void SetLanguageList( SvxLanguageListFlags nLangList, bool bHasLangNone, bool bLangNoneIsLangAll = false, bool bCheckSpellAvail = false ); diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx index 24cc8f3d46eb..e1d468da507c 100644 --- a/sc/source/ui/dbgui/scuiasciiopt.cxx +++ b/sc/source/ui/dbgui/scuiasciiopt.cxx @@ -296,7 +296,7 @@ ScImportAsciiDlg::ScImportAsciiDlg(weld::Window* pParent, const OUString& aDatNa , mxFtCharSet(m_xBuilder->weld_label("textcharset")) , mxLbCharSet(new SvxTextEncodingBox(m_xBuilder->weld_combo_box("charset"))) , mxFtCustomLang(m_xBuilder->weld_label("textlanguage")) - , mxLbCustomLang(new LanguageBox(m_xBuilder->weld_combo_box("language"))) + , mxLbCustomLang(new SvxLanguageBox(m_xBuilder->weld_combo_box("language"))) , mxFtRow(m_xBuilder->weld_label("textfromrow")) , mxNfRow(m_xBuilder->weld_spin_button("fromrow")) , mxRbFixed(m_xBuilder->weld_radio_button("tofixedwidth")) diff --git a/sc/source/ui/dbgui/textimportoptions.cxx b/sc/source/ui/dbgui/textimportoptions.cxx index a8b1e66ca7a2..63353d4b28a8 100644 --- a/sc/source/ui/dbgui/textimportoptions.cxx +++ b/sc/source/ui/dbgui/textimportoptions.cxx @@ -31,7 +31,7 @@ ScTextImportOptionsDlg::ScTextImportOptionsDlg(weld::Window* pParent) , m_xRbAutomatic(m_xBuilder->weld_radio_button("automatic")) , m_xRbCustom(m_xBuilder->weld_radio_button("custom")) , m_xBtnConvertDate(m_xBuilder->weld_check_button("convertdata")) - , m_xLbCustomLang(new LanguageBox(m_xBuilder->weld_combo_box("lang"))) + , m_xLbCustomLang(new SvxLanguageBox(m_xBuilder->weld_combo_box("lang"))) { init(); } diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index 09f02925fbaf..13c2785953c2 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -491,7 +491,7 @@ ScTabPageSortOptions::ScTabPageSortOptions(weld::Container* pPage, weld::DialogC , m_xEdOutPos(m_xBuilder->weld_entry("outareaed")) , m_xBtnSortUser(m_xBuilder->weld_check_button("sortuser")) , m_xLbSortUser(m_xBuilder->weld_combo_box("sortuserlb")) - , m_xLbLanguage(new LanguageBox(m_xBuilder->weld_combo_box("language"))) + , m_xLbLanguage(new SvxLanguageBox(m_xBuilder->weld_combo_box("language"))) , m_xFtAlgorithm(m_xBuilder->weld_label("algorithmft")) , m_xLbAlgorithm(m_xBuilder->weld_combo_box("algorithmlb")) , m_xBtnTopDown(m_xBuilder->weld_radio_button("topdown")) diff --git a/sc/source/ui/inc/scuiasciiopt.hxx b/sc/source/ui/inc/scuiasciiopt.hxx index 0a4dcb98043b..1b263931bc6f 100644 --- a/sc/source/ui/inc/scuiasciiopt.hxx +++ b/sc/source/ui/inc/scuiasciiopt.hxx @@ -57,7 +57,7 @@ class ScImportAsciiDlg : public weld::GenericDialogController std::unique_ptr mxFtCharSet; std::unique_ptr mxLbCharSet; std::unique_ptr mxFtCustomLang; - std::unique_ptr mxLbCustomLang; + std::unique_ptr mxLbCustomLang; std::unique_ptr mxFtRow; std::unique_ptr mxNfRow; diff --git a/sc/source/ui/inc/textimportoptions.hxx b/sc/source/ui/inc/textimportoptions.hxx index 2e8320e6e1c7..3b50655c7d72 100644 --- a/sc/source/ui/inc/textimportoptions.hxx +++ b/sc/source/ui/inc/textimportoptions.hxx @@ -23,7 +23,7 @@ #include #include -class LanguageBox; +class SvxLanguageBox; class ScTextImportOptionsDlg : public weld::GenericDialogController { @@ -42,7 +42,7 @@ private: std::unique_ptr m_xRbAutomatic; std::unique_ptr m_xRbCustom; std::unique_ptr m_xBtnConvertDate; - std::unique_ptr m_xLbCustomLang; + std::unique_ptr m_xLbCustomLang; DECL_LINK(OKHdl, weld::Button&, void); DECL_LINK(RadioHdl, weld::ToggleButton&, void); diff --git a/sc/source/ui/inc/tpsort.hxx b/sc/source/ui/inc/tpsort.hxx index 5765b7096e05..35be32afa3b2 100644 --- a/sc/source/ui/inc/tpsort.hxx +++ b/sc/source/ui/inc/tpsort.hxx @@ -127,7 +127,7 @@ private: std::unique_ptr m_xEdOutPos; std::unique_ptr m_xBtnSortUser; std::unique_ptr m_xLbSortUser; - std::unique_ptr m_xLbLanguage; + std::unique_ptr m_xLbLanguage; std::unique_ptr m_xFtAlgorithm; std::unique_ptr m_xLbAlgorithm; std::unique_ptr m_xBtnTopDown; diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx index 50d394c3eb10..164fbac3b753 100644 --- a/sd/source/ui/dlg/dlgfield.cxx +++ b/sd/source/ui/dlg/dlgfield.cxx @@ -41,7 +41,7 @@ SdModifyFieldDlg::SdModifyFieldDlg(weld::Window* pWindow, const SvxFieldData* pI , m_pField(pInField) , m_xRbtFix(m_xBuilder->weld_radio_button("fixedRB")) , m_xRbtVar(m_xBuilder->weld_radio_button("varRB")) - , m_xLbLanguage(new LanguageBox(m_xBuilder->weld_combo_box("languageLB"))) + , m_xLbLanguage(new SvxLanguageBox(m_xBuilder->weld_combo_box("languageLB"))) , m_xLbFormat(m_xBuilder->weld_combo_box("formatLB")) { m_xLbLanguage->SetLanguageList( SvxLanguageListFlags::ALL|SvxLanguageListFlags::ONLY_KNOWN, false ); diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx index e93b40d47514..d30af2b22110 100644 --- a/sd/source/ui/dlg/headerfooterdlg.cxx +++ b/sd/source/ui/dlg/headerfooterdlg.cxx @@ -124,7 +124,7 @@ private: std::unique_ptr mxTBDateTimeFixed; std::unique_ptr mxCBDateTimeFormat; std::unique_ptr mxFTDateTimeLanguage; - std::unique_ptr mxCBDateTimeLanguage; + std::unique_ptr mxCBDateTimeLanguage; std::unique_ptr mxCBFooter; std::unique_ptr mxFooterBox; std::unique_ptr mxTBFooter; @@ -357,7 +357,7 @@ HeaderFooterTabPage::HeaderFooterTabPage(weld::Container* pParent, SdDrawDocumen , mxTBDateTimeFixed(mxBuilder->weld_entry("datetime_value")) , mxCBDateTimeFormat(mxBuilder->weld_combo_box("datetime_format_list")) , mxFTDateTimeLanguage(mxBuilder->weld_label("language_label")) - , mxCBDateTimeLanguage(new LanguageBox(mxBuilder->weld_combo_box("language_list"))) + , mxCBDateTimeLanguage(new SvxLanguageBox(mxBuilder->weld_combo_box("language_list"))) , mxCBFooter(mxBuilder->weld_check_button("footer_cb")) , mxFooterBox(mxBuilder->weld_widget("footer_box" )) , mxTBFooter(mxBuilder->weld_entry("footer_text")) diff --git a/sd/source/ui/inc/dlgfield.hxx b/sd/source/ui/inc/dlgfield.hxx index b15b0f864cfa..63ff6a1d5d0f 100644 --- a/sd/source/ui/inc/dlgfield.hxx +++ b/sd/source/ui/inc/dlgfield.hxx @@ -25,7 +25,7 @@ #include class SvxFieldData; -class LanguageBox; +class SvxLanguageBox; /** * dialog to adjust field-commands @@ -38,7 +38,7 @@ private: std::unique_ptr m_xRbtFix; std::unique_ptr m_xRbtVar; - std::unique_ptr m_xLbLanguage; + std::unique_ptr m_xLbLanguage; std::unique_ptr m_xLbFormat; void FillFormatList(); diff --git a/svx/source/dialog/langbox.cxx b/svx/source/dialog/langbox.cxx index 8403b67fdbe9..a524288b29ec 100644 --- a/svx/source/dialog/langbox.cxx +++ b/svx/source/dialog/langbox.cxx @@ -345,7 +345,7 @@ sal_Int32 SvxLanguageBoxBase::ImplTypeToPos( LanguageType eType ) const } -LanguageType LanguageBox::get_active_id() const +LanguageType SvxLanguageBox::get_active_id() const { OUString sLang = m_xControl->get_active_id(); if (!sLang.isEmpty()) @@ -354,32 +354,32 @@ LanguageType LanguageBox::get_active_id() const return LANGUAGE_DONTKNOW; } -int LanguageBox::find_id(const LanguageType eLangType) const +int SvxLanguageBox::find_id(const LanguageType eLangType) const { return m_xControl->find_id(OUString::number(static_cast(eLangType))); } -void LanguageBox::set_id(int pos, const LanguageType eLangType) +void SvxLanguageBox::set_id(int pos, const LanguageType eLangType) { m_xControl->set_id(pos, OUString::number(static_cast(eLangType))); } -LanguageType LanguageBox::get_id(int pos) const +LanguageType SvxLanguageBox::get_id(int pos) const { return LanguageType(m_xControl->get_id(pos).toInt32()); } -void LanguageBox::remove_id(const LanguageType eLangType) +void SvxLanguageBox::remove_id(const LanguageType eLangType) { m_xControl->remove_id(OUString::number(static_cast(eLangType))); } -void LanguageBox::append(const LanguageType eLangType, const OUString& rStr) +void SvxLanguageBox::append(const LanguageType eLangType, const OUString& rStr) { m_xControl->append(OUString::number(static_cast(eLangType)), rStr); } -void LanguageBox::set_active_id(const LanguageType eLangType) +void SvxLanguageBox::set_active_id(const LanguageType eLangType) { // If the core uses a LangID of an imported MS document and wants to select // a language that is replaced, we need to select the replacement instead. @@ -397,7 +397,7 @@ void LanguageBox::set_active_id(const LanguageType eLangType) m_xControl->set_active(nAt); } -void LanguageBox::AddLanguages(const std::vector< LanguageType >& rLanguageTypes, +void SvxLanguageBox::AddLanguages(const std::vector< LanguageType >& rLanguageTypes, SvxLanguageListFlags nLangList, std::vector& rEntries) { for ( auto const & nLangType : rLanguageTypes ) @@ -422,12 +422,12 @@ void LanguageBox::AddLanguages(const std::vector< LanguageType >& rLanguageTypes } } -void LanguageBox::ImplClear() +void SvxLanguageBox::ImplClear() { m_xControl->clear(); } -void LanguageBox::SetLanguageList( SvxLanguageListFlags nLangList, +void SvxLanguageBox::SetLanguageList( SvxLanguageListFlags nLangList, bool bHasLangNone, bool bLangNoneIsLangAll, bool bCheckSpellAvail ) { m_bHasLangNone = bHasLangNone; @@ -526,12 +526,12 @@ void LanguageBox::SetLanguageList( SvxLanguageListFlags nLangList, m_xControl->insert_vector(aEntries, false); } -int LanguageBox::ImplTypeToPos(LanguageType eType) const +int SvxLanguageBox::ImplTypeToPos(LanguageType eType) const { return m_xControl->find_id(OUString::number(static_cast(eType))); } -void LanguageBox::InsertLanguage(const LanguageType nLangType, sal_Int16 nType) +void SvxLanguageBox::InsertLanguage(const LanguageType nLangType, sal_Int16 nType) { weld::ComboBoxEntry aEntry = BuildEntry(nLangType, nType); if (aEntry.sString.isEmpty()) @@ -542,17 +542,17 @@ void LanguageBox::InsertLanguage(const LanguageType nLangType, sal_Int16 nType) m_xControl->append(aEntry.sId, aEntry.sString, aEntry.sImage); } -void LanguageBox::InsertLanguage(const LanguageType nLangType) +void SvxLanguageBox::InsertLanguage(const LanguageType nLangType) { InsertLanguage(nLangType, css::i18n::ScriptType::WEAK); } -void LanguageBox::InsertDefaultLanguage(sal_Int16 nType) +void SvxLanguageBox::InsertDefaultLanguage(sal_Int16 nType) { InsertLanguage(LANGUAGE_SYSTEM, nType); } -weld::ComboBoxEntry LanguageBox::BuildEntry(const LanguageType nLangType, sal_Int16 nType) +weld::ComboBoxEntry SvxLanguageBox::BuildEntry(const LanguageType nLangType, sal_Int16 nType) { LanguageType nLang = MsLangId::getReplacementForObsoleteLanguage(nLangType); // For obsolete and to be replaced languages check whether an entry of the @@ -600,7 +600,7 @@ weld::ComboBoxEntry LanguageBox::BuildEntry(const LanguageType nLangType, sal_In return weld::ComboBoxEntry(aStrEntry, OUString::number(static_cast(nLangType))); } -IMPL_LINK(LanguageBox, ChangeHdl, weld::ComboBox&, rControl, void) +IMPL_LINK(SvxLanguageBox, ChangeHdl, weld::ComboBox&, rControl, void) { if (rControl.has_entry()) { @@ -673,7 +673,7 @@ IMPL_LINK(LanguageBox, ChangeHdl, weld::ComboBox&, rControl, void) m_aChangeHdl.Call(rControl); } -LanguageBox::LanguageBox(std::unique_ptr pControl) +SvxLanguageBox::SvxLanguageBox(std::unique_ptr pControl) : m_xControl(std::move(pControl)) , m_aAllString(SvxResId(RID_SVXSTR_LANGUAGE_ALL)) , m_eSavedLanguage(LANGUAGE_DONTKNOW) @@ -683,10 +683,10 @@ LanguageBox::LanguageBox(std::unique_ptr pControl) , m_bWithCheckmark(false) { m_xControl->make_sorted(); - m_xControl->connect_changed(LINK(this, LanguageBox, ChangeHdl)); + m_xControl->connect_changed(LINK(this, SvxLanguageBox, ChangeHdl)); } -sal_Int32 LanguageBox::SaveEditedAsEntry() +sal_Int32 SvxLanguageBox::SaveEditedAsEntry() { if (m_eEditedAndValid != EditedAndValid::Valid) return -1; diff --git a/sw/source/ui/dialog/ascfldlg.cxx b/sw/source/ui/dialog/ascfldlg.cxx index 9aaeed93a29f..801a91da0bfd 100644 --- a/sw/source/ui/dialog/ascfldlg.cxx +++ b/sw/source/ui/dialog/ascfldlg.cxx @@ -66,7 +66,7 @@ SwAsciiFilterDlg::SwAsciiFilterDlg( weld::Window* pParent, SwDocShell& rDocSh, , m_xFontFT(m_xBuilder->weld_label("fontft")) , m_xFontLB(m_xBuilder->weld_combo_box("font")) , 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_xCRLF_RB(m_xBuilder->weld_radio_button("crlf")) , m_xCR_RB(m_xBuilder->weld_radio_button("cr")) , m_xLF_RB(m_xBuilder->weld_radio_button("lf")) diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 33febe28630a..3ef5fb14bb3f 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -741,7 +741,7 @@ SwTOXSelectTabPage::SwTOXSelectTabPage(weld::Container* pPage, weld::DialogContr , m_xBracketLB(m_xBuilder->weld_combo_box("brackets")) , m_xAuthorityFrame(m_xBuilder->weld_widget("authframe")) , m_xSortFrame(m_xBuilder->weld_widget("sortframe")) - , m_xLanguageLB(new LanguageBox(m_xBuilder->weld_combo_box("lang"))) + , m_xLanguageLB(new SvxLanguageBox(m_xBuilder->weld_combo_box("lang"))) , m_xSortAlgorithmLB(m_xBuilder->weld_combo_box("keytype")) { sAddStyleUser = m_xStylesCB->get_label(); diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx index 6e0519dbbea3..e9a8e715f6a9 100644 --- a/sw/source/ui/misc/srtdlg.cxx +++ b/sw/source/ui/misc/srtdlg.cxx @@ -122,7 +122,7 @@ SwSortDlg::SwSortDlg(weld::Window* pParent, SwWrtShell &rShell) , m_xDelimFreeRB(m_xBuilder->weld_radio_button("character")) , m_xDelimEdt(m_xBuilder->weld_entry("separator")) , m_xDelimPB(m_xBuilder->weld_button("delimpb")) - , m_xLangLB(new LanguageBox(m_xBuilder->weld_combo_box("langlb"))) + , m_xLangLB(new SvxLanguageBox(m_xBuilder->weld_combo_box("langlb"))) , m_xCaseCB(m_xBuilder->weld_check_button("matchcase")) , aColText(SwResId(STR_COL)) , aRowText(SwResId(STR_ROW)) diff --git a/sw/source/uibase/inc/ascfldlg.hxx b/sw/source/uibase/inc/ascfldlg.hxx index 31b214af2747..330159551f96 100644 --- a/sw/source/uibase/inc/ascfldlg.hxx +++ b/sw/source/uibase/inc/ascfldlg.hxx @@ -37,7 +37,7 @@ class SwAsciiFilterDlg : public SfxDialogController std::unique_ptr m_xFontFT; std::unique_ptr m_xFontLB; std::unique_ptr m_xLanguageFT; - std::unique_ptr m_xLanguageLB; + std::unique_ptr m_xLanguageLB; std::unique_ptr m_xCRLF_RB; std::unique_ptr m_xCR_RB; std::unique_ptr m_xLF_RB; diff --git a/sw/source/uibase/inc/srtdlg.hxx b/sw/source/uibase/inc/srtdlg.hxx index 99edf77dd081..85bba0a2131b 100644 --- a/sw/source/uibase/inc/srtdlg.hxx +++ b/sw/source/uibase/inc/srtdlg.hxx @@ -56,7 +56,7 @@ class SwSortDlg : public weld::GenericDialogController std::unique_ptr m_xDelimEdt; std::unique_ptr m_xDelimPB; - std::unique_ptr m_xLangLB; + std::unique_ptr m_xLangLB; std::unique_ptr m_xCaseCB; diff --git a/sw/source/uibase/inc/swuicnttab.hxx b/sw/source/uibase/inc/swuicnttab.hxx index e27eeac6cb28..b0deb956da9e 100644 --- a/sw/source/uibase/inc/swuicnttab.hxx +++ b/sw/source/uibase/inc/swuicnttab.hxx @@ -184,7 +184,7 @@ class SwTOXSelectTabPage : public SfxTabPage //all std::unique_ptr m_xSortFrame; - std::unique_ptr m_xLanguageLB; + std::unique_ptr m_xLanguageLB; std::unique_ptr m_xSortAlgorithmLB; DECL_LINK(TOXTypeHdl, weld::ComboBox&, void ); -- cgit v1.2.3