strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix ownership cycle and leak

Browse source
This commit is contained in:
Caolán McNamara 2011-04-06 16:39:19 +01:00
parent ec02df7a42
commit a89957bca2
2 changed files with 46 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
sfx2/source/appl/imestatuswindow.cxx
View file

@ -53,6 +53,44 @@
#include "vcl/svapp.hxx"
#include "osl/mutex.hxx"
//TO-Do, merge into framework/inc/helpers/mischelpers.hxx and deliver
class WeakPropertyChangeListener : public ::cppu::WeakImplHelper1<com::sun::star::beans::XPropertyChangeListener>
{
private:
com::sun::star::uno::WeakReference<com::sun::star::beans::XPropertyChangeListener> mxOwner;
public:
WeakPropertyChangeListener(com::sun::star::uno::Reference<com::sun::star::beans::XPropertyChangeListener> xOwner)
: mxOwner(xOwner)
{
}
virtual ~WeakPropertyChangeListener()
{
}
virtual void SAL_CALL propertyChange(const com::sun::star::beans::PropertyChangeEvent &rEvent )
throw(com::sun::star::uno::RuntimeException)
{
com::sun::star::uno::Reference<com::sun::star::beans::XPropertyChangeListener> xOwner(mxOwner.get(),
com::sun::star::uno::UNO_QUERY);
if (xOwner.is())
xOwner->propertyChange(rEvent);
}
// lang.XEventListener
virtual void SAL_CALL disposing(const com::sun::star::lang::EventObject& rEvent)
throw(com::sun::star::uno::RuntimeException)
{
com::sun::star::uno::Reference<com::sun::star::beans::XPropertyChangeListener> xOwner(mxOwner.get(),
com::sun::star::uno::UNO_QUERY);
if (xOwner.is())
xOwner->disposing(rEvent);
}
};
namespace css = com::sun::star;
using sfx2::appl::ImeStatusWindow;
@ -133,13 +171,13 @@ bool ImeStatusWindow::canToggle() const
ImeStatusWindow::~ImeStatusWindow()
{
if (m_xConfig.is())
if (m_xConfig.is() && m_xConfigListener.is())
// We should never get here, but just in case...
try
{
m_xConfig->removePropertyChangeListener(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowStatusWindow")),
this);
m_xConfigListener);
}
catch (css::uno::Exception &)
{
@ -221,12 +259,15 @@ css::uno::Reference< css::beans::XPropertySet > ImeStatusWindow::getConfig()
xConfig = m_xConfig;
}
if (bAdd)
{
// Exceptions here could be handled individually, to support graceful
// degradation (no update notification mechanism in this case---but also
// no dispose notifications):
m_xConfigListener = new WeakPropertyChangeListener(this);
xConfig->addPropertyChangeListener(
rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ShowStatusWindow")),
this);
m_xConfigListener);
}
return xConfig;
}

2
sfx2/source/appl/imestatuswindow.hxx
View file

@ -118,6 +118,8 @@ private:
osl::Mutex m_aMutex;
com::sun::star::uno::Reference< com::sun::star::beans::XPropertySet >
m_xConfig;
com::sun::star::uno::Reference< com::sun::star::beans::XPropertyChangeListener >
m_xConfigListener;
bool m_bDisposed;
};