diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-03-27 10:58:14 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-03-27 13:38:51 +0100 |
| commit | 9852f09b467e3c7f8058b931010b91f447905051 (patch) | |
| tree | 1b4bf4de0ecbffc7c65f1ad5df2d75bee1c736d0 /svx | |
| parent | 16676ea2e86b1b50ba653b736c5db4eb9f32acf9 (diff) | |
return unique_ptr from FmXFormShell::GetConversionMenu_Lock
Change-Id: I8b262c18862429f8b6822742fb8fa454af1090a6
Reviewed-on: https://gerrit.libreoffice.org/69802
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/form/fmshimp.cxx | 4 | ||||
| -rw-r--r-- | svx/source/form/navigatortree.cxx | 2 | ||||
| -rw-r--r-- | svx/source/inc/fmshimp.hxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 11250b4b7827..171621ce0310 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -1030,9 +1030,9 @@ void FmXFormShell::ForceUpdateSelection_Lock() } } -VclBuilder* FmXFormShell::GetConversionMenu_Lock() +std::unique_ptr<VclBuilder> FmXFormShell::GetConversionMenu_Lock() { - VclBuilder* pBuilder = new VclBuilder(nullptr, VclBuilderContainer::getUIRootDir(), "svx/ui/convertmenu.ui", ""); + std::unique_ptr<VclBuilder> pBuilder(new VclBuilder(nullptr, VclBuilderContainer::getUIRootDir(), "svx/ui/convertmenu.ui", "")); VclPtr<PopupMenu> pNewMenu(pBuilder->get_menu("menu")); for (size_t i = 0; i < SAL_N_ELEMENTS(aConvertSlots); ++i) { diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index c73bb9b01e10..bbe61c0e4e3c 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -410,7 +410,7 @@ namespace svxform const sal_Int16 nChangeId = aContextMenu->GetItemId("change"); if (!m_bRootSelected && !m_nFormsSelected && (m_nControlsSelected == 1)) { - xBuilder.reset(FmXFormShell::GetConversionMenu_Lock()); + xBuilder = FmXFormShell::GetConversionMenu_Lock(); xConversionMenu = xBuilder->get_menu("menu"); aContextMenu->SetPopupMenu(nChangeId, xConversionMenu); #if OSL_DEBUG_LEVEL > 0 diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index beedf5973d3a..7a9c452f866b 100644 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -411,7 +411,7 @@ public: SAL_DLLPRIVATE void stopFiltering_Lock(bool bSave); // a menu that contains all ControlConversion entries - SAL_DLLPRIVATE static VclBuilder* GetConversionMenu_Lock(); + SAL_DLLPRIVATE static std::unique_ptr<VclBuilder> GetConversionMenu_Lock(); /// checks whether a given control conversion slot can be applied to the current selection SAL_DLLPRIVATE bool canConvertCurrentSelectionToControl_Lock(const OString& rIdent); |