[Libreoffice-commits] core.git: sd/source

[Tor Lillqvist]

 sd/source/ui/app/sddll.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit aa03340dcb5f832afe760e0d498238c3643f52c6
Author: Tor Lillqvist <tml at iki.fi>
Date:   Fri Jul 26 11:54:00 2013 +0300

    Don't bother with remote control support when headless (like in unit tests)
    
    We got mysterious dbus and/or Avahi -related crashes in sd unit tests
    otherwise.
    
    Change-Id: Ia8beb5ca942f757eb423cb30b9000d3b52f5e920

diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx
index d76fedf..a55ea93 100644
--- a/sd/source/ui/app/sddll.cxx
+++ b/sd/source/ui/app/sddll.cxx
@@ -25,6 +25,7 @@
 #include <svx/fmobjfac.hxx>
 #include <svx/svdfield.hxx>
 #include <svx/objfac3d.hxx>
+#include <vcl/svapp.hxx>
 
 #include "sddll.hxx"
 #include "DrawDocShell.hxx"
@@ -116,7 +117,8 @@ void SdDLL::Init()
 
     // register your exotic remote controlls here
 #ifdef ENABLE_SDREMOTE
-    RegisterRemotes();
+    if ( !Application::IsHeadlessModeRequested() )
+        RegisterRemotes();
 #endif
 }