summaryrefslogtreecommitdiff
path: root/toolkit
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@collabora.com>2014-04-18 22:44:01 +0200
committerJan Holesovsky <kendy@collabora.com>2014-04-18 22:51:07 +0200
commita7ee8316f7503db89874ee44daa56edf8e3e027f (patch)
treeac3d83aa9ed6847a1ffdac610d6afe66b1482571 /toolkit
parentba419888d0de6b31f598f2faa9cca1e1f75a53fa (diff)
non-desktop: Avoid accessibility.
When using the tiled rendering, LibreOffice provides only the content, so no need to instantiate accessibility. Change-Id: Ibc0ff672aa960409fa660a750f8f02c9261041be
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/source/helper/accessibilityclient.cxx11
1 files changed, 8 insertions, 3 deletions
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: */