From 159b26e419f1642abe84d7bdc6b7de52fb1b2fb6 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Wed, 18 Oct 2017 12:40:15 +0200 Subject: use rtl::Reference in sc/../uno/* instead of manual reference counting Change-Id: I60798316f2b63800a9f539cb719305c00d91ecc5 Reviewed-on: https://gerrit.libreoffice.org/43491 Tested-by: Jenkins Reviewed-by: Noel Grandin --- sc/inc/dapiuno.hxx | 6 +++--- sc/inc/textuno.hxx | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'sc/inc') diff --git a/sc/inc/dapiuno.hxx b/sc/inc/dapiuno.hxx index ab766f7e60f2..1f183501c9ba 100644 --- a/sc/inc/dapiuno.hxx +++ b/sc/inc/dapiuno.hxx @@ -336,7 +336,7 @@ protected: ScDocShell* GetDocShell() const; protected: - ScDataPilotDescriptorBase& mrParent; + rtl::Reference mxParent; ScFieldIdentifier maFieldId; private: @@ -615,7 +615,7 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; private: - ScDataPilotFieldGroupsObj& mrParent; + rtl::Reference mxParent; OUString maGroupName; }; @@ -642,7 +642,7 @@ public: virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; private: - ScDataPilotFieldGroupObj& mrParent; + rtl::Reference mxParent; OUString maName; }; diff --git a/sc/inc/textuno.hxx b/sc/inc/textuno.hxx index 0a33daa6a3f0..0d72c9b95008 100644 --- a/sc/inc/textuno.hxx +++ b/sc/inc/textuno.hxx @@ -217,14 +217,14 @@ public: class ScCellTextCursor : public SvxUnoTextCursor { - ScCellObj& rTextObj; + rtl::Reference mxTextObj; public: ScCellTextCursor(const ScCellTextCursor& rOther); ScCellTextCursor(ScCellObj& rText); - virtual ~ScCellTextCursor() throw() override; + virtual ~ScCellTextCursor() throw() override; - ScCellObj& GetCellObj() const { return rTextObj; } + ScCellObj& GetCellObj() const { return *mxTextObj; } // SvxUnoTextCursor methods reimplemented here: virtual css::uno::Reference< css::text::XText > SAL_CALL @@ -248,7 +248,7 @@ private: public: ScHeaderFooterTextCursor(rtl::Reference const & rText); - virtual ~ScHeaderFooterTextCursor() throw() override; + virtual ~ScHeaderFooterTextCursor() throw() override; // SvxUnoTextCursor methods reimplemented here: virtual css::uno::Reference< css::text::XText > SAL_CALL @@ -314,7 +314,7 @@ class ScEditEngineTextObj : public ScSimpleEditSourceHelper, public SvxUnoText { public: ScEditEngineTextObj(); - virtual ~ScEditEngineTextObj() throw() override; + virtual ~ScEditEngineTextObj() throw() override; void SetText( const EditTextObject& rTextObject ); EditTextObject* CreateTextObject(); @@ -359,8 +359,8 @@ public: class ScCellTextObj : public ScCellTextData, public SvxUnoText { public: - ScCellTextObj(ScDocShell* pDocSh, const ScAddress& rP); - virtual ~ScCellTextObj() throw() override; + ScCellTextObj(ScDocShell* pDocSh, const ScAddress& rP); + virtual ~ScCellTextObj() throw() override; }; #endif -- cgit