mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fdo#46808, Convert XMultiServiceFactory to XComponentContext

Browse Source 
Change-Id: I4325e553d010bb93794f897b41a602a5f849d4a6
This commit is contained in:
Noel Grandin
2013-05-21 15:11:02 +02:00
parent 122e4bc598
commit 1a2ab98ab8
3 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
framework/inc/uielement/statusbarmanager.hxx
View File

@@ -32,7 +32,7 @@
#include <com/sun/star/frame/XUIControllerFactory.hpp> #include <com/sun/star/frame/XUIControllerFactory.hpp>
#include <com/sun/star/ui/XUIConfiguration.hpp> #include <com/sun/star/ui/XUIConfiguration.hpp>
#include <com/sun/star/frame/XModuleManager.hpp> #include <com/sun/star/frame/XModuleManager.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/uno/XComponentContext.hpp>
#include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/container/XNameAccess.hpp>
#include <rtl/ustring.hxx> #include <rtl/ustring.hxx>
@@ -55,7 +55,7 @@ class StatusBarManager : public ::com::sun::star::frame::XFrameActionListener
friend class FrameworkStatusBar; friend class FrameworkStatusBar;
public: public:
StatusBarManager( const com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory >& rServicveManager, StatusBarManager( const com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext >& rxContext,
const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame, const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& rFrame,
const OUString& rResourceName, const OUString& rResourceName,
StatusBar* pStatusBar ); StatusBar* pStatusBar );
@@ -117,8 +117,8 @@ class StatusBarManager : public ::com::sun::star::frame::XFrameActionListener
com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > m_xUICommandLabels; com::sun::star::uno::Reference< com::sun::star::container::XNameAccess > m_xUICommandLabels;
StatusBarControllerMap m_aControllerMap; StatusBarControllerMap m_aControllerMap;
::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener ::cppu::OMultiTypeInterfaceContainerHelper m_aListenerContainer; /// container for ALL Listener
::com::sun::star::uno::Reference< com::sun::star::lang::XMultiServiceFactory > m_xServiceManager; ::com::sun::star::uno::Reference< com::sun::star::uno::XComponentContext > m_xContext;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XUIControllerFactory > m_xStatusbarControllerFactory; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XUIControllerFactory > m_xStatusbarControllerFactory;
}; };
} }

22
framework/source/uielement/statusbarmanager.cxx
View File

