diff options
Diffstat (limited to 'extensions')
18 files changed, 44 insertions, 49 deletions
diff --git a/extensions/source/abpilot/abspage.cxx b/extensions/source/abpilot/abspage.cxx index 7faca9d24fcf..3b3868402bca 100644 --- a/extensions/source/abpilot/abspage.cxx +++ b/extensions/source/abpilot/abspage.cxx @@ -68,7 +68,7 @@ namespace abp } //--------------------------------------------------------------------- - Reference< XMultiServiceFactory > AddressBookSourcePage::getORB() + const Reference< XComponentContext > & AddressBookSourcePage::getORB() { return getDialog()->getORB(); } diff --git a/extensions/source/abpilot/abspage.hxx b/extensions/source/abpilot/abspage.hxx index 169ed9ae4849..d8369c31e899 100644 --- a/extensions/source/abpilot/abspage.hxx +++ b/extensions/source/abpilot/abspage.hxx @@ -48,7 +48,7 @@ namespace abp // helper OAddessBookSourcePilot* getDialog(); const OAddessBookSourcePilot* getDialog() const; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > & getORB(); AddressSettings& getSettings(); const AddressSettings& getSettings() const; diff --git a/extensions/source/abpilot/abspilot.cxx b/extensions/source/abpilot/abspilot.cxx index f6789bb08dc8..e0ba2de14dbf 100644 --- a/extensions/source/abpilot/abspilot.cxx +++ b/extensions/source/abpilot/abspilot.cxx @@ -57,7 +57,7 @@ namespace abp //= OAddessBookSourcePilot //===================================================================== //--------------------------------------------------------------------- - OAddessBookSourcePilot::OAddessBookSourcePilot(Window* _pParent, const Reference< XMultiServiceFactory >& _rxORB) + OAddessBookSourcePilot::OAddessBookSourcePilot(Window* _pParent, const Reference< XComponentContext >& _rxORB) :OAddessBookSourcePilot_Base( _pParent, ModuleRes( RID_DLG_ADDRESSBOOKSOURCEPILOT ), WZB_HELP | WZB_FINISH | WZB_CANCEL | WZB_NEXT | WZB_PREVIOUS ) ,m_xORB(_rxORB) @@ -172,10 +172,10 @@ namespace abp m_aNewDataSource.registerDataSource(m_aSettings.sRegisteredDataSourceName); // 3. write the data source / table names into the configuration - addressconfig::writeTemplateAddressSource( comphelper::getComponentContext(getORB()), m_aSettings.bRegisterDataSource ? m_aSettings.sRegisteredDataSourceName : m_aSettings.sDataSourceName, m_aSettings.sSelectedTable ); + addressconfig::writeTemplateAddressSource( getORB(), m_aSettings.bRegisterDataSource ? m_aSettings.sRegisteredDataSourceName : m_aSettings.sDataSourceName, m_aSettings.sSelectedTable ); // 4. write the field mapping - fieldmapping::writeTemplateAddressFieldMapping( comphelper::getComponentContext(getORB()), m_aSettings.aFieldMapping ); + fieldmapping::writeTemplateAddressFieldMapping( getORB(), m_aSettings.aFieldMapping ); } //--------------------------------------------------------------------- @@ -215,7 +215,7 @@ namespace abp implCommitAll(); - addressconfig::markPilotSuccess( comphelper::getComponentContext(getORB()) ); + addressconfig::markPilotSuccess( getORB() ); return sal_True; } @@ -327,7 +327,7 @@ namespace abp { DBG_ASSERT( !needManualFieldMapping( ), "OAddessBookSourcePilot::implDoAutoFieldMapping: invalid call!" ); - fieldmapping::defaultMapping( comphelper::getComponentContext(getORB()), m_aSettings.aFieldMapping ); + fieldmapping::defaultMapping( getORB(), m_aSettings.aFieldMapping ); } //--------------------------------------------------------------------- diff --git a/extensions/source/abpilot/abspilot.hxx b/extensions/source/abpilot/abspilot.hxx index 8a50a763bb75..8982e71010cb 100644 --- a/extensions/source/abpilot/abspilot.hxx +++ b/extensions/source/abpilot/abspilot.hxx @@ -20,7 +20,6 @@ #ifndef EXTENSIONS_ABSPILOT_HXX #define EXTENSIONS_ABSPILOT_HXX -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <svtools/roadmapwizard.hxx> #include "addresssettings.hxx" #include <vcl/fixed.hxx> @@ -38,7 +37,7 @@ namespace abp class OAddessBookSourcePilot : public OAddessBookSourcePilot_Base { protected: - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xORB; AddressSettings m_aSettings; @@ -49,12 +48,12 @@ namespace abp /// ctor OAddessBookSourcePilot( Window* _pParent, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB); + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB); /// dtor ~OAddessBookSourcePilot(); /// get the service factory which was used to create the dialog - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& getORB() { return m_xORB; } AddressSettings& getSettings() { return m_aSettings; } const AddressSettings& getSettings() const { return m_aSettings; } diff --git a/extensions/source/abpilot/admininvokationpage.cxx b/extensions/source/abpilot/admininvokationpage.cxx index 0528191f9d91..9ce84904c5a3 100644 --- a/extensions/source/abpilot/admininvokationpage.cxx +++ b/extensions/source/abpilot/admininvokationpage.cxx @@ -89,7 +89,7 @@ namespace abp //--------------------------------------------------------------------- IMPL_LINK( AdminDialogInvokationPage, OnInvokeAdminDialog, void*, /*NOTINTERESTEDIN*/ ) { - OAdminDialogInvokation aInvokation( comphelper::getComponentContext(getORB()), getDialog()->getDataSource().getDataSource(), getDialog() ); + OAdminDialogInvokation aInvokation( getORB(), getDialog()->getDataSource().getDataSource(), getDialog() ); if ( aInvokation.invokeAdministration( AST_LDAP == getSettings().eType ) ) { // try to connect to this data source diff --git a/extensions/source/abpilot/datasourcehandling.cxx b/extensions/source/abpilot/datasourcehandling.cxx index 5ea8c5b0e639..d5cf04e34ebe 100644 --- a/extensions/source/abpilot/datasourcehandling.cxx +++ b/extensions/source/abpilot/datasourcehandling.cxx @@ -27,7 +27,6 @@ #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/frame/XStorable.hpp> #include <com/sun/star/lang/XComponent.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XSingleServiceFactory.hpp> #include <com/sun/star/sdb/DatabaseContext.hpp> #include <com/sun/star/sdb/SQLContext.hpp> @@ -110,7 +109,7 @@ namespace abp //--------------------------------------------------------------------- /// creates and inserts a data source, and sets it's URL property to the string given static ODataSource lcl_implCreateAndSetURL( - const Reference< XMultiServiceFactory >& _rxORB, const ::rtl::OUString& _rName, + const Reference< XComponentContext >& _rxORB, const ::rtl::OUString& _rName, const sal_Char* _pInitialAsciiURL ) SAL_THROW (( )) { ODataSource aReturn( _rxORB ); @@ -118,7 +117,7 @@ namespace abp { // create the new data source Reference< XPropertySet > xNewDataSource; - lcl_implCreateAndInsert( comphelper::getComponentContext(_rxORB), _rName, xNewDataSource ); + lcl_implCreateAndInsert( _rxORB, _rName, xNewDataSource ); //............................................................. // set the URL property @@ -141,16 +140,14 @@ namespace abp } //--------------------------------------------------------------------- void lcl_registerDataSource( - const Reference< XMultiServiceFactory >& _rxORB, const ::rtl::OUString& _sName, + const Reference< XComponentContext >& _rxORB, const ::rtl::OUString& _sName, const ::rtl::OUString& _sURL ) SAL_THROW (( ::com::sun::star::uno::Exception )) { OSL_ENSURE( !_sName.isEmpty(), "lcl_registerDataSource: invalid name!" ); OSL_ENSURE( !_sURL.isEmpty(), "lcl_registerDataSource: invalid URL!" ); try { - Reference< XDatabaseContext > xRegistrations( - DatabaseContext::create( - comphelper::getComponentContext(_rxORB))); + Reference< XDatabaseContext > xRegistrations( DatabaseContext::create(_rxORB) ); if ( xRegistrations->hasRegisteredDatabase( _sName ) ) xRegistrations->changeDatabaseLocation( _sName, _sURL ); else @@ -167,11 +164,11 @@ namespace abp //===================================================================== struct ODataSourceContextImpl { - Reference< XMultiServiceFactory > xORB; + Reference< XComponentContext > xORB; Reference< XNameAccess > xContext; /// the UNO data source context StringBag aDataSourceNames; /// for quicker name checks (without the UNO overhead) - ODataSourceContextImpl( const Reference< XMultiServiceFactory >& _rxORB ) : xORB( _rxORB ) { } + ODataSourceContextImpl( const Reference< XComponentContext >& _rxORB ) : xORB( _rxORB ) { } ODataSourceContextImpl( const ODataSourceContextImpl& _rSource ) :xORB ( _rSource.xORB ) ,xContext ( _rSource.xContext ) @@ -183,14 +180,14 @@ namespace abp //= ODataSourceContext //===================================================================== //--------------------------------------------------------------------- - ODataSourceContext::ODataSourceContext(const Reference< XMultiServiceFactory >& _rxORB) + ODataSourceContext::ODataSourceContext(const Reference< XComponentContext >& _rxORB) :m_pImpl( new ODataSourceContextImpl( _rxORB ) ) { try { // create the UNO context m_pImpl->xContext = Reference<XNameAccess>( - lcl_getDataSourceContext( comphelper::getComponentContext(_rxORB) ), + lcl_getDataSourceContext( _rxORB ), UNO_QUERY_THROW); if (m_pImpl->xContext.is()) @@ -309,7 +306,7 @@ namespace abp struct ODataSourceImpl { public: - Reference< XMultiServiceFactory > xORB; /// the service factory + Reference< XComponentContext > xORB; /// the service factory Reference< XPropertySet > xDataSource; /// the UNO data source ::utl::SharedUNOComponent< XConnection > xConnection; @@ -317,7 +314,7 @@ namespace abp ::rtl::OUString sName; sal_Bool bTablesUpToDate; // table name cache up-to-date? - ODataSourceImpl( const Reference< XMultiServiceFactory >& _rxORB ) + ODataSourceImpl( const Reference< XComponentContext >& _rxORB ) :xORB( _rxORB ) ,bTablesUpToDate( sal_False ) { @@ -359,7 +356,7 @@ namespace abp } //--------------------------------------------------------------------- - ODataSource::ODataSource( const Reference< XMultiServiceFactory >& _rxORB ) + ODataSource::ODataSource( const Reference< XComponentContext >& _rxORB ) :m_pImpl(new ODataSourceImpl(_rxORB)) { } @@ -523,7 +520,7 @@ namespace abp try { xInteractions.set( - InteractionHandler::createWithParent(comphelper::getComponentContext(m_pImpl->xORB), 0), + InteractionHandler::createWithParent(m_pImpl->xORB, 0), UNO_QUERY); } catch(const Exception&) diff --git a/extensions/source/abpilot/datasourcehandling.hxx b/extensions/source/abpilot/datasourcehandling.hxx index 3a2dab84d7a9..218baaa53697 100644 --- a/extensions/source/abpilot/datasourcehandling.hxx +++ b/extensions/source/abpilot/datasourcehandling.hxx @@ -25,9 +25,6 @@ //======================================================================== namespace com { namespace sun { namespace star { - namespace lang { - class XMultiServiceFactory; - } namespace beans { class XPropertySet; } @@ -54,7 +51,7 @@ namespace abp public: ODataSourceContext( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB ); ~ODataSourceContext(); @@ -120,7 +117,7 @@ namespace abp // ---------------------------------------------------------------- /// constructs an object which is initially invalid ODataSource( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB ); /// copy ctor diff --git a/extensions/source/abpilot/fieldmappingpage.cxx b/extensions/source/abpilot/fieldmappingpage.cxx index 1e2077c36e71..12a51bd5985c 100644 --- a/extensions/source/abpilot/fieldmappingpage.cxx +++ b/extensions/source/abpilot/fieldmappingpage.cxx @@ -92,7 +92,7 @@ namespace abp AddressSettings& rSettings = getSettings(); // invoke the dialog doing the mapping - if ( fieldmapping::invokeDialog( comphelper::getComponentContext(getORB()), this, getDialog()->getDataSource().getDataSource(), rSettings ) ) + if ( fieldmapping::invokeDialog( getORB(), this, getDialog()->getDataSource().getDataSource(), rSettings ) ) { if ( rSettings.aFieldMapping.size() ) getDialog()->travelNext(); diff --git a/extensions/source/abpilot/typeselectionpage.cxx b/extensions/source/abpilot/typeselectionpage.cxx index 34563504581b..caa2638f3500 100644 --- a/extensions/source/abpilot/typeselectionpage.cxx +++ b/extensions/source/abpilot/typeselectionpage.cxx @@ -95,7 +95,7 @@ namespace abp #else bWithMork = true; - Reference< XDriverManager2 > xManager = DriverManager::create( comphelper::getComponentContext( _pParent->getORB() ) ); + Reference< XDriverManager2 > xManager = DriverManager::create( _pParent->getORB() ); try { diff --git a/extensions/source/abpilot/unodialogabp.cxx b/extensions/source/abpilot/unodialogabp.cxx index f6799253653a..e3b24715c7e9 100644 --- a/extensions/source/abpilot/unodialogabp.cxx +++ b/extensions/source/abpilot/unodialogabp.cxx @@ -20,6 +20,7 @@ #include "unodialogabp.hxx" #include <cppuhelper/typeprovider.hxx> #include "abspilot.hxx" +#include <comphelper/processfactory.hxx> #include <comphelper/sequence.hxx> #include <vcl/msgbox.hxx> @@ -44,7 +45,7 @@ namespace abp //= OABSPilotUno //===================================================================== //--------------------------------------------------------------------- - OABSPilotUno::OABSPilotUno(const Reference< XMultiServiceFactory >& _rxORB) + OABSPilotUno::OABSPilotUno(const Reference< XComponentContext >& _rxORB) :OGenericUnoDialog(_rxORB) { registerProperty( ::rtl::OUString("DataSourceName"), PROPERTY_ID_DATASOURCENAME, PropertyAttribute::READONLY , @@ -98,7 +99,7 @@ namespace abp //--------------------------------------------------------------------- Reference< XInterface > SAL_CALL OABSPilotUno::Create(const Reference< XMultiServiceFactory >& _rxFactory) { - return *(new OABSPilotUno(_rxFactory)); + return *(new OABSPilotUno( comphelper::getComponentContext(_rxFactory) )); } //--------------------------------------------------------------------- @@ -163,7 +164,7 @@ namespace abp //-------------------------------------------------------------------------- Dialog* OABSPilotUno::createDialog(Window* _pParent) { - return new OAddessBookSourcePilot(_pParent, m_aContext.getLegacyServiceFactory()); + return new OAddessBookSourcePilot(_pParent, m_aContext ); } //-------------------------------------------------------------------------- diff --git a/extensions/source/abpilot/unodialogabp.hxx b/extensions/source/abpilot/unodialogabp.hxx index ccfcb4e8f78a..eeccb16ef1e3 100644 --- a/extensions/source/abpilot/unodialogabp.hxx +++ b/extensions/source/abpilot/unodialogabp.hxx @@ -46,7 +46,7 @@ namespace abp ,public OABSPilotUno_PBase { ::rtl::OUString m_sDataSourceName; - OABSPilotUno(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB); + OABSPilotUno(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB); public: // XInterface (disambiguation) diff --git a/extensions/source/dbpilots/unoautopilot.hxx b/extensions/source/dbpilots/unoautopilot.hxx index 7b5fdc75564f..fc75e21b509a 100644 --- a/extensions/source/dbpilots/unoautopilot.hxx +++ b/extensions/source/dbpilots/unoautopilot.hxx @@ -21,6 +21,7 @@ #define _EXTENSIONS_DBP_UNOAUTOPILOT_HXX_ #include <svtools/genericunodialog.hxx> +#include <comphelper/processfactory.hxx> #include <comphelper/proparrhlp.hxx> #include "componentmodule.hxx" #include <cppuhelper/typeprovider.hxx> @@ -55,7 +56,7 @@ namespace dbp ,public ::comphelper::OPropertyArrayUsageHelper< OUnoAutoPilot< TYPE, SERVICEINFO > > ,public OModuleResourceClient { - OUnoAutoPilot(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB); + OUnoAutoPilot(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB); protected: ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > diff --git a/extensions/source/dbpilots/unoautopilot.inl b/extensions/source/dbpilots/unoautopilot.inl index 9375243425bd..0ab9dc2219f4 100644 --- a/extensions/source/dbpilots/unoautopilot.inl +++ b/extensions/source/dbpilots/unoautopilot.inl @@ -23,7 +23,7 @@ //= OUnoAutoPilot //===================================================================== template <class TYPE, class SERVICEINFO> -OUnoAutoPilot<TYPE, SERVICEINFO>::OUnoAutoPilot(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB) +OUnoAutoPilot<TYPE, SERVICEINFO>::OUnoAutoPilot(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB) :OUnoAutoPilot_Base(_rxORB) { } @@ -40,7 +40,7 @@ template <class TYPE, class SERVICEINFO> template <class TYPE, class SERVICEINFO> ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL OUnoAutoPilot<TYPE, SERVICEINFO>::Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) { - return *(new OUnoAutoPilot<TYPE, SERVICEINFO>(_rxFactory)); + return *(new OUnoAutoPilot<TYPE, SERVICEINFO>( comphelper::getComponentContext(_rxFactory) )); } //--------------------------------------------------------------------- @@ -99,7 +99,7 @@ template <class TYPE, class SERVICEINFO> template <class TYPE, class SERVICEINFO> Dialog* OUnoAutoPilot<TYPE, SERVICEINFO>::createDialog(Window* _pParent) { - return new TYPE(_pParent, m_xObjectModel, m_aContext.getUNOContext()); + return new TYPE(_pParent, m_xObjectModel, m_aContext); } //-------------------------------------------------------------------------- diff --git a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx index a675117b6f5a..e8c3a34d0098 100644 --- a/extensions/source/propctrlr/MasterDetailLinkDialog.cxx +++ b/extensions/source/propctrlr/MasterDetailLinkDialog.cxx @@ -105,7 +105,7 @@ namespace pcr //-------------------------------------------------------------------------- Dialog* MasterDetailLinkDialog::createDialog(Window* _pParent) { - return new FormLinkDialog(_pParent,m_xDetail,m_xMaster,m_aContext.getUNOContext() + return new FormLinkDialog(_pParent,m_xDetail,m_xMaster, m_aContext ,m_sExplanation,m_sDetailLabel,m_sMasterLabel); } //--------------------------------------------------------------------- diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx index 82e5d9220222..eff0c8e8c70b 100644 --- a/extensions/source/propctrlr/formcomponenthandler.cxx +++ b/extensions/source/propctrlr/formcomponenthandler.cxx @@ -2957,7 +2957,7 @@ namespace pcr impl_getDefaultDialogParent_nothrow(), xTabControllerModel, impl_getContextControlContainer_nothrow(), - m_aContext.getLegacyServiceFactory() + m_aContext.getUNOContext() ); _rClearBeforeDialog.clear(); return ( RET_OK == aDialog.Execute() ); diff --git a/extensions/source/propctrlr/pcrunodialogs.cxx b/extensions/source/propctrlr/pcrunodialogs.cxx index fb6e27d47e75..8fa73ae40d3c 100644 --- a/extensions/source/propctrlr/pcrunodialogs.cxx +++ b/extensions/source/propctrlr/pcrunodialogs.cxx @@ -127,7 +127,7 @@ namespace pcr //-------------------------------------------------------------------------- Dialog* OTabOrderDialog::createDialog( Window* _pParent ) { - return new TabOrderDialog( _pParent, m_xTabbingModel, m_xControlContext, m_aContext.getLegacyServiceFactory() ); + return new TabOrderDialog( _pParent, m_xTabbingModel, m_xControlContext, m_aContext ); } //........................................................................ diff --git a/extensions/source/propctrlr/taborder.cxx b/extensions/source/propctrlr/taborder.cxx index 8b7e0e98a4e9..eb353bd4b33b 100644 --- a/extensions/source/propctrlr/taborder.cxx +++ b/extensions/source/propctrlr/taborder.cxx @@ -73,7 +73,7 @@ namespace pcr DBG_NAME(TabOrderDialog) //------------------------------------------------------------------------ TabOrderDialog::TabOrderDialog( Window* _pParent, const Reference< XTabControllerModel >& _rxTabModel, - const Reference< XControlContainer >& _rxControlCont, const Reference< XMultiServiceFactory >& _rxORB ) + const Reference< XControlContainer >& _rxControlCont, const Reference< XComponentContext >& _rxORB ) :ModalDialog( _pParent, PcrRes( RID_DLG_TABORDER ) ) ,m_xModel( _rxTabModel ) ,m_xControlContainer( _rxControlCont ) @@ -243,7 +243,7 @@ namespace pcr { Reference< XTabController > xTabController; if ( m_xORB.is() ) - xTabController = xTabController.query( m_xORB->createInstance( ::rtl::OUString( "com.sun.star.form.FormController" ) ) ); + xTabController.set( m_xORB->getServiceManager()->createInstanceWithContext("com.sun.star.form.FormController", m_xORB), UNO_QUERY_THROW ); DBG_ASSERT( xTabController.is(), "TabOrderDialog::AutoOrderClickHdl: could not instantiate a tab controller!" ); if ( !xTabController.is() ) return 0; diff --git a/extensions/source/propctrlr/taborder.hxx b/extensions/source/propctrlr/taborder.hxx index 58e9b34db0ba..771e1ab33b7a 100644 --- a/extensions/source/propctrlr/taborder.hxx +++ b/extensions/source/propctrlr/taborder.hxx @@ -69,7 +69,7 @@ namespace pcr m_xModel; ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer > m_xControlContainer; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > m_xORB; FixedText aFT_Controls; @@ -100,7 +100,7 @@ namespace pcr Window* _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XTabControllerModel >& _rxTabModel, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XControlContainer >& _rxControlCont, - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& _rxORB ); virtual ~TabOrderDialog(); |