diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:55:08 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:55:08 +0100 |
| commit | 4fdd55226d2972e3a256426db3122ac23b0615c6 (patch) | |
| tree | 23f5b3a68382d6d3b8db0cb5e2537ed74a228d7c /vcl/unx/source/app/sm.cxx | |
| parent | c3d5444d84e18fa82235bb9d419861ac5e54f544 (diff) | |
| parent | e1028d9225bc47922c387aa462887c7643bc6c40 (diff) | |
Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts:
comphelper/source/misc/servicedecl.cxx
i18npool/source/breakiterator/breakiteratorImpl.cxx
l10ntools/scripts/localize.pl
svl/source/items/itemset.cxx
svl/source/memtools/svarray.cxx
svl/source/numbers/zformat.cxx
svtools/source/brwbox/brwbox1.cxx
tools/source/stream/strmwnt.cxx
vcl/inc/vcl/graphite_adaptors.hxx
vcl/inc/vcl/graphite_layout.hxx
vcl/inc/vcl/graphite_serverfont.hxx
vcl/source/control/imgctrl.cxx
vcl/source/gdi/outdev.cxx
vcl/source/gdi/outdev3.cxx
vcl/source/glyphs/gcach_ftyp.cxx
vcl/source/glyphs/graphite_adaptors.cxx
vcl/source/glyphs/graphite_layout.cxx
vcl/source/window/winproc.cxx
vcl/unx/source/fontmanager/fontconfig.cxx
Diffstat (limited to 'vcl/unx/source/app/sm.cxx')
| -rw-r--r-- | vcl/unx/source/app/sm.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vcl/unx/source/app/sm.cxx b/vcl/unx/source/app/sm.cxx index 6e2b2a3babfa..6bfd09fc4f5d 100644 --- a/vcl/unx/source/app/sm.cxx +++ b/vcl/unx/source/app/sm.cxx @@ -151,7 +151,7 @@ extern "C" void SAL_CALL ICEConnectionWorker( void* ); class ICEConnectionObserver { friend void SAL_CALL ICEConnectionWorker(void*); - static BOOL bIsWatching; + static sal_Bool bIsWatching; static void ICEWatchProc( IceConn connection, IcePointer client_data, Bool opening, IcePointer* watch_data ); @@ -177,7 +177,7 @@ public: SmcConn SessionManagerClient::aSmcConnection = NULL; ByteString SessionManagerClient::aClientID; -BOOL ICEConnectionObserver::bIsWatching = FALSE; +sal_Bool ICEConnectionObserver::bIsWatching = sal_False; struct pollfd* ICEConnectionObserver::pFilehandles = NULL; IceConn* ICEConnectionObserver::pConnections = NULL; int ICEConnectionObserver::nConnections = 0; @@ -609,7 +609,7 @@ void ICEConnectionObserver::activate() { nWakeupFiles[0] = nWakeupFiles[1] = 0; ICEMutex = osl_createMutex(); - bIsWatching = TRUE; + bIsWatching = sal_True; #ifdef USE_SM_EXTENSION /* * Default handlers call exit, we don't care that strongly if something @@ -627,7 +627,7 @@ void ICEConnectionObserver::deactivate() if( bIsWatching ) { lock(); - bIsWatching = FALSE; + bIsWatching = sal_False; #ifdef USE_SM_EXTENSION IceRemoveConnectionWatch( ICEWatchProc, NULL ); IceSetErrorHandler( origErrorHandler ); |