diff options
author | Caolán McNamara <caolanm@redhat.com> | 2019-10-17 13:56:16 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2019-10-17 20:15:40 +0200 |
commit | 77c9c2c993da3bc9302131cef4345db114696333 (patch) | |
tree | f93165e487a9cc07d0f3ca6c26d0ddbe95b7a311 /sc | |
parent | 10ade7465ba2b60fbda93ae3436ece01b3366a72 (diff) |
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>
Diffstat (limited to 'sc')
-rw-r--r-- | sc/source/ui/dbgui/scuiasciiopt.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/dbgui/textimportoptions.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/dbgui/tpsort.cxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/scuiasciiopt.hxx | 2 | ||||
-rw-r--r-- | sc/source/ui/inc/textimportoptions.hxx | 4 | ||||
-rw-r--r-- | sc/source/ui/inc/tpsort.hxx | 2 |
6 files changed, 7 insertions, 7 deletions
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<weld::Label> mxFtCharSet; std::unique_ptr<SvxTextEncodingBox> mxLbCharSet; std::unique_ptr<weld::Label> mxFtCustomLang; - std::unique_ptr<LanguageBox> mxLbCustomLang; + std::unique_ptr<SvxLanguageBox> mxLbCustomLang; std::unique_ptr<weld::Label> mxFtRow; std::unique_ptr<weld::SpinButton> 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 <vcl/weld.hxx> #include <i18nlangtag/lang.h> -class LanguageBox; +class SvxLanguageBox; class ScTextImportOptionsDlg : public weld::GenericDialogController { @@ -42,7 +42,7 @@ private: std::unique_ptr<weld::RadioButton> m_xRbAutomatic; std::unique_ptr<weld::RadioButton> m_xRbCustom; std::unique_ptr<weld::CheckButton> m_xBtnConvertDate; - std::unique_ptr<LanguageBox> m_xLbCustomLang; + std::unique_ptr<SvxLanguageBox> 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<weld::Entry> m_xEdOutPos; std::unique_ptr<weld::CheckButton> m_xBtnSortUser; std::unique_ptr<weld::ComboBox> m_xLbSortUser; - std::unique_ptr<LanguageBox> m_xLbLanguage; + std::unique_ptr<SvxLanguageBox> m_xLbLanguage; std::unique_ptr<weld::Label> m_xFtAlgorithm; std::unique_ptr<weld::ComboBox> m_xLbAlgorithm; std::unique_ptr<weld::RadioButton> m_xBtnTopDown; |