diff options
| author | Noel Grandin <noel@peralex.com> | 2016-05-24 11:02:42 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2016-05-24 11:02:42 +0200 |
| commit | 95d20a3799998b9816bd2e8aebdbc96c61cead3e (patch) | |
| tree | 8206ecc848631432cb8b027d5e780483734f808a /framework | |
| parent | 3caf31b05d7bbf3d50a1bbda6c8b95982cb5c2b5 (diff) | |
Revert "remove some manual ref-counting"
until I have a better understanding of the UNO reference
counting.
This reverts commit 111de438ea3e512a541281dc0716cc728ea8d152.
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/Library_fwi.mk | 1 | ||||
| -rw-r--r-- | framework/source/fwe/dispatch/interaction.cxx | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk index 8435b9df474e..5e829635723d 100644 --- a/framework/Library_fwi.mk +++ b/framework/Library_fwi.mk @@ -41,7 +41,6 @@ $(eval $(call gb_Library_use_libraries,fwi,\ cppuhelper \ i18nlangtag \ sal \ - salhelper \ svl \ svt \ tk \ diff --git a/framework/source/fwe/dispatch/interaction.cxx b/framework/source/fwe/dispatch/interaction.cxx index 0229db2fddf1..6fc5c69086f2 100644 --- a/framework/source/fwe/dispatch/interaction.cxx +++ b/framework/source/fwe/dispatch/interaction.cxx @@ -156,12 +156,14 @@ css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > } RequestFilterSelect::RequestFilterSelect( const OUString& sURL ) - : mxImpl(new RequestFilterSelect_Impl( sURL )) { + pImp = new RequestFilterSelect_Impl( sURL ); + pImp->acquire(); } RequestFilterSelect::~RequestFilterSelect() { + pImp->release(); } // return abort state of interaction @@ -169,7 +171,7 @@ RequestFilterSelect::~RequestFilterSelect() bool RequestFilterSelect::isAbort() const { - return mxImpl->isAbort(); + return pImp->isAbort(); } // return user selected filter @@ -177,12 +179,12 @@ bool RequestFilterSelect::isAbort() const OUString RequestFilterSelect::getFilter() const { - return mxImpl->getFilter(); + return pImp->getFilter(); } uno::Reference < task::XInteractionRequest > RequestFilterSelect::GetRequest() { - return mxImpl; + return uno::Reference < task::XInteractionRequest > (pImp); } class InteractionRequest_Impl : public ::cppu::WeakImplHelper< css::task::XInteractionRequest > |