Kaydet (Commit) 87115c67 authored tarafından Michael Stahl's avatar Michael Stahl

sw: replace DELETEZ with std::unique_ptr in textapi.cxx

Change-Id: I4e4eaa67995a4a8041ab701e02984aa2fb0d349e
Reviewed-on: https://gerrit.libreoffice.org/49118Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMichael Stahl <mstahl@redhat.com>
üst 86148972
......@@ -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();
......
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