[Libreoffice-commits] core.git: include/sfx2 sfx2/source

[Xisco Fauli]

 include/sfx2/querystatus.hxx        |    4 ++--
 sfx2/source/control/querystatus.cxx |    6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit f6d6a9c26448996498ec2a19c9ec64e6056a82f8
Author: Xisco Fauli <anistenis at gmail.com>
Date:   Sun Jun 5 00:28:22 2016 +0200

    tdf#89329: use rtl::Reference for pImpl in querystatus
    
    Change-Id: Iebc26867ebca7b61c0c54eb36bef035f4c9fc28a
    Reviewed-on: https://gerrit.libreoffice.org/25909
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/include/sfx2/querystatus.hxx b/include/sfx2/querystatus.hxx
index 4f7f5b58..5422331 100644
--- a/include/sfx2/querystatus.hxx
+++ b/include/sfx2/querystatus.hxx
@@ -30,6 +30,7 @@
 #include <com/sun/star/frame/XStatusListener.hpp>
 
 #include <sfx2/sfxuno.hxx>
+#include <rtl/ref.hxx>
 
 class SfxQueryStatus_Impl;
 class SFX2_DLLPUBLIC SfxQueryStatus
@@ -45,8 +46,7 @@ class SFX2_DLLPUBLIC SfxQueryStatus
         SfxQueryStatus( const SfxQueryStatus& ) = delete;
         SfxQueryStatus& operator=( const SfxQueryStatus& ) = delete;
 
-        css::uno::Reference< css::frame::XStatusListener >   m_xStatusListener;
-        SfxQueryStatus_Impl*                                 m_pSfxQueryStatusImpl;
+        rtl::Reference< SfxQueryStatus_Impl >   m_pImpl;
 };
 
 #endif // INCLUDED_SFX2_QUERYSTATUS_HXX
diff --git a/sfx2/source/control/querystatus.cxx b/sfx2/source/control/querystatus.cxx
index 2f939a7..2fd76fd 100644
--- a/sfx2/source/control/querystatus.cxx
+++ b/sfx2/source/control/querystatus.cxx
@@ -205,10 +205,8 @@ SfxItemState SfxQueryStatus_Impl::QueryState( SfxPoolItem*& rpPoolItem )
 
 
 SfxQueryStatus::SfxQueryStatus( const Reference< XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const OUString& rCommand )
+    : m_pImpl(new SfxQueryStatus_Impl( rDispatchProvider, nSlotId, rCommand ))
 {
-    m_pSfxQueryStatusImpl = new SfxQueryStatus_Impl( rDispatchProvider, nSlotId, rCommand );
-    m_xStatusListener.set( static_cast< cppu::OWeakObject* >( m_pSfxQueryStatusImpl ),
-                           UNO_QUERY );
 }
 
 SfxQueryStatus::~SfxQueryStatus()
@@ -218,7 +216,7 @@ SfxQueryStatus::~SfxQueryStatus()
 SfxItemState SfxQueryStatus::QueryState( SfxPoolItem*& rpPoolItem )
 {
     SolarMutexGuard aGuard;
-    return m_pSfxQueryStatusImpl->QueryState( rpPoolItem );
+    return m_pImpl->QueryState( rpPoolItem );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */