summaryrefslogtreecommitdiff
path: root/vcl/source/edit
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-01-15 08:29:31 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-01-17 10:16:35 +0200
commit8ff202bf4bae019fbd2183207936b1d2ef1f6ce1 (patch)
tree307e6ba2f1d033ce4388333744e92b111b7e44a9 /vcl/source/edit
parent9b3904357be1fc4775fe5fb516d82c7c1ee53a1e (diff)
loplugin:useuniqueptr in TextEngine
Change-Id: Iff5d10c4e962994823ec4ce6a765f4456c677352
Diffstat (limited to 'vcl/source/edit')
-rw-r--r--vcl/source/edit/texteng.cxx30
-rw-r--r--vcl/source/edit/textundo.hxx4
2 files changed, 16 insertions, 18 deletions
diff --git a/vcl/source/edit/texteng.cxx b/vcl/source/edit/texteng.cxx
index 379f2adeb6c0..ec57a36041a2 100644
--- a/vcl/source/edit/texteng.cxx
+++ b/vcl/source/edit/texteng.cxx
@@ -89,9 +89,9 @@ TextEngine::TextEngine()
, mbRightToLeft {false}
, mbHasMultiLineParas {false}
{
- mpViews = new TextViews;
+ mpViews.reset( new TextViews );
- mpIdleFormatter = new IdleFormatter;
+ mpIdleFormatter.reset( new IdleFormatter );
mpIdleFormatter->SetInvokeHandler( LINK( this, TextEngine, IdleFormatHdl ) );
mpIdleFormatter->SetDebugName( "vcl::TextEngine mpIdleFormatter" );
@@ -113,14 +113,14 @@ TextEngine::~TextEngine()
{
mbDowning = true;
- delete mpIdleFormatter;
- delete mpDoc;
- delete mpTEParaPortions;
- delete mpViews; // only the list, not the Views
+ mpIdleFormatter.reset();
+ mpDoc.reset();
+ mpTEParaPortions.reset();
+ mpViews.reset(); // only the list, not the Views
mpRefDev.disposeAndClear();
- delete mpUndoManager;
+ mpUndoManager.reset();
mpIMEInfos.reset();
- delete mpLocaleDataWrapper;
+ mpLocaleDataWrapper.reset();
}
void TextEngine::InsertView( TextView* pTextView )
@@ -375,10 +375,9 @@ void TextEngine::ImpInitDoc()
if ( mpDoc )
mpDoc->Clear();
else
- mpDoc = new TextDoc;
+ mpDoc.reset( new TextDoc );
- delete mpTEParaPortions;
- mpTEParaPortions = new TEParaPortions;
+ mpTEParaPortions.reset(new TEParaPortions);
TextNode* pNode = new TextNode( OUString() );
mpDoc->GetNodes().insert( mpDoc->GetNodes().begin(), pNode );
@@ -1305,7 +1304,7 @@ void TextEngine::EnableUndo( bool bEnable )
::svl::IUndoManager& TextEngine::GetUndoManager()
{
if ( !mpUndoManager )
- mpUndoManager = new TextUndoManager( this );
+ mpUndoManager.reset( new TextUndoManager( this ) );
return *mpUndoManager;
}
@@ -2719,8 +2718,7 @@ uno::Reference< i18n::XBreakIterator > const & TextEngine::GetBreakIterator()
void TextEngine::SetLocale( const css::lang::Locale& rLocale )
{
maLocale = rLocale;
- delete mpLocaleDataWrapper;
- mpLocaleDataWrapper = nullptr;
+ mpLocaleDataWrapper.reset();
}
css::lang::Locale const & TextEngine::GetLocale()
@@ -2735,9 +2733,9 @@ css::lang::Locale const & TextEngine::GetLocale()
LocaleDataWrapper* TextEngine::ImpGetLocaleDataWrapper()
{
if ( !mpLocaleDataWrapper )
- mpLocaleDataWrapper = new LocaleDataWrapper( LanguageTag( GetLocale()) );
+ mpLocaleDataWrapper.reset( new LocaleDataWrapper( LanguageTag( GetLocale()) ) );
- return mpLocaleDataWrapper;
+ return mpLocaleDataWrapper.get();
}
void TextEngine::SetRightToLeft( bool bR2L )
diff --git a/vcl/source/edit/textundo.hxx b/vcl/source/edit/textundo.hxx
index caa985a84eb3..0ec4a9aba328 100644
--- a/vcl/source/edit/textundo.hxx
+++ b/vcl/source/edit/textundo.hxx
@@ -60,8 +60,8 @@ protected:
TextView* GetView() const { return mpTextEngine->GetActiveView(); }
void SetSelection( const TextSelection& rSel );
- TextDoc* GetDoc() const { return mpTextEngine->mpDoc; }
- TEParaPortions* GetTEParaPortions() const { return mpTextEngine->mpTEParaPortions; }
+ TextDoc* GetDoc() const { return mpTextEngine->mpDoc.get(); }
+ TEParaPortions* GetTEParaPortions() const { return mpTextEngine->mpTEParaPortions.get(); }
public:
explicit TextUndo( TextEngine* pTextEngine );