diff options
| -rw-r--r-- | framework/inc/helper/vclstatusindicator.hxx | 6 | ||||
| -rw-r--r-- | framework/source/helper/statusindicatorfactory.cxx | 3 | ||||
| -rw-r--r-- | framework/source/helper/vclstatusindicator.cxx | 4 |
3 files changed, 3 insertions, 10 deletions
diff --git a/framework/inc/helper/vclstatusindicator.hxx b/framework/inc/helper/vclstatusindicator.hxx index 1827174444ab..62021bf39f23 100644 --- a/framework/inc/helper/vclstatusindicator.hxx +++ b/framework/inc/helper/vclstatusindicator.hxx @@ -47,9 +47,6 @@ class VCLStatusIndicator : public css::task::XStatusIndicator private: - /** can be used to create own needed uno resources. */ - css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR; - /** points to the parent window of this progress and hold it alive. */ css::uno::Reference< css::awt::XWindow > m_xParentWindow; @@ -79,8 +76,7 @@ class VCLStatusIndicator : public css::task::XStatusIndicator FWK_DECLARE_XINTERFACE /// ctor - VCLStatusIndicator(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR , - const css::uno::Reference< css::awt::XWindow >& xParentWindow); + VCLStatusIndicator(const css::uno::Reference< css::awt::XWindow >& xParentWindow); /// dtor virtual ~VCLStatusIndicator(); diff --git a/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx index 091da148d0d3..18ed206297ad 100644 --- a/framework/source/helper/statusindicatorfactory.cxx +++ b/framework/source/helper/statusindicatorfactory.cxx @@ -449,7 +449,6 @@ void StatusIndicatorFactory::impl_createProgress() css::uno::Reference< css::frame::XFrame > xFrame (m_xFrame.get() , css::uno::UNO_QUERY); css::uno::Reference< css::awt::XWindow > xWindow(m_xPluggWindow.get(), css::uno::UNO_QUERY); - css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = m_xSMGR; aReadLock.lock(); // <- SAFE ---------------------------------- @@ -459,7 +458,7 @@ void StatusIndicatorFactory::impl_createProgress() if (xWindow.is()) { // use vcl based progress implementation in plugged mode - VCLStatusIndicator* pVCLProgress = new VCLStatusIndicator(xSMGR, xWindow); + VCLStatusIndicator* pVCLProgress = new VCLStatusIndicator(xWindow); xProgress = css::uno::Reference< css::task::XStatusIndicator >(static_cast< css::task::XStatusIndicator* >(pVCLProgress), css::uno::UNO_QUERY); } else if (xFrame.is()) diff --git a/framework/source/helper/vclstatusindicator.cxx b/framework/source/helper/vclstatusindicator.cxx index b8517a451488..75c12bdf1022 100644 --- a/framework/source/helper/vclstatusindicator.cxx +++ b/framework/source/helper/vclstatusindicator.cxx @@ -35,11 +35,9 @@ DEFINE_XINTERFACE_1(VCLStatusIndicator , DIRECT_INTERFACE(css::task::XStatusIndicator)) //----------------------------------------------- -VCLStatusIndicator::VCLStatusIndicator(const css::uno::Reference< css::lang::XMultiServiceFactory >& xSMGR , - const css::uno::Reference< css::awt::XWindow >& xParentWindow) +VCLStatusIndicator::VCLStatusIndicator(const css::uno::Reference< css::awt::XWindow >& xParentWindow) : ThreadHelpBase (&Application::GetSolarMutex()) , ::cppu::OWeakObject( ) - , m_xSMGR (xSMGR ) , m_xParentWindow (xParentWindow ) , m_pStatusBar (0 ) , m_nRange (0 ) |