@@ -156,7 +156,7 @@ DEFINE_XTYPEPROVIDER_5 ( StatusBarManager
) )
StatusBarManager::StatusBarManager( StatusBarManager::StatusBarManager(
const uno::Reference< lang::XMultiServiceFactory >& rServiceManager, const uno::Reference< uno::XComponentContext >& rxContext,
const uno::Reference< frame::XFrame >& rFrame, const uno::Reference< frame::XFrame >& rFrame,
const OUString& rResourceName, const OUString& rResourceName,
StatusBar* pStatusBar ) : StatusBar* pStatusBar ) :
@@ -170,7 +170,7 @@ StatusBarManager::StatusBarManager(
m_aResourceName( rResourceName ), m_aResourceName( rResourceName ),
m_xFrame( rFrame ), m_xFrame( rFrame ),
m_aListenerContainer( m_aLock.getShareableOslMutex() ), m_aListenerContainer( m_aLock.getShareableOslMutex() ),
m_xServiceManager( rServiceManager ) m_xContext( rxContext )
{ {
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarManager::StatusBarManager" ); RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarManager::StatusBarManager" );
@@ -217,7 +217,7 @@ void SAL_CALL StatusBarManager::disposing( const lang::EventObject& Source ) thr
if ( Source.Source == uno::Reference< uno::XInterface >( m_xFrame, uno::UNO_QUERY )) if ( Source.Source == uno::Reference< uno::XInterface >( m_xFrame, uno::UNO_QUERY ))
m_xFrame.clear(); m_xFrame.clear();
m_xServiceManager.clear(); m_xContext.clear();
} }
} }
@@ -263,7 +263,7 @@ void SAL_CALL StatusBarManager::dispose() throw( uno::RuntimeException )
} }
m_xFrame.clear(); m_xFrame.clear();
m_xServiceManager.clear(); m_xContext.clear();
m_bDisposed = sal_True; m_bDisposed = sal_True;
} }
@@ -347,14 +347,12 @@ void StatusBarManager::RemoveControllers()
OUString StatusBarManager::RetrieveLabelFromCommand( const OUString& aCmdURL ) OUString StatusBarManager::RetrieveLabelFromCommand( const OUString& aCmdURL )
{ {
return framework::RetrieveLabelFromCommand(aCmdURL, comphelper::getComponentContext(m_xServiceManager), m_xUICommandLabels,m_xFrame,m_aModuleIdentifier,m_bModuleIdentified,"Name"); return framework::RetrieveLabelFromCommand(aCmdURL, m_xContext, m_xUICommandLabels,m_xFrame,m_aModuleIdentifier,m_bModuleIdentified,"Name");
} }
void StatusBarManager::CreateControllers() void StatusBarManager::CreateControllers()
{ {
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarManager::CreateControllers" ); RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "framework", "Ocke.Janssen@sun.com", "StatusBarManager::CreateControllers" );
uno::Reference< uno::XComponentContext > xComponentContext(
comphelper::getComponentContext( m_xServiceManager ) );
uno::Reference< awt::XWindow > xStatusbarWindow = VCLUnoHelper::GetInterface( m_pStatusBar ); uno::Reference< awt::XWindow > xStatusbarWindow = VCLUnoHelper::GetInterface( m_pStatusBar );
for ( sal_uInt16 i = 0; i < m_pStatusBar->GetItemCount(); i++ ) for ( sal_uInt16 i = 0; i < m_pStatusBar->GetItemCount(); i++ )
@@ -390,7 +388,7 @@ void StatusBarManager::CreateControllers()
// TODO remove this // TODO remove this
aPropValue.Name = OUString( "ServiceManager" ); aPropValue.Name = OUString( "ServiceManager" );
aPropValue.Value = uno::makeAny( m_xServiceManager ); aPropValue.Value = uno::makeAny( uno::Reference<lang::XMultiServiceFactory>(m_xContext->getServiceManager(), uno::UNO_QUERY_THROW) );
aPropVector.push_back( uno::makeAny( aPropValue ) ); aPropVector.push_back( uno::makeAny( aPropValue ) );
aPropValue.Name = OUString( "ParentWindow" ); aPropValue.Name = OUString( "ParentWindow" );
@@ -409,7 +407,7 @@ void StatusBarManager::CreateControllers()
uno::Sequence< uno::Any > aArgs( comphelper::containerToSequence( aPropVector ) ); uno::Sequence< uno::Any > aArgs( comphelper::containerToSequence( aPropVector ) );
xController = uno::Reference< frame::XStatusListener >( xController = uno::Reference< frame::XStatusListener >(
m_xStatusbarControllerFactory->createInstanceWithArgumentsAndContext( m_xStatusbarControllerFactory->createInstanceWithArgumentsAndContext(
aCommandURL, aArgs, xComponentContext ), aCommandURL, aArgs, m_xContext ),
uno::UNO_QUERY ); uno::UNO_QUERY );
bInit = sal_False; // Initialization is done through the factory service bInit = sal_False; // Initialization is done through the factory service
} }
@@ -423,7 +421,7 @@ void StatusBarManager::CreateControllers()
// 3º) Is Add-on? Generic statusbar controller // 3º) Is Add-on? Generic statusbar controller
if ( pItemData ) if ( pItemData )
{ {
pController = new GenericStatusbarController( m_xServiceManager, pController = new GenericStatusbarController( uno::Reference<lang::XMultiServiceFactory>(m_xContext->getServiceManager(), uno::UNO_QUERY_THROW),
m_xFrame, m_xFrame,
xStatusbarItem, xStatusbarItem,
pItemData ); pItemData );
@@ -431,7 +429,7 @@ void StatusBarManager::CreateControllers()
else else
{ {
// 4º) Default Statusbar controller // 4º) Default Statusbar controller
pController = new svt::StatusbarController( m_xServiceManager, m_xFrame, aCommandURL, nId ); pController = new svt::StatusbarController( uno::Reference<lang::XMultiServiceFactory>(m_xContext->getServiceManager(), uno::UNO_QUERY_THROW), m_xFrame, aCommandURL, nId );
} }
} }
@@ -457,7 +455,7 @@ void StatusBarManager::CreateControllers()
aPropValue.Value = uno::makeAny( aCommandURL ); aPropValue.Value = uno::makeAny( aCommandURL );
aArgs[1] = uno::makeAny( aPropValue ); aArgs[1] = uno::makeAny( aPropValue );
aPropValue.Name = OUString( "ServiceManager" ); aPropValue.Name = OUString( "ServiceManager" );
aPropValue.Value = uno::makeAny( m_xServiceManager ); aPropValue.Value = uno::makeAny( uno::Reference<lang::XMultiServiceFactory>(m_xContext->getServiceManager(), uno::UNO_QUERY_THROW) );
aArgs[2] = uno::makeAny( aPropValue ); aArgs[2] = uno::makeAny( aPropValue );
aPropValue.Name = OUString( "ParentWindow" ); aPropValue.Name = OUString( "ParentWindow" );
aPropValue.Value = uno::makeAny( xStatusbarWindow ); aPropValue.Value = uno::makeAny( xStatusbarWindow );

2
framework/source/uielement/statusbarwrapper.cxx
View File

@@ -114,7 +114,7 @@ void SAL_CALL StatusBarWrapper::initialize( const Sequence< Any >& aArguments )
sal_uLong nStyles = WinBits( WB_LEFT | WB_3DLOOK ); sal_uLong nStyles = WinBits( WB_LEFT | WB_3DLOOK );
pStatusBar = new FrameworkStatusBar( pWindow, nStyles ); pStatusBar = new FrameworkStatusBar( pWindow, nStyles );
pStatusBarManager = new StatusBarManager( Reference<XMultiServiceFactory>(m_xContext->getServiceManager(), UNO_QUERY_THROW), xFrame, m_aResourceURL, pStatusBar ); pStatusBarManager = new StatusBarManager( m_xContext, xFrame, m_aResourceURL, pStatusBar );
((FrameworkStatusBar*)pStatusBar)->SetStatusBarManager( pStatusBarManager ); ((FrameworkStatusBar*)pStatusBar)->SetStatusBarManager( pStatusBarManager );
m_xStatusBarManager = Reference< XComponent >( static_cast< OWeakObject *>( pStatusBarManager ), UNO_QUERY ); m_xStatusBarManager = Reference< XComponent >( static_cast< OWeakObject *>( pStatusBarManager ), UNO_QUERY );
pStatusBar->SetUniqueId( HID_STATUSBAR ); pStatusBar->SetUniqueId( HID_STATUSBAR );