[Libreoffice-commits] core.git: sw/source
Michael Stahl
mstahl at redhat.com
Fri Feb 2 09:55:01 UTC 2018
sw/source/core/fields/textapi.cxx | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
New commits:
commit 87115c67c3d83fb4bdccc3c03f7a79c44b22bf2c
Author: Michael Stahl <mstahl at redhat.com>
Date: Thu Feb 1 22:32:19 2018 +0100
sw: replace DELETEZ with std::unique_ptr in textapi.cxx
Change-Id: I4e4eaa67995a4a8041ab701e02984aa2fb0d349e
Reviewed-on: https://gerrit.libreoffice.org/49118
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
diff --git a/sw/source/core/fields/textapi.cxx b/sw/source/core/fields/textapi.cxx
index 0c8b8f233ddc..0a35462ce69c 100644
--- a/sw/source/core/fields/textapi.cxx
+++ b/sw/source/core/fields/textapi.cxx
@@ -72,8 +72,8 @@ struct SwTextAPIEditSource_Impl
// needed for "internal" refcounting
SfxItemPool* mpPool;
SwDoc* mpDoc;
- Outliner* mpOutliner;
- SvxOutlinerForwarder* mpTextForwarder;
+ std::unique_ptr<Outliner> mpOutliner;
+ std::unique_ptr<SvxOutlinerForwarder> mpTextForwarder;
sal_Int32 mnRef;
};
@@ -100,8 +100,6 @@ SwTextAPIEditSource::SwTextAPIEditSource(SwDoc* pDoc)
{
pImpl->mpPool = &pDoc->GetDocShell()->GetPool();
pImpl->mpDoc = pDoc;
- pImpl->mpOutliner = nullptr;
- pImpl->mpTextForwarder = nullptr;
pImpl->mnRef = 1;
}
@@ -115,8 +113,8 @@ void SwTextAPIEditSource::Dispose()
{
pImpl->mpPool=nullptr;
pImpl->mpDoc=nullptr;
- DELETEZ(pImpl->mpTextForwarder);
- DELETEZ(pImpl->mpOutliner);
+ pImpl->mpTextForwarder.reset();
+ pImpl->mpOutliner.reset();
}
SvxTextForwarder* SwTextAPIEditSource::GetTextForwarder()
@@ -128,14 +126,16 @@ SvxTextForwarder* SwTextAPIEditSource::GetTextForwarder()
{
//init draw model first
pImpl->mpDoc->getIDocumentDrawModelAccess().GetOrCreateDrawModel();
- pImpl->mpOutliner = new Outliner( pImpl->mpPool, OutlinerMode::TextObject );
- pImpl->mpDoc->SetCalcFieldValueHdl( pImpl->mpOutliner );
+ pImpl->mpOutliner.reset(new Outliner(pImpl->mpPool, OutlinerMode::TextObject));
+ pImpl->mpDoc->SetCalcFieldValueHdl(pImpl->mpOutliner.get());
}
if( !pImpl->mpTextForwarder )
- pImpl->mpTextForwarder = new SvxOutlinerForwarder( *pImpl->mpOutliner, false );
+ {
+ pImpl->mpTextForwarder.reset(new SvxOutlinerForwarder(*pImpl->mpOutliner, false));
+ }
- return pImpl->mpTextForwarder;
+ return pImpl->mpTextForwarder.get();
}
void SwTextAPIEditSource::SetText( OutlinerParaObject const & rText )
@@ -146,8 +146,8 @@ void SwTextAPIEditSource::SetText( OutlinerParaObject const & rText )
{
//init draw model first
pImpl->mpDoc->getIDocumentDrawModelAccess().GetOrCreateDrawModel();
- pImpl->mpOutliner = new Outliner( pImpl->mpPool, OutlinerMode::TextObject );
- pImpl->mpDoc->SetCalcFieldValueHdl( pImpl->mpOutliner );
+ pImpl->mpOutliner.reset(new Outliner(pImpl->mpPool, OutlinerMode::TextObject));
+ pImpl->mpDoc->SetCalcFieldValueHdl(pImpl->mpOutliner.get());
}
pImpl->mpOutliner->SetText( rText );
@@ -162,8 +162,8 @@ void SwTextAPIEditSource::SetString( const OUString& rText )
{
//init draw model first
pImpl->mpDoc->getIDocumentDrawModelAccess().GetOrCreateDrawModel();
- pImpl->mpOutliner = new Outliner( pImpl->mpPool, OutlinerMode::TextObject );
- pImpl->mpDoc->SetCalcFieldValueHdl( pImpl->mpOutliner );
+ pImpl->mpOutliner.reset(new Outliner(pImpl->mpPool, OutlinerMode::TextObject));
+ pImpl->mpDoc->SetCalcFieldValueHdl(pImpl->mpOutliner.get());
}
else
pImpl->mpOutliner->Clear();
More information about the Libreoffice-commits
mailing list