fdo#46808, remove awt::DisplayAccess service.

This service was never documented in an IDL file.
All it did was provide a wrapper around some VCL module API.
Now that we can link the VCL stuff into SD and SDEXT, just
access the API directly.

Change-Id: Ic0ba34c2bca797baa7319878d98cfe3a4ec59d4d

3 files changed, 8 insertions, 57 deletions

diff --git a/sd/source/ui/dlg/present.cxx b/sd/source/ui/dlg/present.cxx
index 5b94cb347e02..1e1a8125cd10 100644
--- a/sd/source/ui/dlg/present.cxx
+++ b/sd/source/ui/dlg/present.cxx
@@ -26,6 +26,7 @@
 #include <com/sun/star/container/XIndexAccess.hpp>
 #include <comphelper/processfactory.hxx>
 #include <svl/itemset.hxx>
+#include <vcl/svapp.hxx>
 
 #include "sdattr.hxx"
 #include "present.hxx"
@@ -176,13 +177,11 @@ void SdStartPresentationDlg::InitMonitorSettings()
 {
     try
     {
-        Reference< XMultiServiceFactory > xFactory( ::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW );
-        Reference< XIndexAccess > xMultiMon( xFactory->createInstance("com.sun.star.awt.DisplayAccess" ), UNO_QUERY_THROW );
         maGrpMonitor.Show( true );
         maFtMonitor.Show( true );
         maLBMonitor.Show( true );
 
-        mnMonitors = xMultiMon->getCount();
+        mnMonitors = Application::GetScreenCount();
 
         if( mnMonitors <= 1 )
         {
@@ -191,19 +190,8 @@ void SdStartPresentationDlg::InitMonitorSettings()
         }
         else
         {
-            sal_Bool bUnifiedDisplay = false;
-            sal_Int32 nExternalIndex = 0;
-            Reference< XPropertySet > xMonProps( xMultiMon, UNO_QUERY );
-            if( xMonProps.is() ) try
-            {
-                const OUString sPropName1( "IsUnifiedDisplay" );
-                xMonProps->getPropertyValue( sPropName1 ) >>= bUnifiedDisplay;
-                const OUString sPropName2( "ExternalDisplay" );
-                xMonProps->getPropertyValue( sPropName2 ) >>= nExternalIndex;
-            }
-            catch( Exception& )
-            {
-            }
+            sal_Bool bUnifiedDisplay = Application::IsUnifiedDisplay();
+            sal_Int32 nExternalIndex = Application::GetDisplayExternalScreen();
 
             sal_Int32 nSelectedIndex (-1);
             sal_Int32 nDefaultExternalIndex (-1);
diff --git a/sd/source/ui/slideshow/SlideShowRestarter.cxx b/sd/source/ui/slideshow/SlideShowRestarter.cxx
index ad452d80d67e..90ed5146ac6e 100644
--- a/sd/source/ui/slideshow/SlideShowRestarter.cxx
+++ b/sd/source/ui/slideshow/SlideShowRestarter.cxx
@@ -42,7 +42,7 @@ SlideShowRestarter::SlideShowRestarter (
     : mnEventId(0),
       mpSlideShow(rpSlideShow),
       mpViewShellBase(pViewShellBase),
-      mnDisplayCount(GetDisplayCount()),
+      mnDisplayCount(Application::GetScreenCount()),
       mpDispatcher(pViewShellBase->GetViewFrame()->GetDispatcher()),
       mnCurrentSlideNumber(0)
 {
@@ -77,30 +77,12 @@ void SlideShowRestarter::Restart (bool bForce)
         LINK(this, SlideShowRestarter, EndPresentation));
 }
 
-sal_Int32 SlideShowRestarter::GetDisplayCount (void)
-{
-    const Reference<XComponentContext> xContext (
-        ::comphelper::getProcessComponentContext() );
-    Reference<XMultiComponentFactory> xFactory (
-        xContext->getServiceManager(), UNO_QUERY);
-    if ( ! xFactory.is())
-        return 0;
-
-    Reference<com::sun::star::container::XIndexAccess> xIndexAccess (
-        xFactory->createInstanceWithContext("com.sun.star.awt.DisplayAccess",xContext),
-        UNO_QUERY);
-    if ( ! xIndexAccess.is())
-        return 0;
-
-    return xIndexAccess->getCount();
-}
-
 IMPL_LINK_NOARG(SlideShowRestarter, EndPresentation)
 {
     mnEventId = 0;
     if (mpSlideShow.is())
     {
-        if (mnDisplayCount!=GetDisplayCount())
+        if (mnDisplayCount != (sal_Int32)Application::GetScreenCount())
         {
             mpSlideShow->end();
 
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index 9980082e99b3..af2033e8560b 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -101,25 +101,6 @@ namespace {
     private:
         ::boost::shared_ptr<SlideShowRestarter> mpRestarter;
     };
-
-    /** Return the default display id (or -1 when that can not be
-        determined.)
-    */
-    sal_Int32 GetExternalDisplay (void)
-    {
-        try
-        {
-            Reference< XMultiServiceFactory > xFactory(::comphelper::getProcessServiceFactory(), UNO_QUERY_THROW );
-            Reference< XPropertySet > xMonProps(xFactory->createInstance( "com.sun.star.awt.DisplayAccess" ), UNO_QUERY_THROW );
-            sal_Int32 nPrimaryIndex (-1);
-            if (xMonProps->getPropertyValue( "ExternalDisplay" ) >>= nPrimaryIndex)
-                return nPrimaryIndex;
-        }
-        catch( Exception& )
-        {
-        }
-        return -1;
-    }
 }
 
 
@@ -573,7 +554,7 @@ void SAL_CALL SlideShow::setPropertyValue( const OUString& aPropertyName, const
         {
             // Convert value to true display id.
             if (nDisplay == 0)
-                nDisplay = GetExternalDisplay();
+                nDisplay = Application::GetDisplayExternalScreen();
             else if (nDisplay < 0)
                 nDisplay = -1;
             else
@@ -665,7 +646,7 @@ Any SAL_CALL SlideShow::getPropertyValue( const OUString& PropertyName ) throw(U
         SdOptions* pOptions = SD_MOD()->GetSdOptions(DOCUMENT_TYPE_IMPRESS);
         const sal_Int32 nDisplay (pOptions->GetDisplay());
         // Convert true display id to the previously used schema.
-        if (nDisplay == GetExternalDisplay())
+        if (nDisplay == (sal_Int32)Application::GetDisplayExternalScreen())
             return Any(sal_Int32(0));
         else if (nDisplay < 0)
             return Any(sal_Int32(-1));