[Libreoffice-commits] core.git: 2 commits - sal/rtl sc/inc sd/source vcl/unx

[Stephan Bergmann]

 sal/rtl/alloc_cache.cxx                         |    2 ++
 sc/inc/externalrefmgr.hxx                       |    2 +-
 sd/source/ui/remotecontrol/BluetoothServer.cxx  |    2 +-
 sd/source/ui/remotecontrol/DiscoveryService.cxx |    3 ++-
 vcl/unx/generic/app/sm.cxx                      |    1 +
 vcl/unx/generic/dtrans/X11_selection.cxx        |    1 +
 6 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit eacb4a71ec6801f7bec491f705151844c6bfe945
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Thu Nov 7 09:41:24 2013 +0100

    Blind MSVC fix
    
    Change-Id: I22c316cc82c40481fa1bf93412d97d67e1f95b41

diff --git a/sc/inc/externalrefmgr.hxx b/sc/inc/externalrefmgr.hxx
index b3d35f9..e7a5e79 100644
--- a/sc/inc/externalrefmgr.hxx
+++ b/sc/inc/externalrefmgr.hxx
@@ -381,7 +381,7 @@ public:
      * values from external references.  Interpreting formula strings is one
      * such example.
      */
-    class ApiGuard
+    class SC_DLLPUBLIC ApiGuard
     {
     public:
         ApiGuard(ScDocument* pDoc);
commit ebf5e56e2020359b648b0fec7bd64befe466e4b4
Author: Arnaud Versini <arnaud.versini at libreoffice.org>
Date:   Fri Oct 18 18:11:33 2013 +0200

    Name threads for debug purpose
    
    Change-Id: Id99ba394b898b7da0057d4a145ce8dce46122782
    Signed-off-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/sal/rtl/alloc_cache.cxx b/sal/rtl/alloc_cache.cxx
index 1383155..561880f 100644
--- a/sal/rtl/alloc_cache.cxx
+++ b/sal/rtl/alloc_cache.cxx
@@ -23,6 +23,7 @@
 #include "internal/rtllifecycle.h"
 #include "sal/macros.h"
 #include "osl/diagnose.h"
+#include <osl/thread.hxx>
 
 #include <cassert>
 #include <string.h>
@@ -1507,6 +1508,7 @@ static DWORD WINAPI
 #endif /* SAL_UNX || SAL_W32 */
 rtl_cache_wsupdate_all (void * arg)
 {
+    osl::Thread::setName("rtl_cache_wsupdate_all");
     unsigned int seconds = sal::static_int_cast< unsigned int >(
         reinterpret_cast< sal_uIntPtr >(arg));
 
diff --git a/sd/source/ui/remotecontrol/BluetoothServer.cxx b/sd/source/ui/remotecontrol/BluetoothServer.cxx
index 9797f39..54bc85a 100644
--- a/sd/source/ui/remotecontrol/BluetoothServer.cxx
+++ b/sd/source/ui/remotecontrol/BluetoothServer.cxx
@@ -684,7 +684,7 @@ void BluetoothServer::cleanupCommunicators()
 void SAL_CALL BluetoothServer::run()
 {
     SAL_INFO( "sdremote.bluetooth", "BluetoothServer::run called" );
-
+    osl::Thread::setName("BluetoothServer");
 #ifdef LINUX_BLUETOOTH
     DBusConnection *pConnection = dbusConnectToNameOnBus();
     if( !pConnection )
diff --git a/sd/source/ui/remotecontrol/DiscoveryService.cxx b/sd/source/ui/remotecontrol/DiscoveryService.cxx
index f72c3b8..26da311 100644
--- a/sd/source/ui/remotecontrol/DiscoveryService.cxx
+++ b/sd/source/ui/remotecontrol/DiscoveryService.cxx
@@ -128,7 +128,8 @@ DiscoveryService::~DiscoveryService()
 
 void SAL_CALL DiscoveryService::run()
 {
-  // Kept for backwrad compatibility
+    osl::Thread::setName("DiscoveryService");
+    // Kept for backwrad compatibility
     char aBuffer[BUFFER_SIZE];
     while ( true )
     {
diff --git a/vcl/unx/generic/app/sm.cxx b/vcl/unx/generic/app/sm.cxx
index bc5c0e7..5ff4273 100644
--- a/vcl/unx/generic/app/sm.cxx
+++ b/vcl/unx/generic/app/sm.cxx
@@ -603,6 +603,7 @@ void ICEConnectionObserver::terminate(oslThread iceThread)
 
 void ICEConnectionWorker(void * data)
 {
+    osl::Thread::setName("ICEConnectionWorker");
     ICEConnectionObserver * pThis = static_cast< ICEConnectionObserver * >(
         data);
     for (;;)
diff --git a/vcl/unx/generic/dtrans/X11_selection.cxx b/vcl/unx/generic/dtrans/X11_selection.cxx
index 8a90cd9..11560fa 100644
--- a/vcl/unx/generic/dtrans/X11_selection.cxx
+++ b/vcl/unx/generic/dtrans/X11_selection.cxx
@@ -3734,6 +3734,7 @@ void SelectionManager::run( void* pThis )
 #if OSL_DEBUG_LEVEL > 1
     fprintf(stderr, "SelectionManager::run\n" );
 #endif
+    osl::Thread::setName("SelectionManager");
     // dispatch until the cows come home
 
     SelectionManager* This = (SelectionManager*)pThis;