[Libreoffice-commits] .: vcl/inc vcl/unx

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Wed Sep 12 04:50:59 PDT 2012


 vcl/inc/unx/saldata.hxx         |    2 --
 vcl/unx/generic/app/saldata.cxx |    3 ---
 2 files changed, 5 deletions(-)

New commits:
commit dbb77c1448e58ee42fade4fa2f4d478a9ac91f1c
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Sep 12 12:31:00 2012 +0100

    remove unused hMainThread_
    
    Change-Id: Iea56d7f1b4d3133067e321a033df81378be2817a

diff --git a/vcl/inc/unx/saldata.hxx b/vcl/inc/unx/saldata.hxx
index 3748231..6b1ec99 100644
--- a/vcl/inc/unx/saldata.hxx
+++ b/vcl/inc/unx/saldata.hxx
@@ -71,7 +71,6 @@ class VCLPLUG_GEN_PUBLIC X11SalData : public SalGenericData
 
 protected:
     SalXLib      *pXLib_;
-    pthread_t     hMainThread_;
 
 public:
              X11SalData( SalGenericDataType t, SalInstance *pInstance );
@@ -87,7 +86,6 @@ public:
     void                    DeleteDisplay(); // for shutdown
 
     inline  SalXLib*        GetLib() const { return pXLib_; }
-    inline  pthread_t       GetMainThread() const { return hMainThread_; }
 
     void                    StartTimer( sal_uLong nMS );
     inline  void            StopTimer();
diff --git a/vcl/unx/generic/app/saldata.cxx b/vcl/unx/generic/app/saldata.cxx
index c0fcf87..1fb6a7a 100644
--- a/vcl/unx/generic/app/saldata.cxx
+++ b/vcl/unx/generic/app/saldata.cxx
@@ -229,7 +229,6 @@ static const char* XRequest[] = {
 
 // -=-= SalData =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 // -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
-#include <pthread.h>
 
 X11SalData::X11SalData( SalGenericDataType t, SalInstance *pInstance )
     : SalGenericData( t, pInstance )
@@ -237,8 +236,6 @@ X11SalData::X11SalData( SalGenericDataType t, SalInstance *pInstance )
     pXLib_          = NULL;
     m_pPlugin       = NULL;
 
-    hMainThread_    = pthread_self();
-
     m_aOrigXIOErrorHandler = XSetIOErrorHandler ( (XIOErrorHandler)XIOErrorHdl );
     PushXErrorLevel( !!getenv( "SAL_IGNOREXERRORS" ) );
 }


More information about the Libreoffice-commits mailing list