From 95d20a3799998b9816bd2e8aebdbc96c61cead3e Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 24 May 2016 11:02:42 +0200 Subject: Revert "remove some manual ref-counting" until I have a better understanding of the UNO reference counting. This reverts commit 111de438ea3e512a541281dc0716cc728ea8d152. --- ucbhelper/source/client/proxydecider.cxx | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'ucbhelper') diff --git a/ucbhelper/source/client/proxydecider.cxx b/ucbhelper/source/client/proxydecider.cxx index 8b7630b9db17..5c04d7910794 100644 --- a/ucbhelper/source/client/proxydecider.cxx +++ b/ucbhelper/source/client/proxydecider.cxx @@ -772,15 +772,19 @@ void InternetProxyDecider_Impl::setNoProxyList( InternetProxyDecider::InternetProxyDecider( const uno::Reference< uno::XComponentContext>& rxContext ) -: m_xImpl( new proxydecider_impl::InternetProxyDecider_Impl( rxContext ) ) +: m_pImpl( new proxydecider_impl::InternetProxyDecider_Impl( rxContext ) ) { + m_pImpl->acquire(); } InternetProxyDecider::~InternetProxyDecider() { // Break circular reference between config listener and notifier. - m_xImpl->dispose(); + m_pImpl->dispose(); + + // Let him go... + m_pImpl->release(); } @@ -788,7 +792,7 @@ bool InternetProxyDecider::shouldUseProxy( const OUString & rProtocol, const OUString & rHost, sal_Int32 nPort ) const { - const InternetProxyServer & rData = m_xImpl->getProxy( rProtocol, + const InternetProxyServer & rData = m_pImpl->getProxy( rProtocol, rHost, nPort ); return !rData.aName.isEmpty(); @@ -800,7 +804,7 @@ const InternetProxyServer & InternetProxyDecider::getProxy( const OUString & rHost, sal_Int32 nPort ) const { - return m_xImpl->getProxy( rProtocol, rHost, nPort ); + return m_pImpl->getProxy( rProtocol, rHost, nPort ); } } // namespace ucbhelper -- cgit