diff options
Diffstat (limited to 'sc/source/ui/app/inputhdl.cxx')
| -rw-r--r-- | sc/source/ui/app/inputhdl.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index b78a2a18c1c4..5ac088044ac6 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -2821,7 +2821,7 @@ void ScInputHandler::EnterHandler( ScEnterMode nBlockMode ) if (bAttrib) { mpEditEngine->ClearSpellErrors(); - pObject.reset(mpEditEngine->CreateTextObject()); + pObject = mpEditEngine->CreateTextObject(); } else if (bAutoComplete) // Adjust Upper/Lower case { @@ -3890,9 +3890,9 @@ bool ScInputHandler::GetTextAndFields( ScEditEngineDefaulter& rDestEngine ) if ( eFieldState == SfxItemState::DONTCARE || eFieldState == SfxItemState::SET ) { // Copy content - EditTextObject* pObj = mpEditEngine->CreateTextObject(); + std::unique_ptr<EditTextObject> pObj = mpEditEngine->CreateTextObject(); rDestEngine.SetText(*pObj); - delete pObj; + pObj.reset(); // Delete attributes for (sal_Int32 i=0; i<nParCnt; i++) @@ -4055,7 +4055,9 @@ ScInputHdlState& ScInputHdlState::operator=( const ScInputHdlState& r ) aStartPos = r.aStartPos; aEndPos = r.aEndPos; aString = r.aString; - pEditData.reset( r.pEditData ? r.pEditData->Clone() : nullptr ); + pEditData.reset(); + if (r.pEditData) + pEditData = r.pEditData->Clone(); return *this; } |