fdo#46808, Convert frame::Desktop to new style service.

I had to drop XEventBroadcaster from the merged interface
because it introduced method name conflicts (addEventListener).

Shouldn't be an issue since it was scheduled to be dropped anyhow,
and the service implementation still implements it, so existing clients
will be fine.

I dropped the interface XPropertySet from the combined IDL because nobody
seems to be using it, and it's primary purpose appears to be to set weird
flags.

I dropped the optional interfaces
XStatusIndicatorFactory
XDispatchInformationProvider
from the combined IDL because the service does not implement them, and
nobody seems to be using them. I suspect they were mistakenly copied
from XFrame.

I also did not convert the Title, UserDefinedAttributes and LayoutManager
properties to attributes, again because no-one is using them.

Change-Id: I678a00006ed2cca2d6c37c4e39465811442c33af

6 files changed, 14 insertions, 14 deletions

diff --git a/dbaccess/source/ui/querydesign/JoinDesignView.cxx b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
index ad7cf9eace71..b5d0c440cd30 100644
--- a/dbaccess/source/ui/querydesign/JoinDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/JoinDesignView.cxx
@@ -53,8 +53,8 @@ namespace dbaui
 // = OJoinDesignView
 // =============================================================================
 // -----------------------------------------------------------------------------
-OJoinDesignView::OJoinDesignView(Window* _pParent, OJoinController& _rController,const Reference< XMultiServiceFactory >& _rFactory)
-    :ODataView( _pParent, _rController, _rFactory )
+OJoinDesignView::OJoinDesignView(Window* _pParent, OJoinController& _rController,const Reference< XComponentContext >& _rxContext)
+    :ODataView( _pParent, _rController, _rxContext )
     ,m_pTableView(NULL)
     ,m_rController( _rController )
 {
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 816991ad8a8d..20a6ebd003de 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -2520,8 +2520,8 @@ DBG_NAME(OQueryDesignView)
 
 OQueryDesignView::OQueryDesignView( OQueryContainerWindow* _pParent,
                                     OQueryController& _rController,
-                                    const Reference< XMultiServiceFactory >& _rFactory)
-    :OQueryView( _pParent, _rController, _rFactory )
+                                    const Reference< XComponentContext >& _rxContext)
+    :OQueryView( _pParent, _rController, _rxContext )
     ,m_aSplitter( this )
     ,m_eChildFocus(NONE)
     ,m_bInSplitHandler( sal_False )
diff --git a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
index 4a584efdf845..b6a9dbe00ee8 100644
--- a/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
+++ b/dbaccess/source/ui/querydesign/QueryViewSwitch.cxx
@@ -32,13 +32,13 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 
 DBG_NAME(OQueryViewSwitch)
-OQueryViewSwitch::OQueryViewSwitch(OQueryContainerWindow* _pParent, OQueryController& _rController,const Reference< XMultiServiceFactory >& _rFactory)
+OQueryViewSwitch::OQueryViewSwitch(OQueryContainerWindow* _pParent, OQueryController& _rController,const Reference< XComponentContext >& _rxContext)
 : m_bAddTableDialogWasVisible(sal_False)
 {
     DBG_CTOR(OQueryViewSwitch,NULL);
 
     m_pTextView     = new OQueryTextView(_pParent);
-    m_pDesignView   = new OQueryDesignView( _pParent, _rController, _rFactory );
+    m_pDesignView   = new OQueryDesignView( _pParent, _rController, _rxContext );
 }
 // -----------------------------------------------------------------------------
 OQueryViewSwitch::~OQueryViewSwitch()
@@ -309,7 +309,7 @@ void OQueryViewSwitch::SetPosSizePixel( Point _rPt,Size _rSize)
     m_pTextView->SetPosSizePixel( _rPt,_rSize);
 }
 // -----------------------------------------------------------------------------
-Reference< XMultiServiceFactory > OQueryViewSwitch::getORB() const
+Reference< XComponentContext > OQueryViewSwitch::getORB() const
 {
     return m_pDesignView->getORB();
 }
diff --git a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
index 06d84f3989bc..dc342f56ae04 100644
--- a/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
+++ b/dbaccess/source/ui/querydesign/querycontainerwindow.cxx
@@ -45,13 +45,13 @@ namespace dbaui
     //= OQueryContainerWindow
     //=====================================================================
     DBG_NAME(OQueryContainerWindow)
-    OQueryContainerWindow::OQueryContainerWindow(Window* pParent, OQueryController& _rController,const Reference< XMultiServiceFactory >& _rFactory)
-        :ODataView( pParent, _rController, _rFactory )
+    OQueryContainerWindow::OQueryContainerWindow(Window* pParent, OQueryController& _rController,const Reference< XComponentContext >& _rxContext)
+        :ODataView( pParent, _rController, _rxContext )
         ,m_pViewSwitch(NULL)
         ,m_pBeamer(NULL)
     {
         DBG_CTOR(OQueryContainerWindow,NULL);
-        m_pViewSwitch = new OQueryViewSwitch( this, _rController, _rFactory );
+        m_pViewSwitch = new OQueryViewSwitch( this, _rController, _rxContext );
 
         m_pSplitter = new Splitter(this,WB_VSCROLL);
         m_pSplitter->Hide();
@@ -195,7 +195,7 @@ namespace dbaui
 
             ::dbaui::notifySystemWindow(this,m_pBeamer,::comphelper::mem_fun(&TaskPaneList::AddWindow));
 
-            Reference < XFrame > xBeamerFrame( m_pViewSwitch->getORB()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Frame"))),UNO_QUERY );
+            Reference < XFrame > xBeamerFrame( m_pViewSwitch->getORB()->getServiceManager()->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.Frame")), m_pViewSwitch->getORB()),UNO_QUERY );
             m_xBeamer.set( xBeamerFrame );
             OSL_ENSURE(m_xBeamer.is(),"No frame created!");
             m_xBeamer->initialize( VCLUnoHelper::GetInterface ( m_pBeamer ) );
diff --git a/dbaccess/source/ui/querydesign/querycontroller.cxx b/dbaccess/source/ui/querydesign/querycontroller.cxx
index d0ea41b81516..22109df206bd 100644
--- a/dbaccess/source/ui/querydesign/querycontroller.cxx
+++ b/dbaccess/source/ui/querydesign/querycontroller.cxx
@@ -1107,7 +1107,7 @@ sal_Bool OQueryController::Construct(Window* pParent)
 {
     // TODO: we have to check if we should create the text- or the design- view
 
-    setView( * new OQueryContainerWindow( pParent, *this, getORB() ) );
+    setView( * new OQueryContainerWindow( pParent, *this, comphelper::getComponentContext(getORB()) ) );
 
     return OJoinController::Construct(pParent);
 }
diff --git a/dbaccess/source/ui/querydesign/queryview.cxx b/dbaccess/source/ui/querydesign/queryview.cxx
index 124540498195..e49c7b000c9f 100644
--- a/dbaccess/source/ui/querydesign/queryview.cxx
+++ b/dbaccess/source/ui/querydesign/queryview.cxx
@@ -27,8 +27,8 @@ using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 DBG_NAME(OQueryView)
 // -------------------------------------------------------------------------
-OQueryView::OQueryView(Window* _pParent, OQueryController& _rController,const Reference< XMultiServiceFactory >& _rFactory)
-    :OJoinDesignView( _pParent, _rController, _rFactory )
+OQueryView::OQueryView(Window* _pParent, OQueryController& _rController,const Reference< XComponentContext >& _rxContext)
+    :OJoinDesignView( _pParent, _rController, _rxContext )
 {
     DBG_CTOR(OQueryView,NULL);