summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2018-04-10 16:07:49 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2018-04-11 08:42:59 +0200
commitff8442fd85f2e281a564e3dc832a751a3a9c3072 (patch)
tree05d4a59e914d53a357f99a8ce6146cb3e35f47c3 /include
parent672660031e4ca38205e2068b1e321268a844a68b (diff)
pass EditTextObject around using std::unique_ptr
Change-Id: I71f4529c2e02fd0ac2561191e4cb35e18e206037 Reviewed-on: https://gerrit.libreoffice.org/52682 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'include')
-rw-r--r--include/editeng/editeng.hxx8
-rw-r--r--include/editeng/editobj.hxx2
-rw-r--r--include/editeng/editview.hxx2
-rw-r--r--include/editeng/outlobj.hxx2
4 files changed, 7 insertions, 7 deletions
diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx
index ee4eb7baeb31..393e0068cb64 100644
--- a/include/editeng/editeng.hxx
+++ b/include/editeng/editeng.hxx
@@ -299,10 +299,10 @@ public:
void Clear();
void SetText( const OUString& rStr );
- EditTextObject* CreateTextObject();
- EditTextObject* GetEmptyTextObject() const;
- EditTextObject* CreateTextObject( sal_Int32 nPara, sal_Int32 nParas = 1 );
- EditTextObject* CreateTextObject( const ESelection& rESelection );
+ std::unique_ptr<EditTextObject> CreateTextObject();
+ std::unique_ptr<EditTextObject> GetEmptyTextObject() const;
+ std::unique_ptr<EditTextObject> CreateTextObject( sal_Int32 nPara, sal_Int32 nParas = 1 );
+ std::unique_ptr<EditTextObject> CreateTextObject( const ESelection& rESelection );
void SetText( const EditTextObject& rTextObject );
void RemoveParagraph(sal_Int32 nPara);
diff --git a/include/editeng/editobj.hxx b/include/editeng/editobj.hxx
index ea35311ac1b1..48d6bcb32415 100644
--- a/include/editeng/editobj.hxx
+++ b/include/editeng/editobj.hxx
@@ -90,7 +90,7 @@ public:
SvtScriptType GetScriptType() const;
- EditTextObject* Clone() const;
+ std::unique_ptr<EditTextObject> Clone() const;
sal_Int32 GetParagraphCount() const;
diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx
index 52f56d517de6..8d2a5ef2853d 100644
--- a/include/editeng/editview.hxx
+++ b/include/editeng/editview.hxx
@@ -230,7 +230,7 @@ public:
void SetControlWord( EVControlBits nWord );
EVControlBits GetControlWord() const;
- EditTextObject* CreateTextObject();
+ std::unique_ptr<EditTextObject> CreateTextObject();
void InsertText( const EditTextObject& rTextObject );
void InsertText( css::uno::Reference< css::datatransfer::XTransferable > const & xDataObj, const OUString& rBaseURL, bool bUseSpecial );
diff --git a/include/editeng/outlobj.hxx b/include/editeng/outlobj.hxx
index db135f692ca2..0186ce72af16 100644
--- a/include/editeng/outlobj.hxx
+++ b/include/editeng/outlobj.hxx
@@ -42,7 +42,7 @@ struct OutlinerParaObjData
bool mbIsEditDoc;
// constructor
- OutlinerParaObjData( EditTextObject* pEditTextObject, const ParagraphDataVector& rParagraphDataVector, bool bIsEditDoc );
+ OutlinerParaObjData( std::unique_ptr<EditTextObject> pEditTextObject, const ParagraphDataVector& rParagraphDataVector, bool bIsEditDoc );
OutlinerParaObjData( const OutlinerParaObjData& r );