sw/source/filter/basflt/fltshell.cxx | 6 +-
sw/source/filter/inc/fltshell.hxx | 2
sw/source/filter/ww8/writerhelper.cxx | 2
sw/source/ui/dialog/swdlgfact.cxx | 46 ++++++++++----------
sw/source/ui/dialog/swdlgfact.hxx | 76 +++++++++++++++++-----------------
5 files changed, 67 insertions(+), 65 deletions(-)
New commits:
commit dc510c2e5742beb54cafe53daff3846c0d3a5018
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Aug 23 09:58:38 2018 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Aug 23 10:56:06 2018 +0200
loplugin:useuniqueptr in sw dialogs
Change-Id: Ief2cd941b95c640b70fd7024d9f27f5c0bd36da9
Reviewed-on: https://gerrit.libreoffice.org/59487
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sw/source/ui/dialog/swdlgfact.cxx
b/sw/source/ui/dialog/swdlgfact.cxx
index ae69d4b54f04..f6faaabc74a8 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -727,7 +727,7 @@ VclPtr<SfxAbstractDialog>
SwAbstractDialogFactory_Impl::CreateNumFormatDialog( v
VclPtr<AbstractSwAsciiFilterDlg>
SwAbstractDialogFactory_Impl::CreateSwAsciiFilterDlg(weld::Window* pParent,
SwDocShell& rDocSh, SvStream* pStream)
{
- return VclPtr<AbstractSwAsciiFilterDlg_Impl>::Create(new
SwAsciiFilterDlg(pParent, rDocSh, pStream));
+ return
VclPtr<AbstractSwAsciiFilterDlg_Impl>::Create(o3tl::make_unique<SwAsciiFilterDlg>(pParent,
rDocSh, pStream));
}
VclPtr<VclAbstractDialog>
SwAbstractDialogFactory_Impl::CreateSwInsertBookmarkDlg( vcl::Window *pParent,
@@ -740,7 +740,7 @@ VclPtr<VclAbstractDialog>
SwAbstractDialogFactory_Impl::CreateSwInsertBookmarkDl
VclPtr<AbstractSwBreakDlg>
SwAbstractDialogFactory_Impl::CreateSwBreakDlg(weld::Window* pParent,
SwWrtShell &rSh)
{
- return VclPtr<AbstractSwBreakDlg_Impl>::Create(new SwBreakDlg(pParent,
rSh));
+ return
VclPtr<AbstractSwBreakDlg_Impl>::Create(o3tl::make_unique<SwBreakDlg>(pParent,
rSh));
}
VclPtr<VclAbstractDialog>
SwAbstractDialogFactory_Impl::CreateSwChangeDBDlg(SwView& rVw)
@@ -758,7 +758,7 @@ VclPtr<SfxAbstractTabDialog>
SwAbstractDialogFactory_Impl::CreateSwCharDlg(vcl:
VclPtr<AbstractSwConvertTableDlg>
SwAbstractDialogFactory_Impl::CreateSwConvertTableDlg(SwView& rView, bool
bToTable)
{
- return VclPtr<AbstractSwConvertTableDlg_Impl>::Create(new
SwConvertTableDlg(rView, bToTable));
+ return
VclPtr<AbstractSwConvertTableDlg_Impl>::Create(o3tl::make_unique<SwConvertTableDlg>(rView,
bToTable));
}
VclPtr<VclAbstractDialog> SwAbstractDialogFactory_Impl::CreateSwCaptionDialog
( vcl::Window *pParent, SwView &rV)
@@ -778,26 +778,26 @@ VclPtr<AbstractSwInsertDBColAutoPilot>
SwAbstractDialogFactory_Impl::CreateSwIns
VclPtr<SfxAbstractTabDialog>
SwAbstractDialogFactory_Impl::CreateSwFootNoteOptionDlg(weld::Window *pParent,
SwWrtShell &rSh)
{
- return VclPtr<AbstractTabController_Impl>::Create(new
SwFootNoteOptionDlg(pParent, rSh));
+ return
VclPtr<AbstractTabController_Impl>::Create(o3tl::make_unique<SwFootNoteOptionDlg>(pParent,
rSh));
}
VclPtr<AbstractDropDownFieldDialog>
SwAbstractDialogFactory_Impl::CreateDropDownFieldDialog(weld::Window *pParent,
SwWrtShell &rSh, SwField* pField, bool bPrevButton, bool bNextButton)
{
- return VclPtr<AbstractDropDownFieldDialog_Impl>::Create(new
sw::DropDownFieldDialog(pParent, rSh, pField, bPrevButton, bNextButton));
+ return
VclPtr<AbstractDropDownFieldDialog_Impl>::Create(o3tl::make_unique<sw::DropDownFieldDialog>(pParent,
rSh, pField, bPrevButton, bNextButton));
}
VclPtr<SfxAbstractTabDialog>
SwAbstractDialogFactory_Impl::CreateSwEnvDlg(weld::Window* pParent, const
SfxItemSet& rSet,
SwWrtShell*
pWrtSh, Printer* pPrt,
bool bInsert)
{
- return VclPtr<AbstractTabController_Impl>::Create(new SwEnvDlg(pParent,
rSet, pWrtSh,pPrt, bInsert));
+ return
VclPtr<AbstractTabController_Impl>::Create(o3tl::make_unique<SwEnvDlg>(pParent,
rSet, pWrtSh,pPrt, bInsert));
}
VclPtr<AbstractSwLabDlg>
SwAbstractDialogFactory_Impl::CreateSwLabDlg(weld::Window* pParent, const
SfxItemSet& rSet,
SwDBManager* pDBManager,
bool bLabel)
{
- return VclPtr<AbstractSwLabDlg_Impl>::Create(new SwLabDlg(pParent, rSet,
pDBManager, bLabel));
+ return
VclPtr<AbstractSwLabDlg_Impl>::Create(o3tl::make_unique<SwLabDlg>(pParent,
rSet, pDBManager, bLabel));
}
SwLabDlgMethod SwAbstractDialogFactory_Impl::GetSwLabDlgStaticMethod ()
@@ -828,17 +828,17 @@ VclPtr<VclAbstractDialog>
SwAbstractDialogFactory_Impl::CreateSwColumnDialog(vcl
VclPtr<VclAbstractDialog>
SwAbstractDialogFactory_Impl::CreateSwTableHeightDialog(weld::Window *pParent,
SwWrtShell &rSh)
{
- return VclPtr<AbstractSwTableHeightDlg_Impl>::Create(new
SwTableHeightDlg(pParent, rSh));
+ return
VclPtr<AbstractSwTableHeightDlg_Impl>::Create(o3tl::make_unique<SwTableHeightDlg>(pParent,
rSh));
}
VclPtr<VclAbstractDialog>
SwAbstractDialogFactory_Impl::CreateSwSortingDialog(weld::Window *pParent,
SwWrtShell &rSh)
{
- return VclPtr<AbstractSwSortDlg_Impl>::Create(new SwSortDlg(pParent, rSh));
+ return
VclPtr<AbstractSwSortDlg_Impl>::Create(o3tl::make_unique<SwSortDlg>(pParent,
rSh));
}
VclPtr<AbstractSplitTableDialog>
SwAbstractDialogFactory_Impl::CreateSplitTableDialog(weld::Window *pParent,
SwWrtShell &rSh)
{
- return VclPtr<AbstractSplitTableDialog_Impl>::Create(new
SwSplitTableDlg(pParent, rSh));
+ return
VclPtr<AbstractSplitTableDialog_Impl>::Create(o3tl::make_unique<SwSplitTableDlg>(pParent,
rSh));
}
VclPtr<AbstractSwSelGlossaryDlg>
SwAbstractDialogFactory_Impl::CreateSwSelGlossaryDlg(const OUString &rShortName)
@@ -850,7 +850,9 @@ VclPtr<AbstractSwSelGlossaryDlg>
SwAbstractDialogFactory_Impl::CreateSwSelGlossa
VclPtr<AbstractSwAutoFormatDlg>
SwAbstractDialogFactory_Impl::CreateSwAutoFormatDlg(weld::Window* pParent,
SwWrtShell* pShell, bool bSetAutoFormat, const SwTableAutoFormat*
pSelFormat)
{
- return VclPtr<AbstractSwAutoFormatDlg_Impl>::Create(new
SwAutoFormatDlg(pParent, pShell, bSetAutoFormat, pSelFormat));
+ return VclPtr<AbstractSwAutoFormatDlg_Impl>::Create(
+ std::unique_ptr<SwAutoFormatDlg,
o3tl::default_delete<SwAutoFormatDlg>>(
+ new SwAutoFormatDlg(pParent, pShell, bSetAutoFormat,
pSelFormat)));
}
VclPtr<SfxAbstractDialog>
SwAbstractDialogFactory_Impl::CreateSwBorderDlg(vcl::Window* pParent,
SfxItemSet& rSet, SwBorderModes nType )
@@ -867,7 +869,7 @@ VclPtr<SfxAbstractDialog>
SwAbstractDialogFactory_Impl::CreateSwWrapDlg ( vcl::W
VclPtr<VclAbstractDialog>
SwAbstractDialogFactory_Impl::CreateSwTableWidthDlg(weld::Window *pParent,
SwTableFUNC &rFnc)
{
- return VclPtr<AbstractSwTableWidthDlg_Impl>::Create(new
SwTableWidthDlg(pParent, rFnc));
+ return
VclPtr<AbstractSwTableWidthDlg_Impl>::Create(o3tl::make_unique<SwTableWidthDlg>(pParent,
rFnc));
}
VclPtr<SfxAbstractTabDialog>
SwAbstractDialogFactory_Impl::CreateSwTableTabDlg(vcl::Window* pParent,
@@ -893,7 +895,7 @@ VclPtr<AbstractSwRenameXNamedDlg>
SwAbstractDialogFactory_Impl::CreateSwRenameXN
css::uno::Reference< css::container::XNamed > & xNamed,
css::uno::Reference< css::container::XNameAccess > & xNameAccess)
{
- return VclPtr<AbstractSwRenameXNamedDlg_Impl>::Create(new
SwRenameXNamedDlg(pParent,xNamed, xNameAccess));
+ return
VclPtr<AbstractSwRenameXNamedDlg_Impl>::Create(o3tl::make_unique<SwRenameXNamedDlg>(pParent,xNamed,
xNameAccess));
}
VclPtr<AbstractSwModalRedlineAcceptDlg>
SwAbstractDialogFactory_Impl::CreateSwModalRedlineAcceptDlg(vcl::Window
*pParent)
@@ -904,7 +906,7 @@ VclPtr<AbstractSwModalRedlineAcceptDlg>
SwAbstractDialogFactory_Impl::CreateSwMo
VclPtr<VclAbstractDialog>
SwAbstractDialogFactory_Impl::CreateTableMergeDialog(weld::Window* pParent,
bool& rWithPrev)
{
- return VclPtr<AbstractSwMergeTableDlg_Impl>::Create(new
SwMergeTableDlg(pParent, rWithPrev));
+ return
VclPtr<AbstractSwMergeTableDlg_Impl>::Create(o3tl::make_unique<SwMergeTableDlg>(pParent,
rWithPrev));
}
VclPtr<SfxAbstractTabDialog>
SwAbstractDialogFactory_Impl::CreateFrameTabDialog(const OUString &rDialogType,
@@ -940,34 +942,34 @@ VclPtr<AbstractGlossaryDlg>
SwAbstractDialogFactory_Impl::CreateGlossaryDlg(SfxV
VclPtr<AbstractFieldInputDlg>
SwAbstractDialogFactory_Impl::CreateFieldInputDlg(weld::Window *pParent,
SwWrtShell &rSh, SwField* pField, bool bPrevButton, bool bNextButton)
{
- return VclPtr<AbstractFieldInputDlg_Impl>::Create(new
SwFieldInputDlg(pParent, rSh, pField, bPrevButton, bNextButton));
+ return
VclPtr<AbstractFieldInputDlg_Impl>::Create(o3tl::make_unique<SwFieldInputDlg>(pParent,
rSh, pField, bPrevButton, bNextButton));
}
VclPtr<AbstractInsFootNoteDlg>
SwAbstractDialogFactory_Impl::CreateInsFootNoteDlg(
weld::Window * pParent, SwWrtShell &rSh, bool bEd )
{
- return VclPtr<AbstractInsFootNoteDlg_Impl>::Create(new
SwInsFootNoteDlg(pParent, rSh, bEd));
+ return
VclPtr<AbstractInsFootNoteDlg_Impl>::Create(o3tl::make_unique<SwInsFootNoteDlg>(pParent,
rSh, bEd));
}
VclPtr<VclAbstractDialog>
SwAbstractDialogFactory_Impl::CreateTitlePageDlg(weld::Window *pParent)
{
- return VclPtr<AbstractGenericDialog_Impl>::Create(new
SwTitlePageDlg(pParent));
+ return
VclPtr<AbstractGenericDialog_Impl>::Create(o3tl::make_unique<SwTitlePageDlg>(pParent));
}
VclPtr<VclAbstractDialog>
SwAbstractDialogFactory_Impl::CreateVclSwViewDialog(SwView& rView)
{
- return VclPtr<AbstractGenericDialog_Impl>::Create(new
SwLineNumberingDlg(rView));
+ return
VclPtr<AbstractGenericDialog_Impl>::Create(o3tl::make_unique<SwLineNumberingDlg>(rView));
}
VclPtr<AbstractInsTableDlg>
SwAbstractDialogFactory_Impl::CreateInsTableDlg(SwView& rView)
{
- return VclPtr<AbstractInsTableDlg_Impl>::Create(new SwInsTableDlg(rView));
+ return
VclPtr<AbstractInsTableDlg_Impl>::Create(o3tl::make_unique<SwInsTableDlg>(rView));
}
VclPtr<AbstractJavaEditDialog>
SwAbstractDialogFactory_Impl::CreateJavaEditDialog(
weld::Window* pParent, SwWrtShell* pWrtSh)
{
- return VclPtr<AbstractJavaEditDialog_Impl>::Create(new
SwJavaEditDialog(pParent, pWrtSh));
+ return
VclPtr<AbstractJavaEditDialog_Impl>::Create(o3tl::make_unique<SwJavaEditDialog>(pParent,
pWrtSh));
}
VclPtr<AbstractMailMergeDlg> SwAbstractDialogFactory_Impl::CreateMailMergeDlg(
@@ -995,7 +997,7 @@ VclPtr<AbstractMailMergeFieldConnectionsDlg>
SwAbstractDialogFactory_Impl::Creat
VclPtr<VclAbstractDialog>
SwAbstractDialogFactory_Impl::CreateMultiTOXMarkDlg(weld::Window* pParent,
SwTOXMgr &rTOXMgr)
{
- return VclPtr<AbstractMultiTOXMarkDlg_Impl>::Create(new
SwMultiTOXMarkDlg(pParent, rTOXMgr));
+ return
VclPtr<AbstractMultiTOXMarkDlg_Impl>::Create(o3tl::make_unique<SwMultiTOXMarkDlg>(pParent,
rTOXMgr));
}
VclPtr<SfxAbstractTabDialog>
SwAbstractDialogFactory_Impl::CreateSvxNumBulletTabDialog(vcl::Window* pParent,
@@ -1010,7 +1012,7 @@ VclPtr<SfxAbstractTabDialog>
SwAbstractDialogFactory_Impl::CreateOutlineTabDialo
const SfxItemSet* pSwItemSet,
SwWrtShell & rWrtSh )
{
- return VclPtr<AbstractTabController_Impl>::Create(new
SwOutlineTabDialog(pParent, pSwItemSet, rWrtSh));
+ return
VclPtr<AbstractTabController_Impl>::Create(o3tl::make_unique<SwOutlineTabDialog>(pParent,
pSwItemSet, rWrtSh));
}
VclPtr<AbstractMultiTOXTabDialog>
SwAbstractDialogFactory_Impl::CreateMultiTOXTabDialog(
diff --git a/sw/source/ui/dialog/swdlgfact.hxx
b/sw/source/ui/dialog/swdlgfact.hxx
index a06afd8175b6..0e13836afdd1 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -99,8 +99,8 @@ class AbstractSwAsciiFilterDlg_Impl : public
AbstractSwAsciiFilterDlg
protected:
std::unique_ptr<SwAsciiFilterDlg> m_xDlg;
public:
- explicit AbstractSwAsciiFilterDlg_Impl(SwAsciiFilterDlg* p)
- : m_xDlg(p)
+ explicit AbstractSwAsciiFilterDlg_Impl(std::unique_ptr<SwAsciiFilterDlg> p)
+ : m_xDlg(std::move(p))
{
}
virtual short Execute() override;
@@ -117,8 +117,8 @@ class AbstractGenericDialog_Impl : public VclAbstractDialog
protected:
std::unique_ptr<weld::GenericDialogController> m_xDlg;
public:
- explicit AbstractGenericDialog_Impl(weld::GenericDialogController* p)
- : m_xDlg(p)
+ explicit
AbstractGenericDialog_Impl(std::unique_ptr<weld::GenericDialogController> p)
+ : m_xDlg(std::move(p))
{
}
virtual short Execute() override;
@@ -129,8 +129,8 @@ class AbstractSwSortDlg_Impl : public VclAbstractDialog
protected:
std::unique_ptr<SwSortDlg> m_xDlg;
public:
- explicit AbstractSwSortDlg_Impl(SwSortDlg* p)
- : m_xDlg(p)
+ explicit AbstractSwSortDlg_Impl(std::unique_ptr<SwSortDlg> p)
+ : m_xDlg(std::move(p))
{
}
virtual short Execute() override;
@@ -141,8 +141,8 @@ class AbstractMultiTOXMarkDlg_Impl : public
VclAbstractDialog
protected:
std::unique_ptr<SwMultiTOXMarkDlg> m_xDlg;
public:
- explicit AbstractMultiTOXMarkDlg_Impl(SwMultiTOXMarkDlg* p)
- : m_xDlg(p)
+ explicit AbstractMultiTOXMarkDlg_Impl(std::unique_ptr<SwMultiTOXMarkDlg> p)
+ : m_xDlg(std::move(p))
{
}
virtual short Execute() override;
@@ -153,8 +153,8 @@ class AbstractSwBreakDlg_Impl : public AbstractSwBreakDlg
protected:
std::unique_ptr<SwBreakDlg> m_xDlg;
public:
- explicit AbstractSwBreakDlg_Impl(SwBreakDlg* p)
- : m_xDlg(p)
+ explicit AbstractSwBreakDlg_Impl(std::unique_ptr<SwBreakDlg> p)
+ : m_xDlg(std::move(p))
{
}
virtual short Execute() override;
@@ -168,8 +168,8 @@ class AbstractSwTableWidthDlg_Impl : public
VclAbstractDialog
protected:
std::unique_ptr<SwTableWidthDlg> m_xDlg;
public:
- explicit AbstractSwTableWidthDlg_Impl(SwTableWidthDlg* p)
- : m_xDlg(p)
+ explicit AbstractSwTableWidthDlg_Impl(std::unique_ptr<SwTableWidthDlg> p)
+ : m_xDlg(std::move(p))
{
}
virtual short Execute() override;
@@ -180,8 +180,8 @@ class AbstractSwTableHeightDlg_Impl : public
VclAbstractDialog
protected:
std::unique_ptr<SwTableHeightDlg> m_xDlg;
public:
- explicit AbstractSwTableHeightDlg_Impl(SwTableHeightDlg* p)
- : m_xDlg(p)
+ explicit AbstractSwTableHeightDlg_Impl(std::unique_ptr<SwTableHeightDlg> p)
+ : m_xDlg(std::move(p))
{
}
virtual short Execute() override;
@@ -192,8 +192,8 @@ class AbstractSwMergeTableDlg_Impl : public
VclAbstractDialog
protected:
std::unique_ptr<SwMergeTableDlg> m_xDlg;
public:
- explicit AbstractSwMergeTableDlg_Impl(SwMergeTableDlg* p)
- : m_xDlg(p)
+ explicit AbstractSwMergeTableDlg_Impl(std::unique_ptr<SwMergeTableDlg> p)
+ : m_xDlg(std::move(p))
{
}
virtual short Execute() override;
@@ -204,8 +204,8 @@ class AbstractSplitTableDialog_Impl : public
AbstractSplitTableDialog // add for
protected:
std::unique_ptr<SwSplitTableDlg> m_xDlg;
public:
- explicit AbstractSplitTableDialog_Impl(SwSplitTableDlg* p)
- : m_xDlg(p)
+ explicit AbstractSplitTableDialog_Impl(std::unique_ptr<SwSplitTableDlg> p)
+ : m_xDlg(std::move(p))
{
}
virtual short Execute() override;
@@ -228,8 +228,8 @@ class AbstractTabController_Impl : virtual public
SfxAbstractTabDialog
protected:
std::unique_ptr<SfxTabDialogController> m_xDlg;
public:
- explicit AbstractTabController_Impl(SfxTabDialogController* p)
- : m_xDlg(p)
+ explicit
AbstractTabController_Impl(std::unique_ptr<SfxTabDialogController> p)
+ : m_xDlg(std::move(p))
{
}
virtual short Execute() override;
@@ -259,8 +259,8 @@ class AbstractSwConvertTableDlg_Impl : public
AbstractSwConvertTableDlg
protected:
std::unique_ptr<SwConvertTableDlg> m_xDlg;
public:
- explicit AbstractSwConvertTableDlg_Impl(SwConvertTableDlg* p)
- : m_xDlg(p)
+ explicit AbstractSwConvertTableDlg_Impl(std::unique_ptr<SwConvertTableDlg>
p)
+ : m_xDlg(std::move(p))
{
}
virtual short Execute() override;
@@ -282,8 +282,8 @@ class AbstractDropDownFieldDialog_Impl : public
AbstractDropDownFieldDialog
protected:
std::unique_ptr<sw::DropDownFieldDialog> m_xDlg;
public:
- explicit AbstractDropDownFieldDialog_Impl(sw::DropDownFieldDialog* p)
- : m_xDlg(p)
+ explicit
AbstractDropDownFieldDialog_Impl(std::unique_ptr<sw::DropDownFieldDialog> p)
+ : m_xDlg(std::move(p))
{
}
virtual short Execute() override;
@@ -296,8 +296,8 @@ class AbstractSwLabDlg_Impl : public AbstractSwLabDlg
protected:
std::unique_ptr<SwLabDlg> m_xDlg;
public:
- explicit AbstractSwLabDlg_Impl(SwLabDlg* p)
- : m_xDlg(p)
+ explicit AbstractSwLabDlg_Impl(std::unique_ptr<SwLabDlg> p)
+ : m_xDlg(std::move(p))
{
}
virtual short Execute() override;
@@ -324,8 +324,8 @@ class AbstractSwAutoFormatDlg_Impl : public
AbstractSwAutoFormatDlg
protected:
std::unique_ptr<SwAutoFormatDlg, o3tl::default_delete<SwAutoFormatDlg>>
m_xDlg;
public:
- explicit AbstractSwAutoFormatDlg_Impl(SwAutoFormatDlg* p)
- : m_xDlg(p)
+ explicit AbstractSwAutoFormatDlg_Impl(std::unique_ptr<SwAutoFormatDlg,
o3tl::default_delete<SwAutoFormatDlg>> p)
+ : m_xDlg(std::move(p))
{
}
virtual short Execute() override;
@@ -354,8 +354,8 @@ class AbstractSwRenameXNamedDlg_Impl : public
AbstractSwRenameXNamedDlg
protected:
std::unique_ptr<SwRenameXNamedDlg> m_xDlg;
public:
- explicit AbstractSwRenameXNamedDlg_Impl(SwRenameXNamedDlg* p)
- : m_xDlg(p)
+ explicit AbstractSwRenameXNamedDlg_Impl(std::unique_ptr<SwRenameXNamedDlg>
p)
+ : m_xDlg(std::move(p))
{
}
virtual short Execute() override;
@@ -385,8 +385,8 @@ class AbstractFieldInputDlg_Impl : public
AbstractFieldInputDlg
protected:
std::unique_ptr<SwFieldInputDlg> m_xDlg;
public:
- explicit AbstractFieldInputDlg_Impl(SwFieldInputDlg* p)
- : m_xDlg(p)
+ explicit AbstractFieldInputDlg_Impl(std::unique_ptr<SwFieldInputDlg> p)
+ : m_xDlg(std::move(p))
{
}
virtual short Execute() override;
@@ -401,8 +401,8 @@ class AbstractInsFootNoteDlg_Impl : public
AbstractInsFootNoteDlg
protected:
std::unique_ptr<SwInsFootNoteDlg> m_xDlg;
public:
- explicit AbstractInsFootNoteDlg_Impl(SwInsFootNoteDlg* p)
- : m_xDlg(p)
+ explicit AbstractInsFootNoteDlg_Impl(std::unique_ptr<SwInsFootNoteDlg> p)
+ : m_xDlg(std::move(p))
{
}
virtual short Execute() override;
@@ -420,8 +420,8 @@ class AbstractInsTableDlg_Impl : public AbstractInsTableDlg
protected:
std::unique_ptr<SwInsTableDlg> m_xDlg;
public:
- explicit AbstractInsTableDlg_Impl(SwInsTableDlg* p)
- : m_xDlg(p)
+ explicit AbstractInsTableDlg_Impl(std::unique_ptr<SwInsTableDlg> p)
+ : m_xDlg(std::move(p))
{
}
virtual short Execute() override;
@@ -436,8 +436,8 @@ class AbstractJavaEditDialog_Impl : public
AbstractJavaEditDialog
protected:
std::unique_ptr<SwJavaEditDialog> m_xDlg;
public:
- explicit AbstractJavaEditDialog_Impl(SwJavaEditDialog* p)
- : m_xDlg(p)
+ explicit AbstractJavaEditDialog_Impl(std::unique_ptr<SwJavaEditDialog> p)
+ : m_xDlg(std::move(p))
{
}
virtual short Execute() override;
commit 312e83325c81aa0c22573621802eb622357c7a7b
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Aug 23 09:27:10 2018 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Aug 23 10:55:54 2018 +0200
loplugin:useuniqueptr in SwFltStackEntry
Change-Id: I849c1d0377a3d8a5dafedb017a6dfdb3189b799d
Reviewed-on: https://gerrit.libreoffice.org/59486
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sw/source/filter/basflt/fltshell.cxx
b/sw/source/filter/basflt/fltshell.cxx
index def8b749b91e..8b219d2b60b3 100644
--- a/sw/source/filter/basflt/fltshell.cxx
+++ b/sw/source/filter/basflt/fltshell.cxx
@@ -101,10 +101,10 @@ static OUString lcl_getTypePath(OUString& rType)
}
// Stack entry for all text attributes
-SwFltStackEntry::SwFltStackEntry(const SwPosition& rStartPos, SfxPoolItem* pHt)
+SwFltStackEntry::SwFltStackEntry(const SwPosition& rStartPos,
std::unique_ptr<SfxPoolItem> pHt)
: m_aMkPos(rStartPos)
, m_aPtPos(rStartPos)
- , pAttr( pHt ) // store a copy of the attribute
+ , pAttr( std::move(pHt) )
, m_isAnnotationOnEnd(false)
, mnStartCP(-1)
, mnEndCP(-1)
@@ -295,7 +295,7 @@ void SwFltControlStack::NewAttr(const SwPosition& rPos,
const SfxPoolItem& rAttr
}
else
{
- SwFltStackEntry *pTmp = new SwFltStackEntry(rPos, rAttr.Clone() );
+ SwFltStackEntry *pTmp = new SwFltStackEntry(rPos,
std::unique_ptr<SfxPoolItem>(rAttr.Clone()) );
pTmp->SetStartCP(GetCurrAttrCP());
m_Entries.push_back(std::unique_ptr<SwFltStackEntry>(pTmp));
}
diff --git a/sw/source/filter/inc/fltshell.hxx
b/sw/source/filter/inc/fltshell.hxx
index 3b84675a9a30..032ccbe00d81 100644
--- a/sw/source/filter/inc/fltshell.hxx
+++ b/sw/source/filter/inc/fltshell.hxx
@@ -101,7 +101,7 @@ public:
sal_Int32 mnEndCP;
bool bIsParaEnd;
- SW_DLLPUBLIC SwFltStackEntry(const SwPosition & rStartPos, SfxPoolItem*
pHt );
+ SW_DLLPUBLIC SwFltStackEntry(const SwPosition & rStartPos,
std::unique_ptr<SfxPoolItem> pHt );
SW_DLLPUBLIC ~SwFltStackEntry();
SW_DLLPUBLIC void SetEndPos( const SwPosition & rEndPos);
diff --git a/sw/source/filter/ww8/writerhelper.cxx
b/sw/source/filter/ww8/writerhelper.cxx
index 2ea8b649d46c..dcf3d289d311 100644
--- a/sw/source/filter/ww8/writerhelper.cxx
+++ b/sw/source/filter/ww8/writerhelper.cxx
@@ -682,7 +682,7 @@ namespace sw
void RedlineStack::open(const SwPosition& rPos, const SfxPoolItem&
rAttr)
{
OSL_ENSURE(rAttr.Which() == RES_FLTR_REDLINE, "not a redline");
- maStack.emplace_back(new SwFltStackEntry(rPos,rAttr.Clone()));
+ maStack.emplace_back(new SwFltStackEntry(rPos,
std::unique_ptr<SfxPoolItem>(rAttr.Clone())));
}
class SameOpenRedlineType
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
