diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-03-27 11:14:29 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-03-27 19:53:46 +0100 |
| commit | 54cd6a054f6e0fcff94dd7750847acc601a893ed (patch) | |
| tree | bf3e8961705f0d5a698af31ab3f776c419aa50a4 | |
| parent | 28eab5de358631758315a3581e860d6ef533259a (diff) | |
return unique_ptr from CreateOutputEditEngine
Change-Id: I403f0da5ea1ccdf508d156a9fa828e9f91813385
Reviewed-on: https://gerrit.libreoffice.org/69804
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
| -rw-r--r-- | sc/source/ui/inc/output.hxx | 2 | ||||
| -rw-r--r-- | sc/source/ui/view/output2.cxx | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/ui/inc/output.hxx b/sc/source/ui/inc/output.hxx index d68d9b7c9a7d..f78d5e4933f3 100644 --- a/sc/source/ui/inc/output.hxx +++ b/sc/source/ui/inc/output.hxx @@ -241,7 +241,7 @@ private: void DrawEditStacked(DrawEditParam& rParam); void DrawEditAsianVertical(DrawEditParam& rParam); - ScFieldEditEngine* CreateOutputEditEngine(); + std::unique_ptr<ScFieldEditEngine> CreateOutputEditEngine(); void ShowClipMarks( DrawEditParam& rParam, long nEngineHeight, const Size& aCellSize, bool bMerged, OutputAreaParam& aAreaParam ); diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx index ef857609adb6..f0b0e9fb7149 100644 --- a/sc/source/ui/view/output2.cxx +++ b/sc/source/ui/view/output2.cxx @@ -2119,9 +2119,9 @@ tools::Rectangle ScOutputData::LayoutStrings(bool bPixelToLogic, bool bPaint, co return tools::Rectangle(); } -ScFieldEditEngine* ScOutputData::CreateOutputEditEngine() +std::unique_ptr<ScFieldEditEngine> ScOutputData::CreateOutputEditEngine() { - ScFieldEditEngine* pEngine = new ScFieldEditEngine(mpDoc, mpDoc->GetEnginePool()); + std::unique_ptr<ScFieldEditEngine> pEngine(new ScFieldEditEngine(mpDoc, mpDoc->GetEnginePool())); pEngine->SetUpdateMode( false ); // a RefDevice always has to be set, otherwise EditEngine would create a VirtualDevice pEngine->SetRefDevice( pFmtDevice ); @@ -4367,7 +4367,7 @@ void ScOutputData::DrawEdit(bool bPixelToLogic) } SfxItemSet* pPreviewFontSet = mpDoc->GetPreviewFont( nCellX, nCellY, nTab ); if (!pEngine) - pEngine.reset(CreateOutputEditEngine()); + pEngine = CreateOutputEditEngine(); else lcl_ClearEdit( *pEngine ); // also calls SetUpdateMode(sal_False) @@ -4496,7 +4496,7 @@ void ScOutputData::DrawRotated(bool bPixelToLogic) if (!bHidden) { if (!pEngine) - pEngine.reset(CreateOutputEditEngine()); + pEngine = CreateOutputEditEngine(); else lcl_ClearEdit( *pEngine ); // also calls SetUpdateMode(sal_False) |