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

loplugin:useuniqueptr in TextWindow

Change-Id: I66c966f79d56be5dfc1422fa3de52d9bf4411ff2
Reviewed-on: https://gerrit.libreoffice.org/53348Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noel.grandin@collabora.co.uk>
üst 148b8416
......@@ -36,8 +36,8 @@ class TextWindow : public vcl::Window
{
private:
VclPtr<Edit> mxParent;
ExtTextEngine* mpExtTextEngine;
TextView* mpExtTextView;
std::unique_ptr<ExtTextEngine> mpExtTextEngine;
std::unique_ptr<TextView> mpExtTextView;
bool mbInMBDown;
bool mbFocusSelectionHide;
......@@ -50,8 +50,8 @@ public:
virtual ~TextWindow() override;
virtual void dispose() override;
ExtTextEngine* GetTextEngine() const { return mpExtTextEngine; }
TextView* GetTextView() const { return mpExtTextView; }
ExtTextEngine* GetTextEngine() const { return mpExtTextEngine.get(); }
TextView* GetTextView() const { return mpExtTextView.get(); }
virtual void MouseMove( const MouseEvent& rMEvt ) override;
virtual void MouseButtonDown( const MouseEvent& rMEvt ) override;
......
......@@ -672,13 +672,13 @@ TextWindow::TextWindow(Edit* pParent)
SetPointer( Pointer( PointerStyle::Text ) );
mpExtTextEngine = new ExtTextEngine;
mpExtTextEngine.reset(new ExtTextEngine);
mpExtTextEngine->SetMaxTextLen(EDIT_NOLIMIT);
if( pParent->GetStyle() & WB_BORDER )
mpExtTextEngine->SetLeftMargin( 2 );
mpExtTextEngine->SetLocale( GetSettings().GetLanguageTag().getLocale() );
mpExtTextView = new TextView( mpExtTextEngine, this );
mpExtTextEngine->InsertView( mpExtTextView );
mpExtTextView.reset(new TextView( mpExtTextEngine.get(), this ));
mpExtTextEngine->InsertView( mpExtTextView.get() );
mpExtTextEngine->EnableUndo( true );
mpExtTextView->ShowCursor();
......@@ -695,10 +695,8 @@ TextWindow::~TextWindow()
void TextWindow::dispose()
{
mxParent.clear();
delete mpExtTextView;
mpExtTextView = nullptr;
delete mpExtTextEngine;
mpExtTextEngine = nullptr;
mpExtTextView.reset();
mpExtTextEngine.reset();
Window::dispose();
}
......
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