diff options
| author | Noel Grandin <noel@peralex.com> | 2012-10-17 10:52:52 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2012-10-24 16:49:49 +0200 |
| commit | 33a0f8ce656c8c5bb9c3c3deaa10c182e262b374 (patch) | |
| tree | abd469ffb224c8d7b2de1cf76e3aada03e035fc1 /UnoControls/inc | |
| parent | f252b332dd2652abb02851ba0c2521c045787801 (diff) | |
fdo#46808, Adapt awt::Toolkit UNO service to new style
Create a merged XToolkit2 interface for this service to implement.
Which is backwards-compatible, but does not require creating a new service.
Also mark sub-interfaces as non-optional.
Change-Id: I278d0288e92be277033013302267cf93f7d70480
Diffstat (limited to 'UnoControls/inc')
| -rw-r--r-- | UnoControls/inc/basecontainercontrol.hxx | 2 | ||||
| -rw-r--r-- | UnoControls/inc/basecontrol.hxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/UnoControls/inc/basecontainercontrol.hxx b/UnoControls/inc/basecontainercontrol.hxx index 857a8d7c50a2..a6a0906bdb08 100644 --- a/UnoControls/inc/basecontainercontrol.hxx +++ b/UnoControls/inc/basecontainercontrol.hxx @@ -78,7 +78,7 @@ public: @onerror - */ - BaseContainerControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory ); + BaseContainerControl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); /**_______________________________________________________________________________________________________ @short - diff --git a/UnoControls/inc/basecontrol.hxx b/UnoControls/inc/basecontrol.hxx index f54033ef84d8..0aa633d41f95 100644 --- a/UnoControls/inc/basecontrol.hxx +++ b/UnoControls/inc/basecontrol.hxx @@ -144,7 +144,7 @@ public: @onerror - */ - BaseControl( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& xFactory ); + BaseControl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); /**_______________________________________________________________________________________________________ @short - @@ -1049,7 +1049,7 @@ protected: @onerror - */ - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > impl_getMultiServiceFactory(); + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > impl_getComponentContext(); /**_______________________________________________________________________________________________________ @short - @@ -1217,7 +1217,7 @@ private: private: - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory ; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xComponentContext ; ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xDelegator ; OMRCListenerMultiplexerHelper* m_pMultiplexer ; // multiplex events ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > m_xMultiplexer ; |