Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

* commit 'ooo/DEV300_m101': (185 commits)
  masterfix DEV300: #i10000# usage of L10N build_type
  masterfix: #i10000# INT16 -> sal_Int16
  fixed compile errors after resync to m100, part2
  gridsort: post-rebase fixes
  CWS gnumake3: found another tools integer type
  removetooltypes01: Fix build problems after rebase to DEV300m99 in basctl, cui, reportdesign, sw
  native359: #i114398# changing mac langpack icon
  native359: #i115669# fixing package description for solaris packages
  gnumake3: remove comphelper version; fix including extract.hxx
  locales34: #i106785# add Haitian_Haiti [ht-HT] to language list and locale data; locale data contributed by <jcpoulard>
  sb138: #i116659# timely termination of OnLogRotateThread
  accfixes: removed include of obsolete header file
  accfixes: removed obsolete file
  removetooltypes01: #i112600# Fix build problems on non-pro
  accfixes: moved some shared strings to svx part2
  accfixes: moved some shared strings to svx
  accfixes: added more accessibility information and fixed tab orders in multiple dialogs (cui module)
  removetooltypes01: #i112600# Remove tools types for Mac specific parts
  fixed tab order in BasicIDE, Library dialog tab page
  added some accessible names in BasicIDE
  ...

Conflicts:
	UnoControls/source/base/registercontrols.cxx
	accessibility/inc/accessibility/standard/vclxaccessiblelistboxlist.hxx
	automation/inc/automation/communi.hxx
	automation/inc/automation/simplecm.hxx
	automation/source/communi/communi.cxx
	automation/source/inc/rcontrol.hxx
	automation/source/miniapp/servuid.hxx
	automation/source/server/XMLParser.cxx
	automation/source/server/cmdbasestream.cxx
	automation/source/server/profiler.hxx
	automation/source/server/recorder.cxx
	automation/source/server/retstrm.hxx
	automation/source/server/server.cxx
	automation/source/server/sta_list.cxx
	automation/source/server/statemnt.cxx
	automation/source/server/statemnt.hxx
	automation/source/simplecm/packethandler.cxx
	automation/source/simplecm/simplecm.cxx
	automation/source/simplecm/tcpio.cxx
	automation/source/simplecm/tcpio.hxx
	automation/source/testtool/comm_bas.hxx
	automation/source/testtool/cretstrm.hxx
	automation/source/testtool/httprequest.cxx
	automation/source/testtool/httprequest.hxx
	automation/source/testtool/objtest.cxx
	automation/source/testtool/objtest.hxx
	basctl/source/basicide/baside2.cxx
	basctl/source/basicide/baside2.hxx
	basctl/source/basicide/baside2b.cxx
	basctl/source/basicide/baside3.cxx
	basctl/source/basicide/basides1.cxx
	basctl/source/basicide/basides2.cxx
	basctl/source/basicide/basidesh.cxx
	basctl/source/basicide/basidesh.src
	basctl/source/basicide/basobj3.cxx
	basctl/source/basicide/bastype2.cxx
	basctl/source/basicide/bastype3.cxx
	basctl/source/basicide/bastypes.cxx
	basctl/source/basicide/brkdlg.cxx
	basctl/source/basicide/iderdll.cxx
	basctl/source/basicide/macrodlg.cxx
	basctl/source/basicide/moduldl2.cxx
	basctl/source/basicide/moduldlg.cxx
	basctl/source/basicide/objdlg.cxx
	basctl/source/basicide/scriptdocument.cxx
	basctl/source/basicide/tbxctl.cxx
	basctl/source/basicide/tbxctl.hxx
	basctl/source/basicide/tbxctl.src
	basctl/source/dlged/dlged.cxx
	basctl/source/dlged/dlgedfunc.cxx
	basctl/source/dlged/dlgedobj.cxx
	basctl/source/inc/basidesh.hxx
	basctl/source/inc/bastypes.hxx
	basctl/source/inc/dlgedmod.hxx
	basctl/source/inc/dlgedpage.hxx
	crashrep/prj/build.lst
	cui/inc/pch/precompiled_cui.hxx
	cui/source/customize/acccfg.cxx
	cui/source/customize/acccfg.hrc
	cui/source/customize/acccfg.src
	cui/source/customize/cfg.cxx
	cui/source/customize/cfgutil.cxx
	cui/source/customize/macropg.cxx
	cui/source/customize/macropg.src
	cui/source/customize/selector.cxx
	cui/source/dialogs/SpellDialog.cxx
	cui/source/dialogs/commonlingui.cxx
	cui/source/dialogs/cuicharmap.cxx
	cui/source/dialogs/cuifmsearch.cxx
	cui/source/dialogs/cuigaldlg.cxx
	cui/source/dialogs/cuigrfflt.cxx
	cui/source/dialogs/hldocntp.cxx
	cui/source/dialogs/hldoctp.cxx
	cui/source/dialogs/hlinettp.cxx
	cui/source/dialogs/hlmailtp.cxx
	cui/source/dialogs/hlmarkwn.cxx
	cui/source/dialogs/hlmarkwn.src
	cui/source/dialogs/hltpbase.cxx
	cui/source/dialogs/iconcdlg.cxx
	cui/source/dialogs/passwdomdlg.cxx
	cui/source/dialogs/pastedlg.cxx
	cui/source/dialogs/scriptdlg.cxx
	cui/source/dialogs/thesdlg.cxx
	cui/source/dialogs/zoom.cxx
	cui/source/factory/dlgfact.hxx
	cui/source/inc/SpellDialog.hxx
	cui/source/inc/autocdlg.hxx
	cui/source/inc/backgrnd.hxx
	cui/source/inc/bbdlg.hxx
	cui/source/inc/cfg.hxx
	cui/source/inc/cfgutil.hxx
	cui/source/inc/cuigaldlg.hxx
	cui/source/inc/cuigrfflt.hxx
	cui/source/inc/cuitabarea.hxx
	cui/source/inc/cuitabline.hxx
	cui/source/inc/hldocntp.hxx
	cui/source/inc/hltpbase.hxx
	cui/source/inc/iconcdlg.hxx
	cui/source/inc/numpages.hxx
	cui/source/inc/page.hxx
	cui/source/inc/postdlg.hxx
	cui/source/inc/scriptdlg.hxx
	cui/source/inc/transfrm.hxx
	cui/source/inc/zoom.hxx
	cui/source/options/cfgchart.cxx
	cui/source/options/cuisrchdlg.cxx
	cui/source/options/dbregister.cxx
	cui/source/options/dbregister.src
	cui/source/options/fontsubs.cxx
	cui/source/options/internationaloptions.cxx
	cui/source/options/optasian.cxx
	cui/source/options/optchart.cxx
	cui/source/options/optcolor.cxx
	cui/source/options/optcolor.src
	cui/source/options/optfltr.cxx
	cui/source/options/optfltr.src
	cui/source/options/optgdlg.cxx
	cui/source/options/optgdlg.src
	cui/source/options/optgenrl.cxx
	cui/source/options/opthtml.cxx
	cui/source/options/optimprove.cxx
	cui/source/options/optinet2.cxx
	cui/source/options/optinet2.hxx
	cui/source/options/optjava.cxx
	cui/source/options/optlingu.cxx
	cui/source/options/optsave.cxx
	cui/source/options/optsave.hxx
	cui/source/options/treeopt.cxx
	cui/source/options/webconninfo.cxx
	cui/source/tabpages/autocdlg.cxx
	cui/source/tabpages/backgrnd.cxx
	cui/source/tabpages/border.cxx
	cui/source/tabpages/chardlg.cxx
	cui/source/tabpages/dstribut.cxx
	cui/source/tabpages/grfpage.cxx
	cui/source/tabpages/macroass.cxx
	cui/source/tabpages/measure.cxx
	cui/source/tabpages/numfmt.cxx
	cui/source/tabpages/numpages.cxx
	cui/source/tabpages/page.cxx
	cui/source/tabpages/paragrph.cxx
	cui/source/tabpages/swpossizetabpage.cxx
	cui/source/tabpages/tabarea.src
	cui/source/tabpages/textanim.cxx
	cui/source/tabpages/textattr.cxx
	cui/source/tabpages/tparea.cxx
	cui/source/tabpages/tpbitmap.cxx
	cui/source/tabpages/tpcolor.cxx
	cui/source/tabpages/tpgradnt.cxx
	cui/source/tabpages/tphatch.cxx
	cui/source/tabpages/tpline.cxx
	cui/source/tabpages/tplnedef.cxx
	cui/source/tabpages/tplneend.cxx
	cui/source/tabpages/tpshadow.cxx
	cui/source/tabpages/transfrm.cxx
	embedserv/source/embed/register.cxx
	extensions/inc/pch/precompiled_extensions.hxx
	extensions/inc/propctrlr.hrc
	extensions/source/abpilot/abpservices.cxx
	extensions/source/bibliography/bibload.cxx
	extensions/source/bibliography/datman.cxx
	extensions/source/bibliography/general.cxx
	extensions/source/dbpilots/dbpservices.cxx
	extensions/source/inc/componentmodule.cxx
	extensions/source/nsplugin/source/so_env.cxx
	extensions/source/ole/oleobjw.cxx
	extensions/source/ole/oleobjw.hxx
	extensions/source/oooimprovement/invite_job.cxx
	extensions/source/oooimprovement/onlogrotate_job.cxx
	extensions/source/plugin/base/service.cxx
	extensions/source/plugin/inc/plugin/unx/mediator.hxx
	extensions/source/plugin/inc/plugin/unx/plugcon.hxx
	extensions/source/plugin/unx/mediator.cxx
	extensions/source/plugin/unx/nppapi.cxx
	extensions/source/plugin/unx/plugcon.cxx
	extensions/source/preload/services.cxx
	extensions/source/propctrlr/formmetadata.cxx
	extensions/source/propctrlr/pcrservices.cxx
	extensions/source/resource/resource.cxx
	extensions/source/scanner/sane.hxx
	extensions/source/scanner/sanedlg.cxx
	extensions/source/scanner/scanunx.cxx
	extensions/source/scanner/scanwin.cxx
	extensions/source/scanner/twain.cxx
	extensions/source/scanner/twain.hxx
	extensions/source/update/check/updatecheckconfig.cxx
	extensions/test/stm/datatest.cxx
	extensions/test/stm/marktest.cxx
	extensions/test/stm/pipetest.cxx
	extensions/test/stm/testfactreg.cxx
	extensions/workben/testpgp.cxx
	forms/qa/complex/forms/CheckOGroupBoxModel.java
	forms/qa/makefile.mk
	forms/source/component/Button.cxx
	forms/source/component/Button.hxx
	forms/source/component/ListBox.cxx
	forms/source/inc/forms_module_impl.hxx
	forms/source/misc/services.cxx
	forms/source/solar/control/navtoolbar.cxx
	javainstaller2/prj/build.lst
	javainstaller2/src/JavaSetup/org/openoffice/setup/Util/ModuleCtrl.java
	lingucomponent/prj/build.lst
	lingucomponent/source/hyphenator/altlinuxhyph/hyphen/hyphenimp.cxx
	lingucomponent/source/spellcheck/spell/sreg.cxx
	lingucomponent/source/spellcheck/spell/sspellimp.cxx
	package/source/manifest/ManifestExport.cxx
	package/source/manifest/UnoRegister.cxx
	package/source/xstor/owriteablestream.cxx
	package/source/xstor/owriteablestream.hxx
	package/source/xstor/xstorage.hxx
	package/source/zippackage/ZipPackageFolder.cxx
	package/source/zippackage/ZipPackageStream.cxx
	setup_native/source/mac/ooo/DS_Store
	setup_native/source/win32/customactions/shellextensions/registerextensions.cxx
	xmlsecurity/prj/build.lst
	xmlsecurity/source/component/registerservices.cxx
	xmlsecurity/source/dialogs/stbcontrl.cxx
	xmlsecurity/source/framework/xsec_framework.cxx
	xmlsecurity/source/xmlsec/xsec_xmlsec.cxx
	xmlsecurity/tools/demo/util.hxx
	xmlsecurity/workben/signaturetest.cxx

1 files changed, 56 insertions, 56 deletions

diff --git a/automation/source/communi/communi.cxx b/automation/source/communi/communi.cxx
index a7f551d8b..6dcfb7b20 100644
--- a/automation/source/communi/communi.cxx
+++ b/automation/source/communi/communi.cxx
@@ -52,11 +52,11 @@
 #undef  SV_IMPL_PTRARR_SORT
 #define SV_IMPL_PTRARR_SORT( nm,AE )\
 _SV_IMPL_SORTAR_ALG( nm,AE )\
-    void nm::DeleteAndDestroy( USHORT nP, USHORT nL ) { \
+    void nm::DeleteAndDestroy( sal_uInt16 nP, sal_uInt16 nL ) { \
         if( nL ) {\
             DBG_ASSERT( nP < nA && nP + nL <= nA, "ERR_VAR_DEL" );\
-            for( USHORT n=nP; n < nP + nL; n++ ) \
-                OSL_FAIL("Das Element der Liste wurde nicht gelöscht"); \
+            for( sal_uInt16 n=nP; n < nP + nL; n++ ) \
+                OSL_FAIL("Das Element der Liste wurde nicht gel�scht"); \
             SvPtrarr::Remove( nP, nL ); \
         } \
     } \
@@ -73,8 +73,8 @@ CommunicationLinkViaSocket::CommunicationLinkViaSocket( CommunicationManager *pM
 : SimpleCommunicationLinkViaSocket( pMan, pSocket )
 , nConnectionClosedEventId( 0 )
 , nDataReceivedEventId( 0 )
-, bShutdownStarted( FALSE )
-, bDestroying( FALSE )
+, bShutdownStarted( sal_False )
+, bDestroying( sal_False )
 {
     SetPutDataReceivedHdl(LINK( this, CommunicationLinkViaSocket, PutDataReceivedHdl ));
     if ( !pMPostUserEvent )
@@ -88,7 +88,7 @@ CommunicationLinkViaSocket::CommunicationLinkViaSocket( CommunicationManager *pM
 
 CommunicationLinkViaSocket::~CommunicationLinkViaSocket()
 {
-    bDestroying = TRUE;
+    bDestroying = sal_True;
     StopCommunication();
     while ( nConnectionClosedEventId || nDataReceivedEventId )
         GetpApp()->Yield();
@@ -98,8 +98,8 @@ CommunicationLinkViaSocket::~CommunicationLinkViaSocket()
         {
             GetpApp()->RemoveUserEvent( nConnectionClosedEventId );
             nConnectionClosedEventId = 0;
-            INFO_MSG( CByteString("Event gelöscht"),
-                CByteString( "ConnectionClosedEvent aus Queue gelöscht"),
+            INFO_MSG( CByteString("Event gel�scht"),
+                CByteString( "ConnectionClosedEvent aus Queue gel�scht"),
                 CM_MISC, NULL );
         }
     }
@@ -110,14 +110,14 @@ CommunicationLinkViaSocket::~CommunicationLinkViaSocket()
             GetpApp()->RemoveUserEvent( nDataReceivedEventId );
             nDataReceivedEventId = 0;
             delete GetServiceData();
-            INFO_MSG( CByteString("Event gelöscht"),
-                CByteString( "DataReceivedEvent aus Queue gelöscht"),
+            INFO_MSG( CByteString("Event gel�scht"),
+                CByteString( "DataReceivedEvent aus Queue gel�scht"),
                 CM_MISC, NULL );
         }
     }
 }
 
-BOOL CommunicationLinkViaSocket::ShutdownCommunication()
+sal_Bool CommunicationLinkViaSocket::ShutdownCommunication()
 {
     if ( isRunning() )
     {
@@ -129,7 +129,7 @@ BOOL CommunicationLinkViaSocket::ShutdownCommunication()
         if ( GetStreamSocket() )	// Mal wieder nach oben verschoben, da sonst nicht vom Read runtergesprungen wird.
             GetStreamSocket()->close();
 
-        resume();	// So daß das run auch die Schleife verlassen kann
+        resume();	// So da� das run auch die Schleife verlassen kann
 
         join();
 
@@ -145,10 +145,10 @@ BOOL CommunicationLinkViaSocket::ShutdownCommunication()
         join();
     }
 
-    return TRUE;
+    return sal_True;
 }
 
-BOOL CommunicationLinkViaSocket::StopCommunication()
+sal_Bool CommunicationLinkViaSocket::StopCommunication()
 {
     if ( !bShutdownStarted )
     {
@@ -157,7 +157,7 @@ BOOL CommunicationLinkViaSocket::StopCommunication()
     else
     {
         WaitForShutdown();
-        return TRUE;
+        return sal_True;
     }
 }
 
@@ -177,7 +177,7 @@ void CommunicationLinkViaSocket::WaitForShutdown()
         aShutdownTimer.SetTimeout( 30000 );		// Should be 30 Seconds
         aShutdownTimer.SetTimeoutHdl( LINK( this, CommunicationLinkViaSocket, ShutdownLink ) );
         aShutdownTimer.Start();
-        bShutdownStarted = TRUE;
+        bShutdownStarted = sal_True;
     }
     if ( bDestroying )
     {
@@ -191,14 +191,14 @@ void CommunicationLinkViaSocket::WaitForShutdown()
     }
 }
 
-BOOL CommunicationLinkViaSocket::IsCommunicationError()
+sal_Bool CommunicationLinkViaSocket::IsCommunicationError()
 {
     return !isRunning() || SimpleCommunicationLinkViaSocket::IsCommunicationError();
 }
 
 void CommunicationLinkViaSocket::run()
 {
-    BOOL bWasError = FALSE;
+    sal_Bool bWasError = sal_False;
     while ( schedule() && !bWasError && GetStreamSocket() )
     {
         if ( bWasError |= !DoReceiveDataStream() )
@@ -227,10 +227,10 @@ void CommunicationLinkViaSocket::run()
     }
 }
 
-BOOL CommunicationLinkViaSocket::DoTransferDataStream( SvStream *pDataStream, CMProtocol nProtocol )
+sal_Bool CommunicationLinkViaSocket::DoTransferDataStream( SvStream *pDataStream, CMProtocol nProtocol )
 {
     if ( !isRunning() )
-        return FALSE;
+        return sal_False;
 
     return SimpleCommunicationLinkViaSocket::DoTransferDataStream( pDataStream, nProtocol );
 }
@@ -240,7 +240,7 @@ long CommunicationLinkViaSocket::ConnectionClosed( void* EMPTYARG )
 {
     {
         osl::MutexGuard aGuard( aMConnectionClosed );
-        nConnectionClosedEventId = 0;	// Achtung!! alles andere muß oben gemacht werden.
+        nConnectionClosedEventId = 0;	// Achtung!! alles andere mu� oben gemacht werden.
     }
     ShutdownCommunication();
     return CommunicationLink::ConnectionClosed( );
@@ -251,7 +251,7 @@ long CommunicationLinkViaSocket::DataReceived( void* EMPTYARG )
 {
     {
         osl::MutexGuard aGuard( aMDataReceived );
-        nDataReceivedEventId = 0;	// Achtung!! alles andere muß oben gemacht werden.
+        nDataReceivedEventId = 0;	// Achtung!! alles andere mu� oben gemacht werden.
     }
     return CommunicationLink::DataReceived( );
 }
@@ -264,9 +264,9 @@ IMPL_LINK( CommunicationLinkViaSocket, PutDataReceivedHdl, CommunicationLinkViaS
 
 
 
-MultiCommunicationManager::MultiCommunicationManager( BOOL bUseMultiChannel )
+MultiCommunicationManager::MultiCommunicationManager( sal_Bool bUseMultiChannel )
 : CommunicationManager( bUseMultiChannel )
-, bGracefullShutdown( TRUE )
+, bGracefullShutdown( sal_True )
 {
     ActiveLinks = new CommunicationLinkList;
     InactiveLinks = new CommunicationLinkList;
@@ -281,8 +281,8 @@ MultiCommunicationManager::~MultiCommunicationManager()
         Timer aTimeout;
         aTimeout.SetTimeout( 40000 );
         aTimeout.Start();
-        USHORT nLinkCount = 0;
-        USHORT nNewLinkCount = 0;
+        sal_uInt16 nLinkCount = 0;
+        sal_uInt16 nNewLinkCount = 0;
         while ( aTimeout.IsActive() )
         {
             GetpApp()->Yield();
@@ -297,9 +297,9 @@ MultiCommunicationManager::~MultiCommunicationManager()
         }
     }
 
-    // Alles weghauen, was nicht rechtzeitig auf die Bäume gekommen ist
-    // Was bei StopCommunication übrig geblieben ist, da es sich asynchron austragen wollte
-    USHORT i = ActiveLinks->Count();
+    // Alles weghauen, was nicht rechtzeitig auf die B�ume gekommen ist
+    // Was bei StopCommunication �brig geblieben ist, da es sich asynchron austragen wollte
+    sal_uInt16 i = ActiveLinks->Count();
     while ( i-- )
     {
         CommunicationLinkRef rTempLink = ActiveLinks->GetObject( i );
@@ -310,7 +310,7 @@ MultiCommunicationManager::~MultiCommunicationManager()
     delete ActiveLinks;
 
     /// Die Links zwischen ConnectionClosed und Destruktor.
-    /// Hier NICHT gerefcounted, da sie sich sonst im Kreis festhaten würden,
+    /// Hier NICHT gerefcounted, da sie sich sonst im Kreis festhaten w�rden,
     /// da die Links sich erst in ihrem Destruktor austragen
     i = InactiveLinks->Count();
     while ( i-- )
@@ -322,44 +322,44 @@ MultiCommunicationManager::~MultiCommunicationManager()
     delete InactiveLinks;
 }
 
-BOOL MultiCommunicationManager::StopCommunication()
+sal_Bool MultiCommunicationManager::StopCommunication()
 {
     // Alle Verbindungen abbrechen
     // ConnectionClosed entfernt die Links aus der Liste. Je nach Implementation syncron
-    // oder asyncron. Daher Von oben nach unten Abräumen, so daß sich nichts verschiebt.
-    USHORT i = ActiveLinks->Count();
+    // oder asyncron. Daher Von oben nach unten Abr�umen, so da� sich nichts verschiebt.
+    sal_uInt16 i = ActiveLinks->Count();
     int nFail = 0;
     while ( i )
     {
         if ( !ActiveLinks->GetObject(i-1)->StopCommunication() )
-            nFail++;    // Hochzählen, da Verbindung sich nicht (sofort) beenden lässt.
+            nFail++;    // Hochz�hlen, da Verbindung sich nicht (sofort) beenden l�sst.
         i--;
     }
 
     return nFail == 0;
 }
 
-BOOL MultiCommunicationManager::IsLinkValid( CommunicationLink* pCL )
+sal_Bool MultiCommunicationManager::IsLinkValid( CommunicationLink* pCL )
 {
     if ( ActiveLinks->Seek_Entry( pCL ) )
-        return TRUE;
+        return sal_True;
     else
-        return FALSE;
+        return sal_False;
 }
 
-USHORT MultiCommunicationManager::GetCommunicationLinkCount()
+sal_uInt16 MultiCommunicationManager::GetCommunicationLinkCount()
 {
     return ActiveLinks->Count();
 }
 
-CommunicationLinkRef MultiCommunicationManager::GetCommunicationLink( USHORT nNr )
+CommunicationLinkRef MultiCommunicationManager::GetCommunicationLink( sal_uInt16 nNr )
 {
     return ActiveLinks->GetObject( nNr );
 }
 
 void MultiCommunicationManager::CallConnectionOpened( CommunicationLink* pCL )
 {
-    CommunicationLinkRef rHold(pCL);	// Hält den Zeiger bis zum Ende des calls
+    CommunicationLinkRef rHold(pCL);	// H�lt den Zeiger bis zum Ende des calls
     ActiveLinks->C40_PTR_INSERT(CommunicationLink, pCL);
     rHold->AddRef();
 
@@ -368,11 +368,11 @@ void MultiCommunicationManager::CallConnectionOpened( CommunicationLink* pCL )
 
 void MultiCommunicationManager::CallConnectionClosed( CommunicationLink* pCL )
 {
-    CommunicationLinkRef rHold(pCL);	// Hält denm Zeiger bis zum Ende des calls
+    CommunicationLinkRef rHold(pCL);	// H�lt denm Zeiger bis zum Ende des calls
 
     CommunicationManager::CallConnectionClosed( pCL );
 
-    USHORT nPos;
+    sal_uInt16 nPos;
     if ( ActiveLinks->Seek_Entry( pCL, &nPos ) )
     {
         InactiveLinks->C40_PTR_INSERT(CommunicationLink, pCL);	// Ohne Reference
@@ -383,13 +383,13 @@ void MultiCommunicationManager::CallConnectionClosed( CommunicationLink* pCL )
     bIsCommunicationRunning = ActiveLinks->Count() > 0;
 //	delete pCL;
 #if OSL_DEBUG_LEVEL > 1
-        rHold->bFlag = TRUE;
+        rHold->bFlag = sal_True;
 #endif
 }
 
 void MultiCommunicationManager::DestroyingLink( CommunicationLink *pCL )
 {
-    USHORT nPos;
+    sal_uInt16 nPos;
     if ( InactiveLinks->Seek_Entry( pCL, &nPos ) )
         InactiveLinks->Remove( nPos );
     pCL->InvalidateManager();
@@ -397,7 +397,7 @@ void MultiCommunicationManager::DestroyingLink( CommunicationLink *pCL )
 
 
 
-CommunicationManagerClient::CommunicationManagerClient( BOOL bUseMultiChannel )
+CommunicationManagerClient::CommunicationManagerClient( sal_Bool bUseMultiChannel )
 : MultiCommunicationManager( bUseMultiChannel )
 {
     ByteString aApplication("Something inside ");
@@ -407,7 +407,7 @@ CommunicationManagerClient::CommunicationManagerClient( BOOL bUseMultiChannel )
 
 
 
-CommunicationManagerServerViaSocket::CommunicationManagerServerViaSocket( ULONG nPort, USHORT nMaxCon, BOOL bUseMultiChannel )
+CommunicationManagerServerViaSocket::CommunicationManagerServerViaSocket( sal_uLong nPort, sal_uInt16 nMaxCon, sal_Bool bUseMultiChannel )
 : CommunicationManagerServer( bUseMultiChannel )
 , nPortToListen( nPort )
 , nMaxConnections( nMaxCon )
@@ -420,15 +420,15 @@ CommunicationManagerServerViaSocket::~CommunicationManagerServerViaSocket()
     StopCommunication();
 }
 
-BOOL CommunicationManagerServerViaSocket::StartCommunication()
+sal_Bool CommunicationManagerServerViaSocket::StartCommunication()
 {
     if ( !pAcceptThread )
         pAcceptThread = new CommunicationManagerServerAcceptThread( this, nPortToListen, nMaxConnections );
-    return TRUE;
+    return sal_True;
 }
 
 
-BOOL CommunicationManagerServerViaSocket::StopCommunication()
+sal_Bool CommunicationManagerServerViaSocket::StopCommunication()
 {
     // Erst den Acceptor anhalten
     delete pAcceptThread;
@@ -445,7 +445,7 @@ void CommunicationManagerServerViaSocket::AddConnection( CommunicationLink *pNew
 }
 
 
-CommunicationManagerServerAcceptThread::CommunicationManagerServerAcceptThread( CommunicationManagerServerViaSocket* pServer, ULONG nPort, USHORT nMaxCon )
+CommunicationManagerServerAcceptThread::CommunicationManagerServerAcceptThread( CommunicationManagerServerViaSocket* pServer, sal_uLong nPort, sal_uInt16 nMaxCon )
 : pMyServer( pServer )
 , pAcceptorSocket( NULL )
 , nPortToListen( nPort )
@@ -478,7 +478,7 @@ CommunicationManagerServerAcceptThread::~CommunicationManagerServerAcceptThread(
         pAcceptorSocket = NULL;
     }
 #else
-    DEBUGPRINTF ("Destructor CommunicationManagerServerAcceptThread Übersprungen!!!! (wegen Solaris BUG)\n");
+    DEBUGPRINTF ("Destructor CommunicationManagerServerAcceptThread �bersprungen!!!! (wegen Solaris BUG)\n");
 #endif
     {
         osl::MutexGuard aGuard( aMAddConnection );
@@ -487,11 +487,11 @@ CommunicationManagerServerAcceptThread::~CommunicationManagerServerAcceptThread(
             GetpApp()->RemoveUserEvent( nAddConnectionEventId );
             nAddConnectionEventId = 0;
             CommunicationLinkRef xNewConnection = GetNewConnection();
-            INFO_MSG( CByteString("Event gelöscht"),
-                CByteString( "AddConnectionEvent aus Queue gelöscht"),
+            INFO_MSG( CByteString("Event gel�scht"),
+                CByteString( "AddConnectionEvent aus Queue gel�scht"),
                 CM_MISC, xNewConnection );
             xNewConnection->InvalidateManager();
-            xNewConnection.Clear();	// sollte das Objekt hier löschen
+            xNewConnection.Clear();	// sollte das Objekt hier l�schen
         }
     }
 }
@@ -577,14 +577,14 @@ IMPL_LINK( CommunicationManagerServerAcceptThread, AddConnection, void*, EMPTYAR
     }
 
 
-CommunicationManagerClientViaSocket::CommunicationManagerClientViaSocket( ByteString aHost, ULONG nPort, BOOL bUseMultiChannel )
+CommunicationManagerClientViaSocket::CommunicationManagerClientViaSocket( ByteString aHost, sal_uLong nPort, sal_Bool bUseMultiChannel )
 : CommunicationManagerClient( bUseMultiChannel )
 , aHostToTalk( aHost )
 , nPortToTalk( nPort )
 {
 }
 
-CommunicationManagerClientViaSocket::CommunicationManagerClientViaSocket( BOOL bUseMultiChannel )
+CommunicationManagerClientViaSocket::CommunicationManagerClientViaSocket( sal_Bool bUseMultiChannel )
 : CommunicationManagerClient( bUseMultiChannel )
 , aHostToTalk( "" )
 , nPortToTalk( 0 )