summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--framework/source/uielement/toolbarmanager.cxx8
-rw-r--r--sfx2/inc/sfx2/tbxctrl.hxx2
-rw-r--r--sfx2/source/toolbox/tbxitem.cxx6
-rw-r--r--svtools/inc/svtools/framestatuslistener.hxx6
-rw-r--r--svtools/source/control/toolbarmenu.cxx9
-rw-r--r--svtools/source/control/toolbarmenuimp.hxx1
-rw-r--r--svtools/source/uno/framestatuslistener.cxx18
7 files changed, 23 insertions, 27 deletions
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 941a1f47807d..cf529fab137f 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -124,7 +124,7 @@ class ImageOrientationListener : public svt::FrameStatusListener
{
public:
ImageOrientationListener( const Reference< XStatusListener > rReceiver,
- const Reference< XMultiServiceFactory > rServiceManager,
+ const Reference< XComponentContext > rxContext,
const Reference< XFrame > rFrame );
virtual ~ImageOrientationListener();
@@ -136,9 +136,9 @@ class ImageOrientationListener : public svt::FrameStatusListener
ImageOrientationListener::ImageOrientationListener(
const Reference< XStatusListener > rReceiver,
- const Reference< XMultiServiceFactory > rServiceManager,
+ const Reference< XComponentContext > rxContext,
const Reference< XFrame > rFrame ) :
- FrameStatusListener( rServiceManager, rFrame ),
+ FrameStatusListener( rxContext, rFrame ),
m_xReceiver( rReceiver )
{
}
@@ -1143,7 +1143,7 @@ void ToolBarManager::AddImageOrientationListener()
m_bImageOrientationRegistered = sal_True;
ImageOrientationListener* pImageOrientation = new ImageOrientationListener(
Reference< XStatusListener >( static_cast< ::cppu::OWeakObject *>( this ), UNO_QUERY ),
- m_xServiceManager,
+ comphelper::getComponentContext(m_xServiceManager),
m_xFrame );
m_xImageOrientationListener = Reference< XComponent >( static_cast< ::cppu::OWeakObject *>(
pImageOrientation ), UNO_QUERY );
diff --git a/sfx2/inc/sfx2/tbxctrl.hxx b/sfx2/inc/sfx2/tbxctrl.hxx
index f675140c752a..c5a890a2a87f 100644
--- a/sfx2/inc/sfx2/tbxctrl.hxx
+++ b/sfx2/inc/sfx2/tbxctrl.hxx
@@ -80,7 +80,7 @@ enum SfxPopupWindowType
class SfxFrameStatusListener : public svt::FrameStatusListener
{
public:
- SfxFrameStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& rServiceManager,
+ SfxFrameStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame,
SfxStatusListenerInterface* pCallee );
virtual ~SfxFrameStatusListener();
diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx
index f88a781da7d4..d2c2ac8d6e0e 100644
--- a/sfx2/source/toolbox/tbxitem.cxx
+++ b/sfx2/source/toolbox/tbxitem.cxx
@@ -1016,10 +1016,10 @@ Window* SfxToolBoxControl::CreateItemWindow( Window * )
//--------------------------------------------------------------------
SfxFrameStatusListener::SfxFrameStatusListener(
- const Reference< XMultiServiceFactory >& rServiceManager,
+ const Reference< XComponentContext >& rxContext,
const Reference< XFrame >& xFrame,
SfxStatusListenerInterface* pCallee ) :
- svt::FrameStatusListener( rServiceManager, xFrame ),
+ svt::FrameStatusListener( rxContext, xFrame ),
m_pCallee( pCallee )
{
}
@@ -1224,7 +1224,7 @@ SfxFrameStatusListener* SfxPopupWindow::GetOrCreateStatusListener()
if ( !m_xStatusListener.is() )
{
m_pStatusListener = new SfxFrameStatusListener(
- ::comphelper::getProcessServiceFactory(),
+ ::comphelper::getProcessComponentContext(),
m_xFrame,
this );
m_xStatusListener = Reference< XComponent >( static_cast< cppu::OWeakObject* >(
diff --git a/svtools/inc/svtools/framestatuslistener.hxx b/svtools/inc/svtools/framestatuslistener.hxx
index 3ef523a5e5e9..cc04fbaf7039 100644
--- a/svtools/inc/svtools/framestatuslistener.hxx
+++ b/svtools/inc/svtools/framestatuslistener.hxx
@@ -21,7 +21,7 @@
#define _SVTOOLS_FRAMESTATUSLISTENER_HXX
#include "svtools/svtdllapi.h"
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/util/XURLTransformer.hpp>
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/frame/XFrameActionListener.hpp>
@@ -43,7 +43,7 @@ class SVT_DLLPUBLIC FrameStatusListener : public ::com::sun::star::frame::XStatu
public ::cppu::OWeakObject
{
public:
- FrameStatusListener( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServiceManager,
+ FrameStatusListener( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame );
virtual ~FrameStatusListener();
@@ -90,7 +90,7 @@ class SVT_DLLPUBLIC FrameStatusListener : public ::com::sun::star::frame::XStatu
sal_Bool m_bInitialized : 1,
m_bDisposed : 1;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > m_xFrame;
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceManager;
+ ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xContext;
URLToDispatchMap m_aListenerMap;
};
diff --git a/svtools/source/control/toolbarmenu.cxx b/svtools/source/control/toolbarmenu.cxx
index e68cffd2c0f9..4b817c110da6 100644
--- a/svtools/source/control/toolbarmenu.cxx
+++ b/svtools/source/control/toolbarmenu.cxx
@@ -193,7 +193,6 @@ Reference< XAccessible > ToolbarMenuEntry::getAccessibleChild( sal_Int32 index )
ToolbarMenu_Impl::ToolbarMenu_Impl( ToolbarMenu& rMenu, const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame )
: mrMenu( rMenu )
, mxFrame( xFrame )
-, mxServiceManager( ::comphelper::getProcessServiceFactory() )
, mnCheckPos(0)
, mnImagePos(0)
, mnTextPos(0)
@@ -1585,8 +1584,7 @@ void SAL_CALL ToolbarMenu::statusChanged( const ::com::sun::star::frame::Feature
class ToolbarMenuStatusListener : public svt::FrameStatusListener
{
public:
- ToolbarMenuStatusListener( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xServiceManager,
- const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame,
+ ToolbarMenuStatusListener( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame,
ToolbarMenu& rToolbarMenu );
virtual void SAL_CALL dispose() throw (::com::sun::star::uno::RuntimeException);
@@ -1598,10 +1596,9 @@ public:
// --------------------------------------------------------------------
ToolbarMenuStatusListener::ToolbarMenuStatusListener(
- const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& xServiceManager,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame,
ToolbarMenu& rToolbarMenu )
-: svt::FrameStatusListener( xServiceManager, xFrame )
+: svt::FrameStatusListener( ::comphelper::getProcessComponentContext(), xFrame )
, mpMenu( &rToolbarMenu )
{
}
@@ -1627,7 +1624,7 @@ void SAL_CALL ToolbarMenuStatusListener::statusChanged( const ::com::sun::star::
void ToolbarMenu::initStatusListener()
{
if( !mpImpl->mxStatusListener.is() )
- mpImpl->mxStatusListener.set( new ToolbarMenuStatusListener( mpImpl->mxServiceManager, mpImpl->mxFrame, *this ) );
+ mpImpl->mxStatusListener.set( new ToolbarMenuStatusListener( mpImpl->mxFrame, *this ) );
}
// --------------------------------------------------------------------
diff --git a/svtools/source/control/toolbarmenuimp.hxx b/svtools/source/control/toolbarmenuimp.hxx
index 163e4cc91436..81c71a3955aa 100644
--- a/svtools/source/control/toolbarmenuimp.hxx
+++ b/svtools/source/control/toolbarmenuimp.hxx
@@ -270,7 +270,6 @@ struct ToolbarMenu_Impl
::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > mxFrame;
rtl::Reference< svt::FrameStatusListener > mxStatusListener;
- ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > mxServiceManager;
rtl::Reference< ToolbarMenuAcc > mxAccessible;
::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > mxOldSelection;
diff --git a/svtools/source/uno/framestatuslistener.cxx b/svtools/source/uno/framestatuslistener.cxx
index 008321eb0f57..5e42e7150d34 100644
--- a/svtools/source/uno/framestatuslistener.cxx
+++ b/svtools/source/uno/framestatuslistener.cxx
@@ -37,13 +37,13 @@ namespace svt
{
FrameStatusListener::FrameStatusListener(
- const Reference< XMultiServiceFactory >& rServiceManager,
+ const Reference< XComponentContext >& rxContext,
const Reference< XFrame >& xFrame ) :
OWeakObject()
, m_bInitialized( sal_True )
, m_bDisposed( sal_False )
, m_xFrame( xFrame )
- , m_xServiceManager( rServiceManager )
+ , m_xContext( rxContext )
{
}
@@ -96,7 +96,7 @@ throw (::com::sun::star::uno::RuntimeException)
try
{
Reference< XDispatch > xDispatch( pIter->second );
- Reference< XURLTransformer > xURLTransformer( com::sun::star::util::URLTransformer::create( ::comphelper::getComponentContext(m_xServiceManager) ) );
+ Reference< XURLTransformer > xURLTransformer( com::sun::star::util::URLTransformer::create( m_xContext ) );
com::sun::star::util::URL aTargetURL;
aTargetURL.Complete = pIter->first;
xURLTransformer->parseStrict( aTargetURL );
@@ -181,9 +181,9 @@ void FrameStatusListener::addStatusListener( const rtl::OUString& aCommandURL )
{
// Add status listener directly as intialize has already been called.
Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
- if ( m_xServiceManager.is() && xDispatchProvider.is() )
+ if ( m_xContext.is() && xDispatchProvider.is() )
{
- Reference< XURLTransformer > xURLTransformer( com::sun::star::util::URLTransformer::create( ::comphelper::getComponentContext(m_xServiceManager) ) );
+ Reference< XURLTransformer > xURLTransformer( com::sun::star::util::URLTransformer::create( m_xContext ) );
aTargetURL.Complete = aCommandURL;
xURLTransformer->parseStrict( aTargetURL );
xDispatch = xDispatchProvider->queryDispatch( aTargetURL, ::rtl::OUString(), 0 );
@@ -235,13 +235,13 @@ void FrameStatusListener::bindListener()
// Collect all registered command URL's and store them temporary
Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
- if ( m_xServiceManager.is() && xDispatchProvider.is() )
+ if ( m_xContext.is() && xDispatchProvider.is() )
{
xStatusListener = Reference< XStatusListener >( static_cast< OWeakObject* >( this ), UNO_QUERY );
URLToDispatchMap::iterator pIter = m_aListenerMap.begin();
while ( pIter != m_aListenerMap.end() )
{
- Reference< XURLTransformer > xURLTransformer( com::sun::star::util::URLTransformer::create( ::comphelper::getComponentContext(m_xServiceManager) ) );
+ Reference< XURLTransformer > xURLTransformer( com::sun::star::util::URLTransformer::create( m_xContext ) );
com::sun::star::util::URL aTargetURL;
aTargetURL.Complete = pIter->first;
xURLTransformer->parseStrict( aTargetURL );
@@ -304,13 +304,13 @@ void FrameStatusListener::unbindListener()
// Collect all registered command URL's and store them temporary
Reference< XDispatchProvider > xDispatchProvider( m_xFrame, UNO_QUERY );
- if ( m_xServiceManager.is() && xDispatchProvider.is() )
+ if ( m_xContext.is() && xDispatchProvider.is() )
{
Reference< XStatusListener > xStatusListener( static_cast< OWeakObject* >( this ), UNO_QUERY );
URLToDispatchMap::iterator pIter = m_aListenerMap.begin();
while ( pIter != m_aListenerMap.end() )
{
- Reference< XURLTransformer > xURLTransformer( com::sun::star::util::URLTransformer::create( ::comphelper::getComponentContext(m_xServiceManager) ) );
+ Reference< XURLTransformer > xURLTransformer( com::sun::star::util::URLTransformer::create( m_xContext ) );
com::sun::star::util::URL aTargetURL;
aTargetURL.Complete = pIter->first;
xURLTransformer->parseStrict( aTargetURL );
generated by cgit (git 2.34.1) at 2025-02-21 22:07:24 +0000