diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-10-22 10:36:14 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-10-22 12:05:19 +0200 |
| commit | 426be29029ffec9a721f83d65d0d320455ff9503 (patch) | |
| tree | 77f7710c6963b588bf7eff650158e08d419dd0d4 /extensions | |
| parent | de0581c77228eb00ff84a3996bfd252d6928a056 (diff) | |
return weld::Builder by unique_ptr
Change-Id: Ifa4f5951d200eaad6c8aebd3f29eed053c927ff0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124051
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'extensions')
| -rw-r--r-- | extensions/source/propctrlr/handlerhelper.cxx | 2 | ||||
| -rw-r--r-- | extensions/source/propctrlr/propcontroller.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/extensions/source/propctrlr/handlerhelper.cxx b/extensions/source/propctrlr/handlerhelper.cxx index 5897840b7e4e..1f274def355f 100644 --- a/extensions/source/propctrlr/handlerhelper.cxx +++ b/extensions/source/propctrlr/handlerhelper.cxx @@ -292,7 +292,7 @@ namespace pcr { Reference<XWindow> xWindow(rContext->getValueByName("BuilderParent"), UNO_QUERY_THROW); weld::TransportAsXWindow& rTunnel = dynamic_cast<weld::TransportAsXWindow&>(*xWindow); - return std::unique_ptr<weld::Builder>(Application::CreateBuilder(rTunnel.getWidget(), rUIFile)); + return Application::CreateBuilder(rTunnel.getWidget(), rUIFile); } void PropertyHandlerHelper::setBuilderParent(const css::uno::Reference<css::uno::XComponentContext>& rContext, weld::Widget* pParent) diff --git a/extensions/source/propctrlr/propcontroller.cxx b/extensions/source/propctrlr/propcontroller.cxx index 6f73dd80a437..4fd878441f90 100644 --- a/extensions/source/propctrlr/propcontroller.cxx +++ b/extensions/source/propctrlr/propcontroller.cxx @@ -340,14 +340,14 @@ namespace pcr if (weld::TransportAsXWindow* pTunnel = dynamic_cast<weld::TransportAsXWindow*>(xContainerWindow.get())) { - xBuilder.reset(Application::CreateBuilder(pTunnel->getWidget(), sUIFile)); + xBuilder = Application::CreateBuilder(pTunnel->getWidget(), sUIFile); } else { VclPtr<vcl::Window> pParentWin = VCLUnoHelper::GetWindow(xContainerWindow); if (!pParentWin) throw RuntimeException("The frame is invalid. Unable to extract the container window.",*this); - xBuilder.reset(Application::CreateInterimBuilder(pParentWin, sUIFile, true)); + xBuilder = Application::CreateInterimBuilder(pParentWin, sUIFile, true); } Construct(xContainerWindow, std::move(xBuilder)); |