diff options
| author | Noel Grandin <noel@peralex.com> | 2016-06-01 16:22:29 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-06-06 07:01:34 +0000 |
| commit | 0323253a7c67316cb96e4a64792ab4fe74aac1ca (patch) | |
| tree | 81787c4ae44ff778aa41e12574cd60a624c9277b /framework | |
| parent | 4d666f5092d7c4f2ece9702dda4d874e44cdc6f7 (diff) | |
remove some manual ref-counting
triggered when I noticed a class doing acquire() in the
constructor and then release() in the destructor.
found mostly by
git grep -n -B5 -e '->release()'
Change-Id: I96e43a3d30ffd9ae9a34275f24cd914d8f7b026f
Reviewed-on: https://gerrit.libreoffice.org/25806
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/Library_fwi.mk | 1 | ||||
| -rw-r--r-- | framework/source/fwe/dispatch/interaction.cxx | 15 |
2 files changed, 10 insertions, 6 deletions
diff --git a/framework/Library_fwi.mk b/framework/Library_fwi.mk index 5e829635723d..8435b9df474e 100644 --- a/framework/Library_fwi.mk +++ b/framework/Library_fwi.mk @@ -41,6 +41,7 @@ $(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 a9b36bb4be67..e0c3b9e7662f 100644 --- a/framework/source/fwe/dispatch/interaction.cxx +++ b/framework/source/fwe/dispatch/interaction.cxx @@ -156,17 +156,20 @@ css::uno::Sequence< css::uno::Reference< css::task::XInteractionContinuation > > } RequestFilterSelect::RequestFilterSelect( const OUString& sURL ) - : pImpl( new RequestFilterSelect_Impl( sURL )) -{} + : mxImpl(new RequestFilterSelect_Impl( sURL )) +{ +} -RequestFilterSelect::~RequestFilterSelect() {} +RequestFilterSelect::~RequestFilterSelect() +{ +} // return abort state of interaction // If it is true, return value of method "getFilter()" will be unspecified then! bool RequestFilterSelect::isAbort() const { - return pImpl->isAbort(); + return mxImpl->isAbort(); } // return user selected filter @@ -174,12 +177,12 @@ bool RequestFilterSelect::isAbort() const OUString RequestFilterSelect::getFilter() const { - return pImpl->getFilter(); + return mxImpl->getFilter(); } uno::Reference < task::XInteractionRequest > RequestFilterSelect::GetRequest() { - return uno::Reference < task::XInteractionRequest > (pImpl.get()); + return mxImpl.get(); } class InteractionRequest_Impl : public ::cppu::WeakImplHelper< css::task::XInteractionRequest > |