From efa883f0585b0824091c1383ab318c671f83cd28 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Fri, 7 Feb 2020 12:12:58 +0000 Subject: rename URLBox back to SvtURLBox MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Icd90eeb492002c45ddd8ff562a6da411abead122 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88185 Tested-by: Jenkins Reviewed-by: Caolán McNamara --- svx/source/dialog/imapdlg.cxx | 2 +- svx/source/form/databaselocationinput.cxx | 8 ++++---- svx/source/form/datanavi.cxx | 2 +- svx/source/inc/datanavi.hxx | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) (limited to 'svx') diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index d7a5e130cfe1..e015b3716351 100644 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -106,7 +106,7 @@ SvxIMapDlg::SvxIMapDlg(SfxBindings *_pBindings, SfxChildWindow *pCW, weld::Windo , m_xIMapWnd(new IMapWindow(_pBindings->GetActiveFrame(), m_xDialog.get())) , m_xTbxIMapDlg1(m_xBuilder->weld_toolbar("toolbar")) , m_xFtURL(m_xBuilder->weld_label("urlft")) - , m_xURLBox(new URLBox(m_xBuilder->weld_combo_box("url"))) + , m_xURLBox(new SvtURLBox(m_xBuilder->weld_combo_box("url"))) , m_xFtText(m_xBuilder->weld_label("textft")) , m_xEdtText(m_xBuilder->weld_entry("text")) , m_xFtTarget(m_xBuilder->weld_label("targetft")) diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx index 4688d1cab7af..3e28e2154d40 100644 --- a/svx/source/form/databaselocationinput.cxx +++ b/svx/source/form/databaselocationinput.cxx @@ -54,7 +54,7 @@ namespace svx public: DatabaseLocationInputController_Impl( const Reference& _rContext, - URLBox& _rLocationInput, + SvtURLBox& _rLocationInput, weld::Button& _rBrowseButton, weld::Window& _rDialog ); @@ -72,7 +72,7 @@ namespace svx private: const Reference m_xContext; - URLBox& m_rLocationInput; + SvtURLBox& m_rLocationInput; weld::Window& m_rDialog; Sequence< OUString > m_aFilterExtensions; OUString m_sFilterUIName; @@ -80,7 +80,7 @@ namespace svx }; DatabaseLocationInputController_Impl::DatabaseLocationInputController_Impl(const Reference& _rContext, - URLBox& _rLocationInput, weld::Button& _rBrowseButton, weld::Window& _rDialog) + SvtURLBox& _rLocationInput, weld::Button& _rBrowseButton, weld::Window& _rDialog) :m_xContext( _rContext ) ,m_rLocationInput( _rLocationInput ) ,m_rDialog( _rDialog ) @@ -221,7 +221,7 @@ namespace svx } DatabaseLocationInputController::DatabaseLocationInputController( const Reference& _rContext, - URLBox& _rLocationInput, weld::Button& _rBrowseButton, weld::Window& _rDialog ) + SvtURLBox& _rLocationInput, weld::Button& _rBrowseButton, weld::Window& _rDialog ) :m_pImpl( new DatabaseLocationInputController_Impl( _rContext, _rLocationInput, _rBrowseButton, _rDialog ) ) { } diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 657d22ab289c..92cfa4e26707 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -3191,7 +3191,7 @@ namespace svxform : GenericDialogController(pParent, "svx/ui/addinstancedialog.ui", "AddInstanceDialog") , m_xNameED(m_xBuilder->weld_entry("name")) , m_xURLFT(m_xBuilder->weld_label("urlft")) - , m_xURLED(new URLBox(m_xBuilder->weld_combo_box("url"))) + , m_xURLED(new SvtURLBox(m_xBuilder->weld_combo_box("url"))) , m_xFilePickerBtn(m_xBuilder->weld_button("browse")) , m_xLinkInstanceCB(m_xBuilder->weld_check_button("link")) , m_xAltTitle(m_xBuilder->weld_label("alttitle")) diff --git a/svx/source/inc/datanavi.hxx b/svx/source/inc/datanavi.hxx index 78bc126fea86..a948c5e9190b 100644 --- a/svx/source/inc/datanavi.hxx +++ b/svx/source/inc/datanavi.hxx @@ -584,7 +584,7 @@ namespace svxform std::unique_ptr m_xNameED; std::unique_ptr m_xURLFT; - std::unique_ptr m_xURLED; + std::unique_ptr m_xURLED; std::unique_ptr m_xFilePickerBtn; std::unique_ptr m_xLinkInstanceCB; std::unique_ptr m_xAltTitle; -- cgit