Kaydet (Commit) c666ea47 authored tarafından Noel Grandin's avatar Noel Grandin

use more std::unique_ptr in ScCheckListMenuWindow

Change-Id: Ia63d663204af570fb0e7faa46e4925c2787fc59b
Reviewed-on: https://gerrit.libreoffice.org/61433
Tested-by: Jenkins
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 3250c27b
......@@ -2008,9 +2008,9 @@ void ScCheckListMenuWindow::close(bool bOK)
EndPopupMode();
}
void ScCheckListMenuWindow::setExtendedData(ExtendedData* p)
void ScCheckListMenuWindow::setExtendedData(std::unique_ptr<ExtendedData> p)
{
mpExtendedData.reset(p);
mpExtendedData = std::move(p);
}
ScCheckListMenuWindow::ExtendedData* ScCheckListMenuWindow::getExtendedData()
......
......@@ -355,7 +355,7 @@ public:
* popup window class manages its life time; no explicit deletion of the
* instance is needed in the client code.
*/
void setExtendedData(ExtendedData* p);
void setExtendedData(std::unique_ptr<ExtendedData> p);
/**
* Get the store auxiliary data, or NULL if no such data is stored.
......
......@@ -662,7 +662,7 @@ void ScGridWindow::LaunchAutoFilterMenu(SCCOL nCol, SCROW nRow)
return;
pData->mpData = pDBData;
mpAutoFilterPopup->setExtendedData(pData.release());
mpAutoFilterPopup->setExtendedData(std::move(pData));
ScQueryParam aParam;
pDBData->GetQueryParam(aParam);
......
......@@ -470,7 +470,7 @@ void ScGridWindow::DPLaunchFieldPopupMenu(const Point& rScrPos, const Size& rScr
mpDPFieldPopup.disposeAndClear();
mpDPFieldPopup.reset(VclPtr<ScCheckListMenuWindow>::Create(this, pViewData->GetDocument()));
mpDPFieldPopup->setName("DataPilot field member popup");
mpDPFieldPopup->setExtendedData(pDPData.release());
mpDPFieldPopup->setExtendedData(std::move(pDPData));
mpDPFieldPopup->setOKAction(new DPFieldPopupOKAction(this));
{
// Populate field members.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment