diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2020-02-07 12:12:58 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2020-02-07 16:03:10 +0100 |
| commit | efa883f0585b0824091c1383ab318c671f83cd28 (patch) | |
| tree | 32cb13362b0ed8b700823351ca4d8459d9779c01 /fpicker | |
| parent | 36deee8c8d86ff45602ea3119a6628cc5bceed7a (diff) | |
rename URLBox back to SvtURLBox
Change-Id: Icd90eeb492002c45ddd8ff562a6da411abead122
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88185
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'fpicker')
| -rw-r--r-- | fpicker/source/office/iodlg.cxx | 6 | ||||
| -rw-r--r-- | fpicker/source/office/iodlg.hxx | 2 | ||||
| -rw-r--r-- | fpicker/source/office/iodlgimp.hxx | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index 60dd893b34ae..e8f50f6d15d4 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -292,10 +292,10 @@ SvtFileDialog::SvtFileDialog(weld::Window* pParent, PickerFlags nStyle) { m_xImpl->m_xCbOptions = m_xBuilder->weld_check_button("options"); m_xImpl->m_xFtFileName = m_xBuilder->weld_label("file_name_label"); - m_xImpl->m_xEdFileName.reset(new URLBox(m_xBuilder->weld_combo_box("file_name"))); + m_xImpl->m_xEdFileName.reset(new SvtURLBox(m_xBuilder->weld_combo_box("file_name"))); m_xImpl->m_xFtFileType = m_xBuilder->weld_label("file_type_label"); m_xImpl->m_xLbFilter = m_xBuilder->weld_combo_box("file_type"); - m_xImpl->m_xEdCurrentPath.reset(new URLBox(m_xBuilder->weld_combo_box("current_path"))); + m_xImpl->m_xEdCurrentPath.reset(new SvtURLBox(m_xBuilder->weld_combo_box("current_path"))); m_xImpl->m_xBtnFileOpen = m_xBuilder->weld_button("open"); m_xImpl->m_xBtnCancel = m_xBuilder->weld_button("cancel"); m_xImpl->m_xBtnHelp = m_xBuilder->weld_button("help"); @@ -713,7 +713,7 @@ void SvtFileDialog::OpenHdl_Impl(void const * pVoid) INetURLObject aFileObject( aFileName ); if ( ( aFileObject.GetProtocol() == INetProtocol::NotValid ) && !aFileName.isEmpty() ) { - OUString sCompleted = URLBox::ParseSmart( aFileName, m_xFileView->GetViewURL() ); + OUString sCompleted = SvtURLBox::ParseSmart( aFileName, m_xFileView->GetViewURL() ); if ( !sCompleted.isEmpty() ) aFileName = sCompleted; } diff --git a/fpicker/source/office/iodlg.hxx b/fpicker/source/office/iodlg.hxx index 2dc3df9ec9e5..fbca0a7711af 100644 --- a/fpicker/source/office/iodlg.hxx +++ b/fpicker/source/office/iodlg.hxx @@ -38,7 +38,7 @@ class SvtFileView; class SvtFileDialogFilter_Impl; class SvtExpFileDlg_Impl; -class URLBox; +class SvtURLBox; enum class AdjustFilterFlags { NONE = 0x0000, diff --git a/fpicker/source/office/iodlgimp.hxx b/fpicker/source/office/iodlgimp.hxx index 27e2731fd29a..2b200f466a7b 100644 --- a/fpicker/source/office/iodlgimp.hxx +++ b/fpicker/source/office/iodlgimp.hxx @@ -100,7 +100,7 @@ private: DECL_LINK(ClickHdl, const OString&, void); }; -class URLBox; +class SvtURLBox; class SvtExpFileDlg_Impl { private: @@ -114,7 +114,7 @@ public: std::unique_ptr<SvtFileDialogFilter_Impl> m_xUserFilter; std::unique_ptr<weld::Label> m_xFtFileName; - std::unique_ptr<URLBox> m_xEdFileName; + std::unique_ptr<SvtURLBox> m_xEdFileName; std::unique_ptr<weld::Label> m_xFtFileVersion; std::unique_ptr<weld::ComboBox> m_xLbFileVersion; @@ -137,7 +137,7 @@ public: std::unique_ptr<weld::Button> m_xBtnNewFolder; std::unique_ptr<weld::CheckButton> m_xCbPassword; std::unique_ptr<weld::CheckButton> m_xCbGPGEncrypt; - std::unique_ptr<URLBox> m_xEdCurrentPath; + std::unique_ptr<SvtURLBox> m_xEdCurrentPath; std::unique_ptr<weld::CheckButton> m_xCbAutoExtension; std::unique_ptr<weld::CheckButton> m_xCbOptions; |