diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-08 11:22:10 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-10-09 12:09:55 +0200 |
| commit | f7ce839c7844f029c0a1ac83a5638e83356b4c4b (patch) | |
| tree | c93a342a577133b384a3ccc088d7d0675d4fb9e3 /sd/inc | |
| parent | 4ba06560e33f17ca1ed72ad722c80eae5ffd4277 (diff) | |
use unique_ptr in SfxUndoManager::AddUndoAction
Change-Id: I11483e3cece12a7373f4276972b4c899edf1ce15
Reviewed-on: https://gerrit.libreoffice.org/61566
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd/inc')
| -rw-r--r-- | sd/inc/Annotation.hxx | 2 | ||||
| -rw-r--r-- | sd/inc/undo/undofactory.hxx | 12 | ||||
| -rw-r--r-- | sd/inc/undo/undomanager.hxx | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/sd/inc/Annotation.hxx b/sd/inc/Annotation.hxx index 68c343866913..2c83e8cb9135 100644 --- a/sd/inc/Annotation.hxx +++ b/sd/inc/Annotation.hxx @@ -37,7 +37,7 @@ enum class CommentNotificationType { Add, Modify, Remove }; void createAnnotation( css::uno::Reference< css::office::XAnnotation >& xAnnotation, SdPage* pPage ); -SdrUndoAction* CreateUndoInsertOrRemoveAnnotation( const css::uno::Reference< css::office::XAnnotation >& xAnnotation, bool bInsert ); +std::unique_ptr<SdrUndoAction> CreateUndoInsertOrRemoveAnnotation( const css::uno::Reference< css::office::XAnnotation >& xAnnotation, bool bInsert ); void CreateChangeUndo(const css::uno::Reference< css::office::XAnnotation >& xAnnotation); diff --git a/sd/inc/undo/undofactory.hxx b/sd/inc/undo/undofactory.hxx index 3995df536216..742d0b358e76 100644 --- a/sd/inc/undo/undofactory.hxx +++ b/sd/inc/undo/undofactory.hxx @@ -28,12 +28,12 @@ namespace sd class UndoFactory : public SdrUndoFactory { public: - virtual SdrUndoAction* CreateUndoRemoveObject( SdrObject& rObject, bool bOrdNumDirect = false) override; - virtual SdrUndoAction* CreateUndoDeleteObject( SdrObject& rObject, bool bOrdNumDirect = false) override; - virtual SdrUndoAction* CreateUndoObjectSetText( SdrObject& rNewObj, sal_Int32 nText ) override; - virtual SdrUndoAction* CreateUndoReplaceObject( SdrObject& rOldObject, SdrObject& rNewObject, bool bOrdNumDirect = false ) override; - virtual SdrUndoAction* CreateUndoGeoObject( SdrObject& rObject ) override; - virtual SdrUndoAction* CreateUndoAttrObject( SdrObject& rObject, bool bStyleSheet1 = false, bool bSaveText = false ) override; + virtual std::unique_ptr<SdrUndoAction> CreateUndoRemoveObject( SdrObject& rObject, bool bOrdNumDirect = false) override; + virtual std::unique_ptr<SdrUndoAction> CreateUndoDeleteObject( SdrObject& rObject, bool bOrdNumDirect = false) override; + virtual std::unique_ptr<SdrUndoAction> CreateUndoObjectSetText( SdrObject& rNewObj, sal_Int32 nText ) override; + virtual std::unique_ptr<SdrUndoAction> CreateUndoReplaceObject( SdrObject& rOldObject, SdrObject& rNewObject, bool bOrdNumDirect = false ) override; + virtual std::unique_ptr<SdrUndoAction> CreateUndoGeoObject( SdrObject& rObject ) override; + virtual std::unique_ptr<SdrUndoAction> CreateUndoAttrObject( SdrObject& rObject, bool bStyleSheet1 = false, bool bSaveText = false ) override; }; } diff --git a/sd/inc/undo/undomanager.hxx b/sd/inc/undo/undomanager.hxx index 45fb8fd6a6ac..84a0e5394a4a 100644 --- a/sd/inc/undo/undomanager.hxx +++ b/sd/inc/undo/undomanager.hxx @@ -33,7 +33,7 @@ public: virtual void EnterListAction(const OUString &rComment, const OUString& rRepeatComment, sal_uInt16 nId, ViewShellId nViewShellId) override; - virtual void AddUndoAction( SfxUndoAction *pAction, bool bTryMerg=false ) override; + virtual void AddUndoAction( std::unique_ptr<SfxUndoAction> pAction, bool bTryMerg=false ) override; /** Set or reset the undo manager linked with the called undo manager. */ |