fdo#46808, Adapt frame::TaskCreator UNO service to new style

The service already existed, it just did not have an IDL file.

Change-Id: I157c53d09b612da0178432100b8928013f811706

6 files changed, 28 insertions, 28 deletions

diff --git a/dbaccess/source/ui/misc/RowSetDrop.cxx b/dbaccess/source/ui/misc/RowSetDrop.cxx
index 77eb69a627b9..a4eaf1b23460 100644
--- a/dbaccess/source/ui/misc/RowSetDrop.cxx
+++ b/dbaccess/source/ui/misc/RowSetDrop.cxx
@@ -43,7 +43,7 @@ using namespace ::com::sun::star::lang;
 ORowSetImportExport::ORowSetImportExport(   Window* _pParent,
                                             const Reference< XResultSetUpdate >& _xResultSetUpdate,
                                             const ::svx::ODataAccessDescriptor& _aDataDescriptor,
-                                            const Reference< XMultiServiceFactory >& _rM,
+                                            const Reference< XComponentContext >& _rM,
                                             const String& rExchange
                                             )
                                             : ODatabaseImportExport(_aDataDescriptor,_rM,NULL,rExchange)
diff --git a/dbaccess/source/ui/misc/TableCopyHelper.cxx b/dbaccess/source/ui/misc/TableCopyHelper.cxx
index b57bf8e0072f..856a8b477def 100644
--- a/dbaccess/source/ui/misc/TableCopyHelper.cxx
+++ b/dbaccess/source/ui/misc/TableCopyHelper.cxx
@@ -247,9 +247,9 @@ sal_Bool OTableCopyHelper::copyTagTable(OTableCopyHelper::DropDescriptor& _rDesc
     Reference<XEventListener> xEvt;
     ODatabaseImportExport* pImport = NULL;
     if ( _rDesc.bHtml )
-        pImport = new OHTMLImportExport(_xConnection,getNumberFormatter(_xConnection, comphelper::getComponentContext(m_pController->getORB())),m_pController->getORB());
+        pImport = new OHTMLImportExport(_xConnection,getNumberFormatter(_xConnection, m_pController->getORB()),m_pController->getORB());
     else
-        pImport = new ORTFImportExport(_xConnection,getNumberFormatter(_xConnection, comphelper::getComponentContext(m_pController->getORB())),m_pController->getORB());
+        pImport = new ORTFImportExport(_xConnection,getNumberFormatter(_xConnection, m_pController->getORB()),m_pController->getORB());
 
     xEvt = pImport;
     SvStream* pStream = (SvStream*)(SotStorageStream*)_rDesc.aHtmlRtfStorage;
diff --git a/dbaccess/source/ui/misc/TokenWriter.cxx b/dbaccess/source/ui/misc/TokenWriter.cxx
index 076368974ee2..20d8e8d94717 100644
--- a/dbaccess/source/ui/misc/TokenWriter.cxx
+++ b/dbaccess/source/ui/misc/TokenWriter.cxx
@@ -91,12 +91,12 @@ const static char sFontSize[]       = "font-size: ";
 DBG_NAME(ODatabaseImportExport)
 //======================================================================
 ODatabaseImportExport::ODatabaseImportExport(const ::svx::ODataAccessDescriptor& _aDataDescriptor,
-                                             const Reference< XMultiServiceFactory >& _rM,
+                                             const Reference< XComponentContext >& _rM,
                                              const Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF,
                                              const String& rExchange)
     :m_bBookmarkSelection( sal_False )
     ,m_xFormatter(_rxNumberF)
-    ,m_xFactory(_rM)
+    ,m_xContext(_rM)
     ,m_nCommandType(CommandType::TABLE)
     ,m_bNeedToReInitialize(sal_False)
     ,m_pReader(NULL)
@@ -124,11 +124,11 @@ ODatabaseImportExport::ODatabaseImportExport(const ::svx::ODataAccessDescriptor&
 // -----------------------------------------------------------------------------
 // import data
 ODatabaseImportExport::ODatabaseImportExport( const ::dbtools::SharedConnection& _rxConnection,
-        const Reference< XNumberFormatter >& _rxNumberF, const Reference< XMultiServiceFactory >& _rM )
+        const Reference< XNumberFormatter >& _rxNumberF, const Reference< XComponentContext >& _rM )
     :m_bBookmarkSelection( sal_False )
     ,m_xConnection(_rxConnection)
     ,m_xFormatter(_rxNumberF)
-    ,m_xFactory(_rM)
+    ,m_xContext(_rM)
     ,m_nCommandType(::com::sun::star::sdb::CommandType::TABLE)
     ,m_bNeedToReInitialize(sal_False)
     ,m_pReader(NULL)
@@ -277,11 +277,11 @@ void ODatabaseImportExport::initialize()
     if ( !m_xConnection.is() )
     {   // we need a connection
         OSL_ENSURE(!m_sDataSourceName.isEmpty(),"There must be a datsource name!");
-        Reference<XNameAccess> xDatabaseContext( DatabaseContext::create(comphelper::getComponentContext(m_xFactory)), UNO_QUERY_THROW);
+        Reference<XNameAccess> xDatabaseContext( DatabaseContext::create(m_xContext), UNO_QUERY_THROW);
         Reference< XEventListener> xEvt((::cppu::OWeakObject*)this,UNO_QUERY);
 
         Reference< XConnection > xConnection;
-        SQLExceptionInfo aInfo = ::dbaui::createConnection( m_sDataSourceName, xDatabaseContext, comphelper::getComponentContext(m_xFactory), xEvt, xConnection );
+        SQLExceptionInfo aInfo = ::dbaui::createConnection( m_sDataSourceName, xDatabaseContext, m_xContext, xEvt, xConnection );
         m_xConnection.reset( xConnection );
 
         if(aInfo.isValid() && aInfo.getType() == SQLExceptionInfo::SQL_EXCEPTION)
@@ -323,7 +323,7 @@ void ODatabaseImportExport::initialize()
             // the result set may be already set with the datadescriptor
             if ( !m_xResultSet.is() )
             {
-                m_xResultSet.set( m_xFactory->createInstance( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.RowSet")) ), UNO_QUERY );
+                m_xResultSet.set( m_xContext->getServiceManager()->createInstanceWithContext("com.sun.star.sdb.RowSet", m_xContext), UNO_QUERY );
                 Reference< XPropertySet > xProp( m_xResultSet, UNO_QUERY_THROW );
                 xProp->setPropertyValue( PROPERTY_ACTIVE_CONNECTION, makeAny( m_xConnection.getTyped() ) );
                 xProp->setPropertyValue( PROPERTY_COMMAND_TYPE, makeAny( m_nCommandType ) );
@@ -521,7 +521,6 @@ sal_Bool ORTFImportExport::Write()
         (*m_pStream) << ODatabaseImportExport::sNewLine << '}';
         (*m_pStream) << ODatabaseImportExport::sNewLine;
 
-        ::comphelper::ComponentContext aContext(m_xFactory);
         Reference< XRowSet > xRowSet(m_xRow,UNO_QUERY);
         sal_Int32 k=1;
         sal_Int32 kk=0;
@@ -587,7 +586,6 @@ void ORTFImportExport::appendRow(::rtl::OString* pHorzChar,sal_Int32 _nColumnCou
         const sal_Bool bItalic      = ( ::com::sun::star::awt::FontSlant_ITALIC     == m_aFont.Slant );
         const sal_Bool bUnderline       = ( ::com::sun::star::awt::FontUnderline::NONE  != m_aFont.Underline );
         const sal_Bool bStrikeout       = ( ::com::sun::star::awt::FontStrikeout::NONE  != m_aFont.Strikeout );
-        ::comphelper::ComponentContext aContext(m_xFactory);
         Reference< XRowSet > xRowSet(m_xRow,UNO_QUERY);
 
         (*m_pStream) << '{';
@@ -608,7 +606,7 @@ void ORTFImportExport::appendRow(::rtl::OString* pHorzChar,sal_Int32 _nColumnCou
             try
             {
                 Reference<XPropertySet> xColumn(m_xRowSetColumns->getByIndex(i-1),UNO_QUERY_THROW);
-                dbtools::FormattedColumnValue aFormatedValue(aContext,xRowSet,xColumn);
+                dbtools::FormattedColumnValue aFormatedValue(m_xContext,xRowSet,xColumn);
                 ::rtl::OUString sValue = aFormatedValue.getFormattedValue();
                 if ( !sValue.isEmpty() )
                     RTFOutFuncs::Out_String(*m_pStream,sValue,m_eDestEnc);
@@ -636,7 +634,7 @@ sal_Bool ORTFImportExport::Read()
     SvParserState eState = SVPAR_ERROR;
     if ( m_pStream )
     {
-        m_pReader = new ORTFReader((*m_pStream),m_xConnection,m_xFormatter,comphelper::getComponentContext(m_xFactory));
+        m_pReader = new ORTFReader((*m_pStream),m_xConnection,m_xFormatter,m_xContext);
         ((ORTFReader*)m_pReader)->AddRef();
         if ( isCheckEnabled() )
             m_pReader->enableCheckOnly();
@@ -672,7 +670,7 @@ const char OHTMLImportExport::sIndentSource[nIndentMax+1] = "\t\t\t\t\t\t\t\t\t\
 
 //-------------------------------------------------------------------
 OHTMLImportExport::OHTMLImportExport(const ::svx::ODataAccessDescriptor& _aDataDescriptor,
-                                     const Reference< XMultiServiceFactory >& _rM,
+                                     const Reference< XComponentContext >& _rM,
                                      const Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF,
                                      const String& rExchange)
         : ODatabaseImportExport(_aDataDescriptor,_rM,_rxNumberF,rExchange)
@@ -715,7 +713,7 @@ sal_Bool OHTMLImportExport::Read()
     SvParserState eState = SVPAR_ERROR;
     if ( m_pStream )
     {
-        m_pReader = new OHTMLReader((*m_pStream),m_xConnection,m_xFormatter,comphelper::getComponentContext(m_xFactory));
+        m_pReader = new OHTMLReader((*m_pStream),m_xConnection,m_xFormatter,m_xContext);
         ((OHTMLReader*)m_pReader)->AddRef();
         if ( isCheckEnabled() )
             m_pReader->enableCheckOnly();
@@ -732,7 +730,7 @@ void OHTMLImportExport::WriteHeader()
 {
     RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "misc", "Ocke.Janssen@sun.com", "OHTMLImportExport::WriteHeader" );
     uno::Reference<document::XDocumentProperties> xDocProps(
-        document::DocumentProperties::create( comphelper::getComponentContext(m_xFactory) ) );
+        document::DocumentProperties::create( m_xContext ) );
     if (xDocProps.is()) {
         xDocProps->setTitle(m_sName);
     }
@@ -897,7 +895,6 @@ void OHTMLImportExport::WriteTables()
         TAG_ON_LF( OOO_STRING_SVTOOLS_HTML_tbody );
 
         // 2. and now the data
-        ::comphelper::ComponentContext aContext(m_xFactory);
         Reference< XRowSet > xRowSet(m_xRow,UNO_QUERY);
         sal_Int32 j=1;
         sal_Int32 kk=0;
@@ -919,7 +916,7 @@ void OHTMLImportExport::WriteTables()
                     try
                     {
                         Reference<XPropertySet> xColumn(m_xRowSetColumns->getByIndex(i-1),UNO_QUERY_THROW);
-                        dbtools::FormattedColumnValue aFormatedValue(aContext,xRowSet,xColumn);
+                        dbtools::FormattedColumnValue aFormatedValue(m_xContext,xRowSet,xColumn);
                         ::rtl::OUString sValue = aFormatedValue.getFormattedValue();
                         if (!sValue.isEmpty())
                         {
diff --git a/dbaccess/source/ui/misc/databaseobjectview.cxx b/dbaccess/source/ui/misc/databaseobjectview.cxx
index 6ad3829e3fd4..16b748d0f3c1 100644
--- a/dbaccess/source/ui/misc/databaseobjectview.cxx
+++ b/dbaccess/source/ui/misc/databaseobjectview.cxx
@@ -23,6 +23,7 @@
 #include "asyncmodaldialog.hxx"
 
 #include <com/sun/star/lang/XSingleServiceFactory.hpp>
+#include <com/sun/star/frame/TaskCreator.hpp>
 #include <com/sun/star/frame/XDispatchProvider.hpp>
 #include <com/sun/star/frame/XFrame.hpp>
 #include <com/sun/star/frame/XFrames.hpp>
@@ -58,7 +59,7 @@ namespace dbaui
     //======================================================================
     //= DatabaseObjectView
     //======================================================================
-    DatabaseObjectView::DatabaseObjectView( const Reference< XMultiServiceFactory >& _rxORB,
+    DatabaseObjectView::DatabaseObjectView( const Reference< XComponentContext >& _rxORB,
             const Reference< XDatabaseDocumentUI >& _rxApplication,
             const Reference< XFrame >& _rxParentFrame,
             const ::rtl::OUString& _rComponentURL )
@@ -118,7 +119,7 @@ namespace dbaui
                 // if we have no externally provided frame, create one
                 if ( !m_xFrameLoader.is() )
                 {
-                    Reference< XSingleServiceFactory > xFact(m_xORB->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.TaskCreator"))), UNO_QUERY_THROW);
+                    Reference< XSingleServiceFactory > xFact = TaskCreator::create(m_xORB);
                     Sequence< Any > lArgs(2);
                     NamedValue      aProp;
                     sal_Int32       nArg = 0;
@@ -184,7 +185,7 @@ namespace dbaui
     //= QueryDesigner
     //======================================================================
     //----------------------------------------------------------------------
-    QueryDesigner::QueryDesigner( const Reference< XMultiServiceFactory >& _rxORB, const Reference< XDatabaseDocumentUI >& _rxApplication,
+    QueryDesigner::QueryDesigner( const Reference< XComponentContext >& _rxORB, const Reference< XDatabaseDocumentUI >& _rxApplication,
         const Reference< XFrame >& _rxParentFrame, bool _bCreateView )
         :DatabaseObjectView( _rxORB, _rxApplication, _rxParentFrame, _bCreateView ? URL_COMPONENT_VIEWDESIGN : URL_COMPONENT_QUERYDESIGN )
         ,m_nCommandType( _bCreateView ? CommandType::TABLE : CommandType::QUERY )
@@ -218,7 +219,7 @@ namespace dbaui
     //= TableDesigner
     //======================================================================
     //----------------------------------------------------------------------
-    TableDesigner::TableDesigner( const Reference< XMultiServiceFactory >& _rxORB, const Reference< XDatabaseDocumentUI >& _rxApplication, const Reference< XFrame >& _rxParentFrame )
+    TableDesigner::TableDesigner( const Reference< XComponentContext >& _rxORB, const Reference< XDatabaseDocumentUI >& _rxApplication, const Reference< XFrame >& _rxParentFrame )
         :DatabaseObjectView( _rxORB, _rxApplication, _rxParentFrame, static_cast< ::rtl::OUString >( URL_COMPONENT_TABLEDESIGN ) )
     {
     }
@@ -284,7 +285,7 @@ namespace dbaui
     //= ResultSetBrowser
     //======================================================================
     //----------------------------------------------------------------------
-    ResultSetBrowser::ResultSetBrowser( const Reference< XMultiServiceFactory >& _rxORB, const Reference< XDatabaseDocumentUI >& _rxApplication, const Reference< XFrame >& _rxParentFrame,
+    ResultSetBrowser::ResultSetBrowser( const Reference< XComponentContext >& _rxORB, const Reference< XDatabaseDocumentUI >& _rxApplication, const Reference< XFrame >& _rxParentFrame,
             sal_Bool _bTable )
         :DatabaseObjectView( _rxORB, _rxApplication, _rxParentFrame, static_cast < ::rtl::OUString >( URL_COMPONENT_DATASOURCEBROWSER ) )
         ,m_bTable(_bTable)
@@ -319,7 +320,7 @@ namespace dbaui
     //= RelationDesigner
     //======================================================================
     //----------------------------------------------------------------------
-    RelationDesigner::RelationDesigner( const Reference< XMultiServiceFactory >& _rxORB, const Reference< XDatabaseDocumentUI >& _rxApplication, const Reference< XFrame >& _rxParentFrame )
+    RelationDesigner::RelationDesigner( const Reference< XComponentContext >& _rxORB, const Reference< XDatabaseDocumentUI >& _rxApplication, const Reference< XFrame >& _rxParentFrame )
         :DatabaseObjectView( _rxORB, _rxApplication, _rxParentFrame, static_cast< ::rtl::OUString >( URL_COMPONENT_RELATIONDESIGN ) )
     {
     }
diff --git a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
index 09718e39b6d4..db1982f59411 100644
--- a/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
+++ b/dbaccess/source/ui/misc/dbsubcomponentcontroller.cxx
@@ -62,6 +62,7 @@ namespace dbaui
     using ::com::sun::star::uno::RuntimeException;
     using ::com::sun::star::uno::Sequence;
     using ::com::sun::star::uno::Type;
+    using ::com::sun::star::uno::XComponentContext;
     using ::com::sun::star::sdbc::XConnection;
     using ::com::sun::star::uno::UNO_QUERY;
     using ::com::sun::star::container::XChild;
@@ -178,7 +179,7 @@ namespace dbaui
     //= DBSubComponentController
     //====================================================================
     //--------------------------------------------------------------------
-    DBSubComponentController::DBSubComponentController(const Reference< XMultiServiceFactory >& _rxORB)
+    DBSubComponentController::DBSubComponentController(const Reference< XComponentContext >& _rxORB)
         :DBSubComponentController_Base( _rxORB )
         ,m_pImpl( new DBSubComponentController_Impl( getMutex() ) )
     {
@@ -298,7 +299,7 @@ namespace dbaui
             if(xSupplier.is())
             {
                 m_pImpl->m_xFormatter = Reference< XNumberFormatter >(
-                    NumberFormatter::create(comphelper::getComponentContext(getORB())), UNO_QUERY_THROW);
+                    NumberFormatter::create(getORB()), UNO_QUERY_THROW);
                 m_pImpl->m_xFormatter->attachNumberFormatsSupplier(xSupplier);
             }
             OSL_ENSURE(m_pImpl->m_xFormatter.is(),"No NumberFormatter!");
diff --git a/dbaccess/source/ui/misc/singledoccontroller.cxx b/dbaccess/source/ui/misc/singledoccontroller.cxx
index c194885b4d9f..27ac7a1e4740 100644
--- a/dbaccess/source/ui/misc/singledoccontroller.cxx
+++ b/dbaccess/source/ui/misc/singledoccontroller.cxx
@@ -46,6 +46,7 @@ namespace dbaui
     using ::com::sun::star::uno::makeAny;
     using ::com::sun::star::uno::Sequence;
     using ::com::sun::star::uno::Type;
+    using ::com::sun::star::uno::XComponentContext;
     using ::com::sun::star::document::XUndoManager;
     using ::com::sun::star::lang::XMultiServiceFactory;
     using ::com::sun::star::beans::PropertyValue;
@@ -69,7 +70,7 @@ namespace dbaui
     //= OSingleDocumentController
     //==================================================================================================================
     //------------------------------------------------------------------------------------------------------------------
-    OSingleDocumentController::OSingleDocumentController( const Reference< XMultiServiceFactory >& _rxORB )
+    OSingleDocumentController::OSingleDocumentController( const Reference< XComponentContext >& _rxORB )
         :OSingleDocumentController_Base( _rxORB )
         ,m_pData( new OSingleDocumentController_Data( *this, getMutex() ) )
     {