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 /extensions | |
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 'extensions')
-rw-r--r-- | extensions/source/abpilot/abpfinalpage.cxx | 2 | ||||
-rw-r--r-- | extensions/source/abpilot/abpfinalpage.hxx | 2 | ||||
-rw-r--r-- | extensions/source/propctrlr/formcomponenthandler.cxx | 2 | ||||
-rw-r--r-- | extensions/source/propctrlr/usercontrol.cxx | 2 | ||||
-rw-r--r-- | extensions/source/propctrlr/usercontrol.hxx | 4 |
5 files changed, 6 insertions, 6 deletions
diff --git a/extensions/source/abpilot/abpfinalpage.cxx b/extensions/source/abpilot/abpfinalpage.cxx index 685592f8c739..388568c12651 100644 --- a/extensions/source/abpilot/abpfinalpage.cxx +++ b/extensions/source/abpilot/abpfinalpage.cxx @@ -45,7 +45,7 @@ namespace abp FinalPage::FinalPage(weld::Container* pPage, OAddressBookSourcePilot* pWizard) : AddressBookSourcePage(pPage, pWizard, "modules/sabpilot/ui/datasourcepage.ui", "DataSourcePage") - , m_xLocation(new URLBox(m_xBuilder->weld_combo_box("location"))) + , m_xLocation(new SvtURLBox(m_xBuilder->weld_combo_box("location"))) , m_xBrowse(m_xBuilder->weld_button("browse")) , m_xRegisterName(m_xBuilder->weld_check_button("available")) , m_xEmbed(m_xBuilder->weld_check_button("embed")) diff --git a/extensions/source/abpilot/abpfinalpage.hxx b/extensions/source/abpilot/abpfinalpage.hxx index c4cc6bccf6c0..d82143c15091 100644 --- a/extensions/source/abpilot/abpfinalpage.hxx +++ b/extensions/source/abpilot/abpfinalpage.hxx @@ -31,7 +31,7 @@ namespace abp class FinalPage final : public AddressBookSourcePage { - std::unique_ptr<URLBox> m_xLocation; + std::unique_ptr<SvtURLBox> m_xLocation; std::unique_ptr<weld::Button> m_xBrowse; std::unique_ptr<weld::CheckButton> m_xRegisterName; std::unique_ptr<weld::CheckButton> m_xEmbed; diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index 9b66c241c6af..291f50203930 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -998,7 +998,7 @@ namespace pcr case PROPERTY_ID_IMAGE_URL: { std::unique_ptr<weld::Builder> xBuilder(PropertyHandlerHelper::makeBuilder("modules/spropctrlr/ui/urlcontrol.ui", m_xContext)); - auto pControl = new OFileUrlControl(std::make_unique<URLBox>(xBuilder->weld_combo_box("urlcontrol")), std::move(xBuilder), false); + auto pControl = new OFileUrlControl(std::make_unique<SvtURLBox>(xBuilder->weld_combo_box("urlcontrol")), std::move(xBuilder), false); pControl->SetModifyHandler(); aDescriptor.Control = pControl; diff --git a/extensions/source/propctrlr/usercontrol.cxx b/extensions/source/propctrlr/usercontrol.cxx index 60378dafd0df..b2d2a5384310 100644 --- a/extensions/source/propctrlr/usercontrol.cxx +++ b/extensions/source/propctrlr/usercontrol.cxx @@ -220,7 +220,7 @@ namespace pcr } //= OFileUrlControl - OFileUrlControl::OFileUrlControl(std::unique_ptr<URLBox> xWidget, std::unique_ptr<weld::Builder> xBuilder, bool bReadOnly) + OFileUrlControl::OFileUrlControl(std::unique_ptr<SvtURLBox> xWidget, std::unique_ptr<weld::Builder> xBuilder, bool bReadOnly) : OFileUrlControl_Base(PropertyControlType::Unknown, std::move(xBuilder), std::move(xWidget), bReadOnly) { getTypedControlWindow()->DisableHistory(); diff --git a/extensions/source/propctrlr/usercontrol.hxx b/extensions/source/propctrlr/usercontrol.hxx index 3283a6f56f96..b95f9b663be0 100644 --- a/extensions/source/propctrlr/usercontrol.hxx +++ b/extensions/source/propctrlr/usercontrol.hxx @@ -115,11 +115,11 @@ namespace pcr }; //= OFileUrlControl - typedef CommonBehaviourControl<css::inspection::XPropertyControl, URLBox> OFileUrlControl_Base; + typedef CommonBehaviourControl<css::inspection::XPropertyControl, SvtURLBox> OFileUrlControl_Base; class OFileUrlControl : public OFileUrlControl_Base { public: - OFileUrlControl(std::unique_ptr<URLBox> xWidget, std::unique_ptr<weld::Builder> xBuilder, bool bReadOnly); + OFileUrlControl(std::unique_ptr<SvtURLBox> xWidget, std::unique_ptr<weld::Builder> xBuilder, bool bReadOnly); // XPropertyControl virtual css::uno::Any SAL_CALL getValue() override; |