non-desktop: Avoid accessibility.

When using the tiled rendering, LibreOffice provides only the content, so no
need to instantiate accessibility.

Change-Id: Ibc0ff672aa960409fa660a750f8f02c9261041be

3 files changed, 21 insertions, 9 deletions

diff --git a/accessibility/source/helper/acc_factory.cxx b/accessibility/source/helper/acc_factory.cxx
index d29a7a7aacf7..ed4d2daf2d64 100644
--- a/accessibility/source/helper/acc_factory.cxx
+++ b/accessibility/source/helper/acc_factory.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_features.h>
+
 #include <toolkit/awt/vclxwindows.hxx>
 #include <toolkit/helper/accessiblefactory.hxx>
 #include <svtools/accessiblefactory.hxx>
@@ -495,6 +497,7 @@ Reference< XAccessibleContext > AccessibleFactory::createAccessibleToolPanelTabB
 
 } // anonymous namespace
 
+#if HAVE_FEATURE_DESKTOP
 /* this is the entry point to retrieve a factory for the toolkit-level Accessible/Contexts supplied
     by this library
 
@@ -511,7 +514,6 @@ extern "C"
     }
 }
 
-
 /** this is the entry point to retrieve a factory for the svtools-level Accessible/Contexts supplied
     by this library
 
@@ -527,5 +529,6 @@ extern "C"
         return pFactory;
     }
 }
+#endif // HAVE_FEATURE_DESKTOP
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/misc/svtaccessiblefactory.cxx b/svtools/source/misc/svtaccessiblefactory.cxx
index fe8c206f9c62..5ad5fa7ff829 100644
--- a/svtools/source/misc/svtaccessiblefactory.cxx
+++ b/svtools/source/misc/svtaccessiblefactory.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_features.h>
+
 #include "svtaccessiblefactory.hxx"
 
 #include <boost/noncopyable.hpp>
@@ -37,11 +39,8 @@
     // implemented therein would affect a static ref count, the acc lib could care
     // for unloading itself.
 
-
 namespace svt
 {
-
-
     using namespace ::com::sun::star::uno;
     using namespace ::com::sun::star::awt;
     using namespace ::com::sun::star::accessibility;
@@ -257,12 +256,13 @@ namespace svt
     {
     }
 
-
+#if HAVE_FEATURE_DESKTOP
 #ifndef DISABLE_DYNLOADING
     extern "C" { static void SAL_CALL thisModule() {} }
 #else
     extern "C" void* getSvtAccessibilityComponentFactory();
 #endif
+#endif // HAVE_FEATURE_DESKTOP
 
     void AccessibleFactoryAccess::ensureInitialized()
     {
@@ -275,6 +275,8 @@ namespace svt
         if ( 1 == osl_atomic_increment( &s_nAccessibleFactoryAccesss ) )
         {   // the first client
 #endif // UNLOAD_ON_LAST_CLIENT_DYING
+
+#if HAVE_FEATURE_DESKTOP
             // load the library implementing the factory
             if ( !s_pFactory.get() )
             {
@@ -291,7 +293,8 @@ namespace svt
                 OSL_ENSURE( s_pAccessibleFactoryFunc, "ac_registerClient: could not load the library, or not retrieve the needed symbol!" );
 #else
                 s_pAccessibleFactoryFunc = getSvtAccessibilityComponentFactory;
-#endif
+#endif // DISABLE_DYNLOADING
+
                 // get a factory instance
                 if ( s_pAccessibleFactoryFunc )
                 {
@@ -303,6 +306,7 @@ namespace svt
                     }
                 }
             }
+#endif // HAVE_FEATURE_DESKTOP
 
             if ( !s_pFactory.get() )
                 // the attempt to load the lib, or to create the factory, failed
diff --git a/toolkit/source/helper/accessibilityclient.cxx b/toolkit/source/helper/accessibilityclient.cxx
index 8c77223f9d2e..4a02a509fc7a 100644
--- a/toolkit/source/helper/accessibilityclient.cxx
+++ b/toolkit/source/helper/accessibilityclient.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include <config_features.h>
+
 #include <sal/config.h>
 
 #include <boost/noncopyable.hpp>
@@ -182,12 +184,13 @@ namespace toolkit
     {
     }
 
-
+#if HAVE_FEATURE_DESKTOP
 #ifndef DISABLE_DYNLOADING
     extern "C" { static void SAL_CALL thisModule() {} }
 #else
     extern "C" void *getStandardAccessibleFactory();
 #endif
+#endif // HAVE_FEATURE_DESKTOP
 
     void AccessibilityClient::ensureInitialized()
     {
@@ -200,6 +203,8 @@ namespace toolkit
         if ( 1 == osl_atomic_increment( &s_nAccessibilityClients ) )
         {   // the first client
 #endif // UNLOAD_ON_LAST_CLIENT_DYING
+
+#if HAVE_FEATURE_DESKTOP
             // load the library implementing the factory
             if ( !s_pFactory.get() )
             {
@@ -217,7 +222,7 @@ namespace toolkit
                 OSL_ENSURE( s_pAccessibleFactoryFunc, "AccessibilityClient::ensureInitialized: could not load the library, or not retrieve the needed symbol!" );
 #else
                 s_pAccessibleFactoryFunc = getStandardAccessibleFactory;
-#endif
+#endif // DISABLE_DYNLOADING
 
                 // get a factory instance
                 if ( s_pAccessibleFactoryFunc )
@@ -231,6 +236,7 @@ namespace toolkit
                     }
                 }
             }
+#endif // HAVE_FEATURE_DESKTOP
 
             if ( !s_pFactory.get() )
                 // the attempt to load the lib, or to create the factory, failed
@@ -276,5 +282,4 @@ namespace toolkit
 
 }   // namespace toolkit
 
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */