diff options
author | Jan Holesovsky <kendy@collabora.com> | 2014-04-18 22:44:01 +0200 |
---|---|---|
committer | Jan Holesovsky <kendy@collabora.com> | 2014-04-18 22:51:07 +0200 |
commit | a7ee8316f7503db89874ee44daa56edf8e3e027f (patch) | |
tree | ac3d83aa9ed6847a1ffdac610d6afe66b1482571 /svtools | |
parent | ba419888d0de6b31f598f2faa9cca1e1f75a53fa (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 'svtools')
-rw-r--r-- | svtools/source/misc/svtaccessiblefactory.cxx | 14 |
1 files changed, 9 insertions, 5 deletions
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 |