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

18 files changed, 1227 insertions, 1237 deletions

diff --git a/automation/source/server/XMLParser.cxx b/automation/source/server/XMLParser.cxx
index cd4f6a051..dc9d11289 100644
--- a/automation/source/server/XMLParser.cxx
+++ b/automation/source/server/XMLParser.cxx
@@ -89,9 +89,9 @@ void SAL_CALL SVInputStream::skipBytes( sal_Int32 nBytesToSkip ) throw (::com::s
 
 sal_Int32 SAL_CALL SVInputStream::available(  ) throw (::com::sun::star::io::NotConnectedException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException)
 {
-    ULONG nCurrent = pStream->Tell();
-    ULONG nSize = pStream->Seek( STREAM_SEEK_TO_END );
-    ULONG nAvailable = nSize - nCurrent;
+    sal_uLong nCurrent = pStream->Tell();
+    sal_uLong nSize = pStream->Seek( STREAM_SEEK_TO_END );
+    sal_uLong nAvailable = nSize - nCurrent;
     pStream->Seek( nCurrent );
     return nAvailable;
 }
@@ -160,8 +160,8 @@ class ElementNode : public Node
 public:
     ElementNode( const String& aName, Reference < XAttributeList > xAttributes );
     void AppendNode( NodeRef xNewNode );
-    ULONG GetChildCount(){ return aDocumentNodeList.Count(); }
-    NodeRef GetChild( USHORT nIndex ){ return aDocumentNodeList.GetObject( nIndex ); }
+    sal_uLong GetChildCount(){ return aDocumentNodeList.Count(); }
+    NodeRef GetChild( sal_uInt16 nIndex ){ return aDocumentNodeList.GetObject( nIndex ); }
     Reference < XAttributeList > GetAttributes(){ return xAttributeList; }
 
     String GetNodeName() { return aNodeName; }
@@ -208,7 +208,7 @@ class SAXParser : public cppu::WeakImplHelper2< XErrorHandler, XDocumentHandler
 
     NodeRef xTreeRoot;
     NodeRef xCurrentNode;
-    ULONG nTimestamp;
+    sal_uLong nTimestamp;
     ParseAction aAction;
 
 public:
@@ -219,11 +219,11 @@ public:
     NodeRef GetCurrentNode(){ return xCurrentNode; }
     void SetCurrentNode( NodeRef xCurrent ){ xCurrentNode = xCurrent; }
     NodeRef GetRootNode(){ return xTreeRoot; }
-    ULONG GetTimestamp(){ return nTimestamp; }
+    sal_uLong GetTimestamp(){ return nTimestamp; }
     void Touch(){ nTimestamp = Time::GetSystemTicks(); }
 
     // Methods SAXParser
-    BOOL Parse( ParseAction aAct );
+    sal_Bool Parse( ParseAction aAct );
     String GetErrors(){ return aErrors; }
 
     // Methods XErrorHandler
@@ -254,13 +254,13 @@ SAXParser::~SAXParser()
     xParser.clear();
 }
 
-BOOL SAXParser::Parse( ParseAction aAct )
+sal_Bool SAXParser::Parse( ParseAction aAct )
 {
     aAction = aAct;
     Touch();
     SvStream* pStream = new SvFileStream( aFilename, STREAM_STD_READ );
     if ( pStream->GetError() )
-        return FALSE;
+        return sal_False;
 
     InputSource sSource;
     sSource.aInputStream = new SVInputStream( pStream );    // is refcounted and hence deletet appropriately
@@ -296,8 +296,8 @@ BOOL SAXParser::Parse( ParseAction aAct )
             xParser->setDocumentHandler( NULL );    // otherwile Object holds itself
     }
     else
-        return FALSE;
-    return TRUE;
+        return sal_False;
+    return sal_True;
 }
 
 
@@ -365,13 +365,13 @@ void SAXParser::characters( const ::rtl::OUString& aChars ) throw (::com::sun::s
 {
     if ( aAction == COLLECT_DATA_IGNORE_WHITESPACE )
     {   // check for whitespace
-        BOOL bAllWhitespace = TRUE;
+        sal_Bool bAllWhitespace = sal_True;
         for ( int i = 0 ; bAllWhitespace && i < aChars.getLength() ; i++ )
             if ( aChars[i] != 10 // LF
               && aChars[i] != 13 // CR
               && aChars[i] != ' ' // Blank
               && aChars[i] != '\t' ) // Tab
-                bAllWhitespace = FALSE;
+                bAllWhitespace = sal_False;
         if ( bAllWhitespace )
             return;
     }
@@ -457,7 +457,7 @@ void StatementCommand::HandleSAXParser()
                     {
                         if ( !pSAXParser->Parse( PARSE_ONLY ) )
                             ReportError( GEN_RES_STR1( S_NO_SAX_PARSER, RcString( nMethodId ) ) );
-                        pRet->GenReturn ( RET_Value, aSmartMethodId, pSAXParser->GetErrors() );
+                        pRet->GenReturn ( RET_Value, nMethodId, pSAXParser->GetErrors() );
                     }
 
                     xParserKeepaliveReference.clear();
@@ -487,7 +487,7 @@ void StatementCommand::HandleSAXParser()
 
                         if ( !pSAXParser->Parse( aAction ) )
                             ReportError( GEN_RES_STR1( S_NO_SAX_PARSER, RcString( nMethodId ) ) );
-                        pRet->GenReturn ( RET_Value, aSmartMethodId, pSAXParser->GetErrors() );
+                        pRet->GenReturn ( RET_Value, nMethodId, pSAXParser->GetErrors() );
                     }
                 }
                 else
@@ -496,7 +496,7 @@ void StatementCommand::HandleSAXParser()
             break;
         case RC_SAXGetNodeType:
             {
-                   pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_ULONG)pSAXParser->GetCurrentNode()->GetNodeType() );
+                   pRet->GenReturn ( RET_Value, nMethodId, (comm_ULONG)pSAXParser->GetCurrentNode()->GetNodeType() );
             }
             break;
         case RC_SAXGetAttributeCount:
@@ -511,23 +511,23 @@ void StatementCommand::HandleSAXParser()
                     switch ( nMethodId )
                     {
                         case RC_SAXGetElementName:
-                            pRet->GenReturn ( RET_Value, aSmartMethodId, pElementNode->GetNodeName() );
+                            pRet->GenReturn ( RET_Value, nMethodId, pElementNode->GetNodeName() );
                             break;
                         case RC_SAXGetChildCount:
-                            pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_ULONG)pElementNode->GetChildCount() );
+                            pRet->GenReturn ( RET_Value, nMethodId, (comm_ULONG)pElementNode->GetChildCount() );
                             break;
                         case RC_SAXGetAttributeCount:
                             if ( xAttributeList.is() )
-                                pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_ULONG)xAttributeList->getLength() );
+                                pRet->GenReturn ( RET_Value, nMethodId, (comm_ULONG)xAttributeList->getLength() );
                             else
-                                pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_ULONG)0 );
+                                pRet->GenReturn ( RET_Value, nMethodId, (comm_ULONG)0 );
                             break;
                         case RC_SAXGetAttributeName:
                             {
-                                if( (nParams & PARAM_USHORT_1) && ValueOK( aSmartMethodId, RcString( nMethodId ), nNr1, xAttributeList.is()?xAttributeList->getLength():0 ) )
+                                if( (nParams & PARAM_USHORT_1) && ValueOK( rtl::OString(), RcString( nMethodId ), nNr1, xAttributeList.is()?xAttributeList->getLength():0 ) )
                                 {
                                     String aRet( xAttributeList->getNameByIndex( nNr1-1 ) );
-                                    pRet->GenReturn ( RET_Value, aSmartMethodId, aRet );
+                                    pRet->GenReturn ( RET_Value, nMethodId, aRet );
                                 }
                                 else
                                     ReportError( GEN_RES_STR0( S_INVALID_PARAMETERS ) );
@@ -536,15 +536,15 @@ void StatementCommand::HandleSAXParser()
                         case RC_SAXGetAttributeValue:
                             // Number or String
                             {
-                                if( (nParams & PARAM_USHORT_1) && ValueOK( aSmartMethodId, RcString( nMethodId ), nNr1, xAttributeList.is()?xAttributeList->getLength():0 ) )
+                                if( (nParams & PARAM_USHORT_1) && ValueOK( rtl::OString(), RcString( nMethodId ), nNr1, xAttributeList.is()?xAttributeList->getLength():0 ) )
                                 {
                                     String aRet( xAttributeList->getValueByIndex( nNr1-1 ) );
-                                    pRet->GenReturn ( RET_Value, aSmartMethodId, aRet );
+                                    pRet->GenReturn ( RET_Value, nMethodId, aRet );
                                 }
                                 else if( (nParams & PARAM_STR_1) && xAttributeList.is() )
                                 {
                                     String aRet( xAttributeList->getValueByName( aString1 ) );
-                                    pRet->GenReturn ( RET_Value, aSmartMethodId, aRet );
+                                    pRet->GenReturn ( RET_Value, nMethodId, aRet );
                                 }
                                 else
                                     ReportError( GEN_RES_STR0( S_INVALID_PARAMETERS ) );
@@ -565,7 +565,7 @@ void StatementCommand::HandleSAXParser()
                 {
                     NodeRef xNode=pSAXParser->GetCurrentNode();
                     CharacterNode* aCharacterNode = (CharacterNode*)(&xNode);
-                       pRet->GenReturn ( RET_Value, aSmartMethodId, aCharacterNode->GetCharacters() );
+                       pRet->GenReturn ( RET_Value, nMethodId, aCharacterNode->GetCharacters() );
                 }
                 else
                     ReportError( GEN_RES_STR0( S_INVALID_PARAMETERS ) );
@@ -576,22 +576,22 @@ void StatementCommand::HandleSAXParser()
         case RC_SAXHasElement:
             // Number or String
             {
-                BOOL bCheckOnly = nMethodId == RC_SAXHasElement;
+                sal_Bool bCheckOnly = nMethodId == RC_SAXHasElement;
 
                 if( (nParams & PARAM_USHORT_1) && !(nParams & PARAM_STR_1) )
                 {
                     if ( nNr1 == 0 )
                     {
                         if ( bCheckOnly )
-                            pRet->GenReturn ( RET_Value, aSmartMethodId, pSAXParser->GetCurrentNode()->GetParent().Is() );
+                            pRet->GenReturn ( RET_Value, nMethodId, pSAXParser->GetCurrentNode()->GetParent().Is() );
                         else if ( pSAXParser->GetCurrentNode()->GetParent().Is() )
                             pSAXParser->SetCurrentNode( pSAXParser->GetCurrentNode()->GetParent() );
                     }
                     else if ( !pElementNode )
                         ReportError( GEN_RES_STR0( S_INVALID_PARAMETERS ) );
                     else if ( bCheckOnly )
-                        pRet->GenReturn ( RET_Value, aSmartMethodId, ValueOK( aSmartMethodId, String(), nNr1, pElementNode->GetChildCount() ) );
-                    else if ( ValueOK( aSmartMethodId, RcString( nMethodId ), nNr1, pElementNode->GetChildCount() ) )
+                        pRet->GenReturn ( RET_Value, nMethodId, ValueOK( rtl::OString(), RcString( nMethodId ), nNr1, pElementNode->GetChildCount() ) );
+                    else if ( ValueOK( rtl::OString(), RcString( nMethodId ), nNr1, pElementNode->GetChildCount() ) )
                         pSAXParser->SetCurrentNode( pElementNode->GetChild( nNr1-1 ) );
                 }
                 else if( (nParams & PARAM_STR_1) )
@@ -599,16 +599,16 @@ void StatementCommand::HandleSAXParser()
                     if ( aString1.EqualsAscii( "/" ) )
                     {
                         if ( bCheckOnly )
-                            pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_BOOL)TRUE );
+                            pRet->GenReturn ( RET_Value, nMethodId, (comm_BOOL)sal_True );
                         else
                             pSAXParser->SetCurrentNode( pSAXParser->GetRootNode() );
                     }
                     else if ( aString1.Copy(0,2).EqualsAscii( "*:" ) )
                     {
-                        ULONG nTimestamp = (ULONG)aString1.GetToken( 1, ':' ).ToInt64();
-                        ULONG nPointer = (ULONG)aString1.GetToken( 2, ':' ).ToInt64();
+                        sal_uLong nTimestamp = (sal_uLong)aString1.GetToken( 1, ':' ).ToInt64();
+                        sal_uLong nPointer = (sal_uLong)aString1.GetToken( 2, ':' ).ToInt64();
                         if ( bCheckOnly )
-                            pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_BOOL)(pSAXParser->GetTimestamp() == nTimestamp) );
+                            pRet->GenReturn ( RET_Value, nMethodId, (comm_BOOL)(pSAXParser->GetTimestamp() == nTimestamp) );
                         else
                             if ( pSAXParser->GetTimestamp() == nTimestamp )
                             {
@@ -622,13 +622,13 @@ void StatementCommand::HandleSAXParser()
                     }
                     else if ( pElementNode )
                     {
-                        USHORT nNthOccurrence;
+                        sal_uInt16 nNthOccurrence;
                         if( (nParams & PARAM_USHORT_1) )
                             nNthOccurrence = nNr1;
                         else
                             nNthOccurrence = 1;
 
-                        USHORT i;
+                        sal_uInt16 i;
                         NodeRef xNew;
                         for ( i = 0 ; i < pElementNode->GetChildCount() && !xNew.Is() ; i++ )
                         {
@@ -651,7 +651,7 @@ void StatementCommand::HandleSAXParser()
                                 xNew.Clear();
                         }
                         if ( bCheckOnly )
-                            pRet->GenReturn ( RET_Value, aSmartMethodId, xNew.Is() );
+                            pRet->GenReturn ( RET_Value, nMethodId, xNew.Is() );
                         else
                             if ( xNew.Is() )
                                 pSAXParser->SetCurrentNode( xNew );
@@ -660,7 +660,7 @@ void StatementCommand::HandleSAXParser()
                     }
                     else
                         if ( bCheckOnly )
-                            pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_BOOL)FALSE );
+                            pRet->GenReturn ( RET_Value, nMethodId, (comm_BOOL)sal_False );
                         else
                             ReportError( GEN_RES_STR0( S_INVALID_PARAMETERS ) );
                 }
@@ -670,15 +670,15 @@ void StatementCommand::HandleSAXParser()
             break;
         case RC_SAXGetElementPath:
             {
-                DBG_ASSERT( sizeof( ULONG ) == sizeof ( void* ), "Pointertype has different size than ULONG");
+                DBG_ASSERT( sizeof( sal_uIntPtr ) == sizeof ( void* ), "Pointertype has different size than sal_uIntPtr");
                 String aPath;
                 aPath.AppendAscii( "*:" );
                 aPath.Append( String::CreateFromInt64( pSAXParser->GetTimestamp() ) );
                 aPath.AppendAscii( ":" );
                 NodeRef xNode=pSAXParser->GetCurrentNode();
                 Node* pNode = (Node*)(&xNode);
-                aPath.Append( String::CreateFromInt64( (ULONG)pNode ) );
-                pRet->GenReturn ( RET_Value, aSmartMethodId, aPath );
+                aPath.Append( String::CreateFromInt64( (sal_uIntPtr)pNode ) );
+                pRet->GenReturn ( RET_Value, nMethodId, aPath );
             }
             break;
 
diff --git a/automation/source/server/cmdbasestream.cxx b/automation/source/server/cmdbasestream.cxx
index d71dcf114..707f6b80f 100644
--- a/automation/source/server/cmdbasestream.cxx
+++ b/automation/source/server/cmdbasestream.cxx
@@ -51,7 +51,7 @@ CmdBaseStream::~CmdBaseStream()
 {
 }
 
-void CmdBaseStream::GenError (SmartId *pUId, comm_String *pString )
+void CmdBaseStream::GenError (rtl::OString *pUId, comm_String *pString )
 {
     Write(comm_USHORT(SIReturnError));
     Write(pUId);
@@ -66,46 +66,95 @@ void CmdBaseStream::GenReturn (comm_USHORT nRet, comm_ULONG nUId )
     Write(comm_USHORT(PARAM_NONE));				// Typ der folgenden Parameter
 }
 
-void CmdBaseStream::GenReturn (comm_USHORT nRet, SmartId *pUId, comm_ULONG nNr )
+void CmdBaseStream::GenReturn (comm_USHORT nRet, rtl::OString *pUId, comm_ULONG nNr )
 {
     Write(comm_USHORT(SIReturn));
     Write(nRet);
-    Write(pUId);
+    if ( pUId->equals( rtl::OString( "UID_ACTIVE" ) ) )
+        Write(comm_ULONG(0));
+    else
+        Write(pUId);
     Write(comm_USHORT(PARAM_ULONG_1));			// Typ der folgenden Parameter
     Write(nNr);
 }
 
-void CmdBaseStream::GenReturn (comm_USHORT nRet, SmartId *pUId, comm_String *pString )
+void CmdBaseStream::GenReturn (comm_USHORT nRet, rtl::OString *pUId, comm_String *pString )
 {
     Write(comm_USHORT(SIReturn));
     Write(nRet);
-    Write(pUId);
+    if ( pUId->equals( rtl::OString( "UID_ACTIVE" ) ) )
+        Write(comm_ULONG(0));
+    else
+        Write(pUId);
     Write(comm_USHORT(PARAM_STR_1));				// Typ der folgenden Parameter
     Write(pString);
 }
 
-void CmdBaseStream::GenReturn (comm_USHORT nRet, SmartId *pUId, comm_BOOL bBool )
+void CmdBaseStream::GenReturn (comm_USHORT nRet, rtl::OString *pUId, comm_BOOL bBool )
 {
     Write(comm_USHORT(SIReturn));
     Write(nRet);
-    Write(pUId);
+    if ( pUId->equals( rtl::OString( "UID_ACTIVE" ) ) )
+        Write(comm_ULONG(0));
+    else
+        Write(pUId);
     Write(comm_USHORT(PARAM_BOOL_1));			// Typ der folgenden Parameter
     Write(bBool);
 }
 
-void CmdBaseStream::GenReturn (comm_USHORT nRet, SmartId *pUId, comm_ULONG nNr, comm_String *pString, comm_BOOL bBool )
+void CmdBaseStream::GenReturn (comm_USHORT nRet, rtl::OString *pUId, comm_ULONG nNr, comm_String *pString, comm_BOOL bBool )
 {
     Write(comm_USHORT(SIReturn));
     Write(nRet);
-    Write(pUId);
+    if ( pUId->equals( rtl::OString( "UID_ACTIVE" ) ) )
+        Write(comm_ULONG(0));
+    else
+        Write(pUId);
     Write(comm_USHORT(PARAM_ULONG_1|PARAM_STR_1|PARAM_BOOL_1));		// Typ der folgenden Parameter
     Write(nNr);
     Write(pString);
     Write(bBool);
 }
 
+void CmdBaseStream::GenReturn (comm_USHORT nRet, comm_USHORT nMethod, comm_ULONG nNr )
+{
+    Write(comm_USHORT(SIReturn));
+    Write(nRet);
+    Write((comm_ULONG)nMethod); //HELPID BACKWARD (no sal_uLong needed)
+    Write(comm_USHORT(PARAM_ULONG_1));			// Typ der folgenden Parameter
+    Write(nNr);
+}
+
+void CmdBaseStream::GenReturn (comm_USHORT nRet, comm_USHORT nMethod, comm_String *pString )
+{
+    Write(comm_USHORT(SIReturn));
+    Write(nRet);
+    Write((comm_ULONG)nMethod); //HELPID BACKWARD (no sal_uLong needed)
+    Write(comm_USHORT(PARAM_STR_1));				// Typ der folgenden Parameter
+    Write(pString);
+}
+
+void CmdBaseStream::GenReturn (comm_USHORT nRet, comm_USHORT nMethod, comm_BOOL bBool )
+{
+    Write(comm_USHORT(SIReturn));
+    Write(nRet);
+    Write((comm_ULONG)nMethod); //HELPID BACKWARD (no sal_uLong needed)
+    Write(comm_USHORT(PARAM_BOOL_1));			// Typ der folgenden Parameter
+    Write(bBool);
+}
+
+void CmdBaseStream::GenReturn (comm_USHORT nRet, comm_USHORT nMethod, comm_USHORT nNr )
+{
+    Write(comm_USHORT(SIReturn));
+    Write(nRet);
+    Write((comm_ULONG)nMethod); //HELPID BACKWARD (no sal_uLong needed)
+    Write(comm_USHORT(PARAM_USHORT_1));			// Typ der folgenden Parameter
+    Write(nNr);
+}
+
+
 // MacroRecorder
-void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMethod )
+void CmdBaseStream::GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod )
 {
     Write(comm_USHORT(SIReturn));
     Write(nRet);
@@ -114,7 +163,7 @@ void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMet
     Write(nMethod);
 }
 
-void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMethod, comm_String *pString )
+void CmdBaseStream::GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_String *pString )
 {
     Write(comm_USHORT(SIReturn));
     Write(nRet);
@@ -124,7 +173,7 @@ void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMet
     Write(pString);
 }
 
-void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMethod, comm_String *pString, comm_BOOL bBool )
+void CmdBaseStream::GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_String *pString, comm_BOOL bBool )
 {
     Write(comm_USHORT(SIReturn));
     Write(nRet);
@@ -135,7 +184,7 @@ void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMet
     Write(bBool);
 }
 
-void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMethod, comm_BOOL bBool )
+void CmdBaseStream::GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_BOOL bBool )
 {
     Write(comm_USHORT(SIReturn));
     Write(nRet);
@@ -145,7 +194,7 @@ void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMet
     Write(bBool);
 }
 
-void CmdBaseStream::GenReturn( comm_USHORT nRet, SmartId *pUId, comm_USHORT nMethod, comm_ULONG nNr )
+void CmdBaseStream::GenReturn( comm_USHORT nRet, rtl::OString *pUId, comm_USHORT nMethod, comm_ULONG nNr )
 {
     Write(comm_USHORT(SIReturn));
     Write(nRet);
@@ -284,10 +333,10 @@ void CmdBaseStream::Read ( comm_String* &pString )
     (void) pString; /* avoid warning about unused parameter */ 
     OSL_FAIL("Read ( comm_String* &pString ) Not Implemented");
 }
-void CmdBaseStream::Read ( SmartId* &pId )
+void CmdBaseStream::Read ( rtl::OString* &pId )
 { 
     (void) pId; /* avoid warning about unused parameter */ 
-    OSL_FAIL("Read ( SmartId* &pId ) Not Implemented");
+    OSL_FAIL("Read ( rtl::OString* &pId ) Not Implemented");
 }
 
 void CmdBaseStream::Write( comm_String *pString )
@@ -295,10 +344,10 @@ void CmdBaseStream::Write( comm_String *pString )
     (void) pString; /* avoid warning about unused parameter */ 
     OSL_FAIL("Write( comm_String *pString ) Not Implemented");
 }
-void CmdBaseStream::Write( SmartId* pId )
+void CmdBaseStream::Write( rtl::OString* pId )
 {
     (void) pId; /* avoid warning about unused parameter */ 
-    OSL_FAIL("Write( SmartId* pId ) Not Implemented");
+    OSL_FAIL("Write( rtl::OString* pId ) Not Implemented");
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/source/server/editwin.cxx b/automation/source/server/editwin.cxx
index 4880772e7..1decbaef4 100644
--- a/automation/source/server/editwin.cxx
+++ b/automation/source/server/editwin.cxx
@@ -63,14 +63,14 @@ void ImpWorkWindow::Resize()
     m_aInhalt.SetPosSizePixel( Point(), GetOutputSizePixel() );
 }
 
-BOOL EditWindow::Close()
+sal_Bool EditWindow::Close()
 {
     if ( pImpWorkWindow )
     {
         delete pImpWorkWindow;
         pImpWorkWindow = NULL;
     }
-    return TRUE;
+    return sal_True;
 }
 
 void EditWindow::Show()
@@ -78,7 +78,7 @@ void EditWindow::Show()
     if ( Check() )
         pImpWorkWindow->Show();
     else
-        bShowWin = TRUE;
+        bShowWin = sal_True;
 }
 
 void EditWindow::Hide()
@@ -86,7 +86,7 @@ void EditWindow::Hide()
     if ( Check() )
         pImpWorkWindow->Hide();
     else
-        bShowWin = FALSE;
+        bShowWin = sal_False;
 }
 
 EditWindow::EditWindow( WorkWindow *pParent, const String &rName, WinBits iWstyle )
@@ -95,7 +95,7 @@ EditWindow::EditWindow( WorkWindow *pParent, const String &rName, WinBits iWstyl
 , aMemName(rName)
 , iMemWstyle(iWstyle)
 , nTextLen(0)
-, bQuiet(FALSE)
+, bQuiet(sal_False)
 {
 }
 
@@ -104,7 +104,7 @@ EditWindow::~EditWindow()
     Close();
 }
 
-BOOL EditWindow::Check()
+sal_Bool EditWindow::Check()
 {
     if ( ! pImpWorkWindow && Application::IsInExecute() )
     {
@@ -114,7 +114,7 @@ BOOL EditWindow::Check()
         aMemPreWinText.Erase();
         if ( bShowWin )
             pImpWorkWindow->Show();
-        return TRUE;
+        return sal_True;
     }
     return pImpWorkWindow != NULL;
 }
diff --git a/automation/source/server/editwin.hxx b/automation/source/server/editwin.hxx
index 23d13eb98..bfc7e184f 100644
--- a/automation/source/server/editwin.hxx
+++ b/automation/source/server/editwin.hxx
@@ -40,14 +40,14 @@ class EditWindow
 {
 protected:
     ImpWorkWindow	*pImpWorkWindow;
-    BOOL check();
+    sal_Bool check();
 
     WorkWindow	*pMemParent;
     String		aMemName;
     WinBits		iMemWstyle;
 
     String		aMemPreWinText;
-    BOOL		bShowWin;
+    sal_Bool		bShowWin;
 
     xub_StrLen		nTextLen;	// aus Performanzgründen eigene Länge mitführen
 
@@ -61,9 +61,9 @@ public:
     void AddText( const String &rNew );
     void AddText( const sal_Char* rNew );
 
-    virtual BOOL Close(); // derived
-    BOOL bQuiet;
-    BOOL Check();
+    virtual sal_Bool Close(); // derived
+    sal_Bool bQuiet;
+    sal_Bool Check();
 };
 
 #endif
diff --git a/automation/source/server/prof_nul.cxx b/automation/source/server/prof_nul.cxx
index dc177a59e..b9106ec7c 100644
--- a/automation/source/server/prof_nul.cxx
+++ b/automation/source/server/prof_nul.cxx
@@ -83,7 +83,7 @@ String TTProfiler::GetSysdepProfileHeader()
 
 
 // Zustand merken
-void TTProfiler::GetSysdepProfileSnapshot( SysdepProfileSnapshot *, USHORT )
+void TTProfiler::GetSysdepProfileSnapshot( SysdepProfileSnapshot *, sal_uInt16 )
 {};
 
 
diff --git a/automation/source/server/prof_usl.cxx b/automation/source/server/prof_usl.cxx
index 21086c48b..dfbbe0fd5 100644
--- a/automation/source/server/prof_usl.cxx
+++ b/automation/source/server/prof_usl.cxx
@@ -86,7 +86,7 @@ String TTProfiler::GetSysdepProfileHeader()
 
 
 // Zustand merken
-void TTProfiler::GetSysdepProfileSnapshot( SysdepProfileSnapshot *pSysdepProfileSnapshot, USHORT )
+void TTProfiler::GetSysdepProfileSnapshot( SysdepProfileSnapshot *pSysdepProfileSnapshot, sal_uInt16 )
 {
     SvFileStream aStream( String::CreateFromAscii("/proc/self/psinfo"), STREAM_READ );		// Das ist ein expliziter Pfad für UNXSOL!
     if ( aStream.IsOpen() )
@@ -123,8 +123,8 @@ String TTProfiler::GetSysdepProfileLine( SysdepProfileSnapshot *pStart, SysdepPr
     aProfile += Pad( String::CreateFromInt64(DIFF_MS( pStart, pStop, mprusage.pr_rtime ) / AVER( pStart, pStop, mprusage.pr_count )), 7 );
 
     
-    ULONG d_utime = DIFF_MS( pStart, pStop, mpstatus.pr_utime ) + DIFF_MS( pStart, pStop, mpstatus.pr_cutime );
-    ULONG d_stime = DIFF_MS( pStart, pStop, mpstatus.pr_stime ) + DIFF_MS( pStart, pStop, mpstatus.pr_cstime );
+    sal_uLong d_utime = DIFF_MS( pStart, pStop, mpstatus.pr_utime ) + DIFF_MS( pStart, pStop, mpstatus.pr_cutime );
+    sal_uLong d_stime = DIFF_MS( pStart, pStop, mpstatus.pr_stime ) + DIFF_MS( pStart, pStop, mpstatus.pr_cstime );
     
     aProfile += Pad( String::CreateFromInt64(d_utime), 7 );
     aProfile += Pad( String::CreateFromInt64(d_stime), 7 );
diff --git a/automation/source/server/profiler.cxx b/automation/source/server/profiler.cxx
index be6760b2b..c8b623167 100644
--- a/automation/source/server/profiler.cxx
+++ b/automation/source/server/profiler.cxx
@@ -43,10 +43,10 @@
 TTProfiler::TTProfiler()
 : mpStart( NULL )
 , mpEnd( NULL )
-, bIsProfileIntervalStarted( FALSE )
-, bIsProfilingPerCommand( FALSE )
-, bIsPartitioning( FALSE )
-, bIsAutoProfiling( FALSE )
+, bIsProfileIntervalStarted( sal_False )
+, bIsProfilingPerCommand( sal_False )
+, bIsPartitioning( sal_False )
+, bIsAutoProfiling( sal_False )
 , pSysDepStatic( NULL )
 {
     InitSysdepProfiler();
@@ -94,13 +94,13 @@ String TTProfiler::GetProfileHeader()
 }
 
 
-void TTProfiler::StartProfileInterval( BOOL bReadAnyway )
+void TTProfiler::StartProfileInterval( sal_Bool bReadAnyway )
 {
     if ( !bIsProfileIntervalStarted || bReadAnyway )
     {
         GetProfileSnapshot( mpStart );
         GetSysdepProfileSnapshot( mpStart->pSysdepProfileSnapshot, PROFILE_START );
-        bIsProfileIntervalStarted = TRUE;
+        bIsProfileIntervalStarted = sal_True;
     }
 }
 
@@ -108,10 +108,10 @@ String TTProfiler::GetProfileLine( ProfileSnapshot *pStart, ProfileSnapshot *pEn
 {
     String aProfileString;
 
-    aProfileString += Pad(GetpApp()->GetAppLocaleDataWrapper().getDuration( DIFF( pStart, pEnd, aTime) , TRUE, TRUE ), 12);
+    aProfileString += Pad(GetpApp()->GetAppLocaleDataWrapper().getDuration( DIFF( pStart, pEnd, aTime) , sal_True, sal_True ), 12);
 
-    ULONG nProcessTicks = DIFF( pStart, pEnd, nProcessTicks );
-    ULONG nSystemTicks = DIFF( pStart, pEnd, nSystemTicks );
+    sal_uLong nProcessTicks = DIFF( pStart, pEnd, nProcessTicks );
+    sal_uLong nSystemTicks = DIFF( pStart, pEnd, nSystemTicks );
     if ( nSystemTicks )
     {
         aProfileString += Pad(UniString::CreateFromInt32( (100 * nProcessTicks) / nSystemTicks ), 11);
@@ -146,7 +146,7 @@ void TTProfiler::EndProfileInterval()
 {
     GetProfileSnapshot( mpEnd );
     GetSysdepProfileSnapshot( mpEnd->pSysdepProfileSnapshot, PROFILE_END );
-    bIsProfileIntervalStarted = FALSE;
+    bIsProfileIntervalStarted = sal_False;
 }
 
 
@@ -160,32 +160,32 @@ void TTProfiler::GetProfileSnapshot( ProfileSnapshot *pProfileSnapshot )
 
 void TTProfiler::StartProfilingPerCommand()		// Jeden Befehl mitschneiden
 {
-    bIsProfilingPerCommand = TRUE;
+    bIsProfilingPerCommand = sal_True;
 }
 
 void TTProfiler::StopProfilingPerCommand()
 {
-    bIsProfilingPerCommand = FALSE;
+    bIsProfilingPerCommand = sal_False;
 }
 
 void TTProfiler::StartPartitioning()
 {
-    bIsPartitioning = TRUE;
+    bIsPartitioning = sal_True;
 }
 
 void TTProfiler::StopPartitioning()
 {
-    bIsPartitioning = TRUE;
+    bIsPartitioning = sal_True;
 }
 
-ULONG TTProfiler::GetPartitioningTime()
+sal_uLong TTProfiler::GetPartitioningTime()
 {
     return DIFF( mpStart, mpEnd, nSystemTicks );
 }
 
 
 
-void TTProfiler::StartAutoProfiling( ULONG nMSec )
+void TTProfiler::StartAutoProfiling( sal_uLong nMSec )
 {
     if ( !bIsAutoProfiling )
     {
@@ -196,7 +196,7 @@ void TTProfiler::StartAutoProfiling( ULONG nMSec )
         GetProfileSnapshot( pAutoStart );
         GetSysdepProfileSnapshot( pAutoStart->pSysdepProfileSnapshot, PROFILE_START );
         SetTimeout( nMSec );
-        bIsAutoProfiling = TRUE;
+        bIsAutoProfiling = sal_True;
         Start();
     }
 
@@ -233,14 +233,14 @@ void TTProfiler::StopAutoProfiling()
     if ( bIsAutoProfiling )
     {
         Stop();
-        bIsAutoProfiling = FALSE;
+        bIsAutoProfiling = sal_False;
     }
 }
 
 
 
-//String TTProfiler::Hex( ULONG nNr )
-String TTProfiler::Dec( ULONG nNr )
+//String TTProfiler::Hex( sal_uLong nNr )
+String TTProfiler::Dec( sal_uLong nNr )
 {
     String aRet(UniString::CreateFromInt32(nNr));
     if ( nNr < 100 )
diff --git a/automation/source/server/profiler.hxx b/automation/source/server/profiler.hxx
index 7192441cc..4ae07f808 100644
--- a/automation/source/server/profiler.hxx
+++ b/automation/source/server/profiler.hxx
@@ -42,14 +42,14 @@
 
 
 struct SysdepProfileSnapshot;
-struct SysdepStaticData;	// Nicht wirklich statisch, sondern statisch über mehrere Snapshots
+struct SysdepStaticData;	// Nicht wirklich statisch, sondern statisch �ber mehrere Snapshots
 
 struct ProfileSnapshot
 {
     Time aTime;
     SysdepProfileSnapshot *pSysdepProfileSnapshot;
-    ULONG nProcessTicks;
-    ULONG nSystemTicks;
+    sal_uLong nProcessTicks;
+    sal_uLong nSystemTicks;
 };
 
 
@@ -59,25 +59,25 @@ public:
     TTProfiler();
     ~TTProfiler();
 
-    String GetProfileHeader();	// Titelzeile für Logdatei
-    void StartProfileInterval( BOOL bReadAnyway = FALSE );	// Zustand merken
+    String GetProfileHeader();	// Titelzeile f�r Logdatei
+    void StartProfileInterval( sal_Bool bReadAnyway = sal_False );	// Zustand merken
     void EndProfileInterval();	// Informationszeile zusammenbauen
     String GetProfileLine( String &aPrefix );
 
 
     void StartProfilingPerCommand();	// Jeden Befehl mitschneiden
     void StopProfilingPerCommand();
-    BOOL IsProfilingPerCommand() { return bIsProfilingPerCommand; }
+    sal_Bool IsProfilingPerCommand() { return bIsProfilingPerCommand; }
 
     void StartPartitioning();
     void StopPartitioning();
-    BOOL IsPartitioning() { return bIsPartitioning; }
-    ULONG GetPartitioningTime();
+    sal_Bool IsPartitioning() { return bIsPartitioning; }
+    sal_uLong GetPartitioningTime();
 
-    void StartAutoProfiling( ULONG nMSec );	// Automatisch alle nMSec Milisekunden sampeln
+    void StartAutoProfiling( sal_uLong nMSec );	// Automatisch alle nMSec Milisekunden sampeln
     String GetAutoProfiling();	// Aktuelle `Sammlung` abholen
     void StopAutoProfiling();	// Sampeln beenden
-    BOOL IsAutoProfiling() { return bIsAutoProfiling; }
+    sal_Bool IsAutoProfiling() { return bIsAutoProfiling; }
 
 private:
 
@@ -89,20 +89,20 @@ private:
 
     ProfileSnapshot *mpStart;
     ProfileSnapshot *mpEnd;
-    BOOL bIsProfileIntervalStarted;
+    sal_Bool bIsProfileIntervalStarted;
 
 
 
 //
-    BOOL bIsProfilingPerCommand;
-    BOOL bIsPartitioning;
+    sal_Bool bIsProfilingPerCommand;
+    sal_Bool bIsPartitioning;
 
 
-//	Für das Automatische Profiling in festen Intervallen
+//	F�r das Automatische Profiling in festen Intervallen
 
     ProfileSnapshot *pAutoStart;
     ProfileSnapshot *pAutoEnd;
-    BOOL bIsAutoProfiling;
+    sal_Bool bIsAutoProfiling;
     String aAutoProfileBuffer;
 
     virtual void Timeout();
@@ -110,11 +110,11 @@ private:
 
 // Einige Hilfsfunktionen
 
-//	String Hex( ULONG nNr );
-    String Dec( ULONG nNr );	// Ergebnis = nNr / 100 mit 2 Dezimalen
-    String Pad( const String &aS, xub_StrLen nLen );		// Fügt blanks links an den String an
+//	String Hex( sal_uLong nNr );
+    String Dec( sal_uLong nNr );	// Ergebnis = nNr / 100 mit 2 Dezimalen
+    String Pad( const String &aS, xub_StrLen nLen );		// F�gt blanks links an den String an
 
-/*	Ab hier werden die Methoden Systemabhängig in den entsprechenden cxx implementiert
+/*	Ab hier werden die Methoden Systemabh�ngig in den entsprechenden cxx implementiert
     Sie werden von den oberen Methoden gerufen.
 */
 
@@ -126,11 +126,11 @@ private:
     SysdepProfileSnapshot *NewSysdepSnapshotData();
     void DeleteSysdepSnapshotData( SysdepProfileSnapshot *pSysdepProfileSnapshot );
 
-    // Titelzeile für Logdatei
+    // Titelzeile f�r Logdatei
     String GetSysdepProfileHeader();
 
     // Zustand merken
-    void GetSysdepProfileSnapshot( SysdepProfileSnapshot *pSysdepProfileSnapshot, USHORT nMode = PROFILE_START | PROFILE_END );
+    void GetSysdepProfileSnapshot( SysdepProfileSnapshot *pSysdepProfileSnapshot, sal_uInt16 nMode = PROFILE_START | PROFILE_END );
 
     // Informationszeile zusammenbauen
     String GetSysdepProfileLine( SysdepProfileSnapshot *pStart, SysdepProfileSnapshot *pStop );
diff --git a/automation/source/server/recorder.cxx b/automation/source/server/recorder.cxx
index 408c15c78..55ead0494 100644
--- a/automation/source/server/recorder.cxx
+++ b/automation/source/server/recorder.cxx
@@ -57,9 +57,9 @@ MacroRecorder::MacroRecorder()
 , pActionParent( NULL )
 , aKeyUniqueID()
 , pKeyWin( NULL )
-, bKeyFollowFocus( FALSE )
-, m_bRecord( FALSE )
-, m_bLog( FALSE )
+, bKeyFollowFocus( sal_False )
+, m_bRecord( sal_False )
+, m_bLog( sal_False )
 {
     aHookRefresh.SetTimeout( 500 );
     aHookRefresh.SetTimeoutHdl( LINK( this, MacroRecorder, HookRefreshHdl) );
@@ -106,41 +106,41 @@ IMPL_LINK( MacroRecorder, HookRefreshHdl, void*, EMPTYARG )
     return 0;
 }
 
-void MacroRecorder::LogVCL( SmartId aParentID, USHORT nVCLWindowType, SmartId aID, String aMethod, USHORT nParam )
+void MacroRecorder::LogVCL( rtl::OString aParentID, sal_uInt16 nVCLWindowType, rtl::OString aID, String aMethod, sal_uInt16 nParam )
 {
-    ::comphelper::UiEventsLogger::logVcl( aParentID.GetText(), nVCLWindowType, aID.GetText(), aMethod, nParam );
+    ::comphelper::UiEventsLogger::logVcl( Id2Str( aParentID ), nVCLWindowType, Id2Str( aID ), aMethod, nParam );
 }
 
-void MacroRecorder::LogVCL( SmartId aParentID, USHORT nVCLWindowType, SmartId aID, String aMethod )
+void MacroRecorder::LogVCL( rtl::OString aParentID, sal_uInt16 nVCLWindowType, rtl::OString aID, String aMethod )
 {
-    ::comphelper::UiEventsLogger::logVcl( aParentID.GetText(), nVCLWindowType, aID.GetText(), aMethod );
+    ::comphelper::UiEventsLogger::logVcl( Id2Str( aParentID ), nVCLWindowType, Id2Str( aID ), aMethod );
 }
 
 Window* MacroRecorder::GetParentWithID( Window* pThis )
 {
     Window *pOverlap = pThis->GetWindow( WINDOW_OVERLAP );
-    while ( pOverlap != pThis && !pThis->GetSmartUniqueOrHelpId().HasAny() && pThis->GET_REAL_PARENT() )
+    while ( pOverlap != pThis && !pThis->GetUniqueOrHelpId().getLength() && pThis->GET_REAL_PARENT() )
         pThis = pThis->GET_REAL_PARENT();
     return pThis;
 }
 
-SmartId MacroRecorder::GetParentID( Window* pThis )
+rtl::OString MacroRecorder::GetParentID( Window* pThis )
 {
     if ( pThis->GetParent() )
-        return pThis->GetParent()->GetSmartUniqueOrHelpId();
+        return pThis->GetParent()->GetUniqueOrHelpId();
     else
-        return SmartId();
+        return rtl::OString();
 }
 
 IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
 {
-    BOOL bSendData = FALSE;
+    sal_Bool bSendData = sal_False;
 
     if ( pEvent->ISA( VclWindowEvent ) )
     {
         VclWindowEvent* pWinEvent = ( VclWindowEvent* ) pEvent;
         Window* pWin = pWinEvent->GetWindow();
-        ULONG nEventID = pWinEvent->GetId();
+        sal_uLong nEventID = pWinEvent->GetId();
 #if OSL_DEBUG_LEVEL > 1
         if ( nEventID >= 1001 && nEventID != VCLEVENT_WINDOW_KEYUP )
             nEventID = pWinEvent->GetId();  // Just something to set a breakpoint
@@ -168,18 +168,18 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
             {
                 // we cannot access pKeyWin since it might have dissapeared
                 if ( bKeyFollowFocus )
-                    StatementList::pRet->GenReturn( RET_MacroRecorder, aKeyUniqueID, (USHORT)M_TypeKeys, aKeyString, bKeyFollowFocus );
+                    StatementList::pRet->GenReturn( RET_MacroRecorder, aKeyUniqueID, (sal_uInt16)M_TypeKeys, aKeyString, bKeyFollowFocus );
                 else
-                    StatementList::pRet->GenReturn( RET_MacroRecorder, aKeyUniqueID, (USHORT)M_TypeKeys, aKeyString );
+                    StatementList::pRet->GenReturn( RET_MacroRecorder, aKeyUniqueID, (sal_uInt16)M_TypeKeys, aKeyString );
 #if OSL_DEBUG_LEVEL > 1
-                StatementList::pRet->GenReturn( RET_MacroRecorder, aKeyUniqueID, (USHORT)M_TypeKeys, String::CreateFromInt32( nEventID ) );
+                StatementList::pRet->GenReturn( RET_MacroRecorder, aKeyUniqueID, (sal_uInt16)M_TypeKeys, String::CreateFromInt32( nEventID ) );
 #endif
-                bSendData = TRUE;
+                bSendData = sal_True;
             }
             // cleanup
             aKeyString.Erase();
             pKeyWin = NULL;
-            bKeyFollowFocus = FALSE;
+            bKeyFollowFocus = sal_False;
         }
 
         switch ( pWin->GetType() )
@@ -190,12 +190,12 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
                     case VCLEVENT_WINDOW_ACTIVATE:
                         if ( m_bRecord )
                         {
-                            StatementList::pRet->GenReturn( RET_MacroRecorder, SmartId(), (comm_USHORT)(M_SetPage|M_RET_NUM_CONTROL), static_cast<comm_ULONG>(pWin->GetSmartUniqueOrHelpId().GetNum()) ); //GetNum() ULONG != comm_ULONG on 64bit
-                            bSendData = TRUE;
+                            StatementList::pRet->GenReturn( RET_MacroRecorder, rtl::OString(), (comm_USHORT)(M_SetPage|M_RET_NUM_CONTROL), Id2Str( pWin->GetUniqueOrHelpId() ) );
+                            bSendData = sal_True;
                         }
                         if ( m_bLog )
                         {
-                            LogVCL( SmartId(), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), CUniString("SetPage") );
+                            LogVCL( rtl::OString(), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("SetPage") );
                         }
                         break;
                 }
@@ -210,12 +210,12 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
                             {
                                 if ( m_bRecord )
                                 {
-                                    StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), (comm_USHORT)M_Check );
-                                    bSendData = TRUE;
+                                    StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_USHORT)M_Check );
+                                    bSendData = sal_True;
                                 }
                                 if ( m_bLog )
                                 {
-                                    LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), CUniString("Check") );
+                                    LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("Check") );
                                 }
                             }
                         }
@@ -240,12 +240,12 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
                             }
                             if ( m_bRecord )
                             {
-                                StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), nMethod );
-                                bSendData = TRUE;
+                                StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), nMethod );
+                                bSendData = sal_True;
                             }
                             if ( m_bLog )
                             {
-                                LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), aMethod );
+                                LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), aMethod );
                             }
                         }
                         break;
@@ -273,12 +273,12 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
                     case VCLEVENT_LISTBOX_SELECT:
                         if ( m_bRecord )
                         {
-                            StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), (comm_USHORT)M_Select, comm_ULONG( ((ListBox*)pWin)->GetSelectEntryPos() +1 ) );
-                            bSendData = TRUE;
+                            StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_USHORT)M_Select, comm_ULONG( ((ListBox*)pWin)->GetSelectEntryPos() +1 ) );
+                            bSendData = sal_True;
                         }
                         if ( m_bLog )
                         {
-                            LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), CUniString("Select"), ((ListBox*)pWin)->GetSelectEntryPos() );
+                            LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("Select"), ((ListBox*)pWin)->GetSelectEntryPos() );
                         }
                         break;
                 }
@@ -301,20 +301,20 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
                             pEditModify = NULL;
                             aEditModifyString.Erase();
 
-                            USHORT nPos = ((ComboBox*)pWin)->GetEntryPos(((ComboBox*)pWin)->GetText());
+                            sal_uInt16 nPos = ((ComboBox*)pWin)->GetEntryPos(((ComboBox*)pWin)->GetText());
                             if ( m_bRecord )
                             {
                                 if ( nPos == COMBOBOX_ENTRY_NOTFOUND )
                                     Sound::Beep();
                                 else
                                 {
-                                    StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), (comm_USHORT)M_Select, (comm_ULONG) nPos+1 );
-                                    bSendData = TRUE;
+                                    StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_USHORT)M_Select, (comm_ULONG) nPos+1 );
+                                    bSendData = sal_True;
                                 }
                             }
                             if ( m_bLog )
                             {
-                                LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), CUniString("Select"), nPos );
+                                LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("Select"), nPos );
                             }
                         }
                 }
@@ -329,8 +329,8 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
                 {
                     case VCLEVENT_BUTTON_CLICK:
                         Window* pParent = pWin->GetParent();
-                        BOOL bDone = FALSE;
-                        if ( pParent->IsDialog() && !pWin->GetSmartUniqueOrHelpId().HasAny() )
+                        sal_Bool bDone = sal_False;
+                        if ( pParent->IsDialog() && !pWin->GetUniqueOrHelpId().getLength() )
                         {
                             switch ( pParent->GetType() )
                             {
@@ -346,8 +346,8 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
                                         ButtonDialog* pBD = (ButtonDialog*)pParent;
 
                                         // we have to find the current Button ID ourselves since it is not generated at this point :-(
-                                        USHORT nCurrentButtonId = 0xffff;    // Some wild value to wak up people
-                                        USHORT i;
+                                        sal_uInt16 nCurrentButtonId = 0xffff;    // Some wild value to wak up people
+                                        sal_uInt16 i;
                                         for ( i = 0; i < pBD->GetButtonCount() ; i++ )
                                         {
                                             if ( pBD->GetPushButton( pBD->GetButtonId(i) ) == pWin )
@@ -370,18 +370,18 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
                                         if ( m_bRecord )
                                         {
                                             if ( nMethod != M_Click )
-                                                StatementList::pRet->GenReturn( RET_MacroRecorder, SmartId( 0 ), nMethod );
+                                                StatementList::pRet->GenReturn( RET_MacroRecorder, UID_ACTIVE, nMethod );
                                             else
-                                                StatementList::pRet->GenReturn( RET_MacroRecorder, SmartId( 0 ), nMethod, (comm_ULONG)nCurrentButtonId );
-                                            bSendData = TRUE;
+                                                StatementList::pRet->GenReturn( RET_MacroRecorder, UID_ACTIVE, nMethod, (comm_ULONG)nCurrentButtonId );
+                                            bSendData = sal_True;
                                         }
                                         if ( m_bLog )
                                         {
                                             if ( nMethod != M_Click )
-                                                LogVCL( SmartId(), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), aMethod );
+                                                LogVCL( rtl::OString(), pWin->GetType(), pWin->GetUniqueOrHelpId(), aMethod );
                                             else
-                                                LogVCL( SmartId(), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), aMethod, nCurrentButtonId );
-                                            bDone = TRUE;
+                                                LogVCL( rtl::OString(), pWin->GetType(), pWin->GetUniqueOrHelpId(), aMethod, nCurrentButtonId );
+                                            bDone = sal_True;
                                         }
                                     }
                                     break;
@@ -399,13 +399,13 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
                                         }
                                         if ( m_bRecord )
                                         {
-                                            StatementList::pRet->GenReturn( RET_MacroRecorder, pParent->GetSmartUniqueOrHelpId(), nMethod );
-                                            bSendData = TRUE;
+                                            StatementList::pRet->GenReturn( RET_MacroRecorder, pParent->GetUniqueOrHelpId(), nMethod );
+                                            bSendData = sal_True;
                                         }
                                         if ( m_bLog )
                                         {
-                                            LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), aMethod );
-                                            bDone = TRUE;
+                                            LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), aMethod );
+                                            bDone = sal_True;
                                         }
                                     }
                                     break;
@@ -413,16 +413,16 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
                         }
                         if ( m_bRecord )
                         {
-                            if ( !bSendData && pWin->GetSmartUniqueOrHelpId().HasAny() )
+                            if ( !bSendData && pWin->GetUniqueOrHelpId().getLength() )
                             {
-                                StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), (comm_USHORT)M_Click );
-                                bSendData = TRUE;
+                                StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_USHORT)M_Click );
+                                bSendData = sal_True;
                             }
                         }
                         if ( m_bLog )
                         {
                             if ( !bDone )
-                                LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), CUniString("Click") );
+                                LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("Click") );
                         }
                 }
                 break;
@@ -456,12 +456,12 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
                             }
                             if ( m_bRecord )
                             {
-                                StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), nMethod );
-                                bSendData = TRUE;
+                                StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), nMethod );
+                                bSendData = sal_True;
                             }
                             if ( m_bLog )
                             {
-                                LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), aMethod );
+                                LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), aMethod );
                             }
                         }
                         break;
@@ -478,12 +478,12 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
                     case VCLEVENT_BUTTON_CLICK:
                         if ( m_bRecord )
                         {
-                            StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), (comm_USHORT)M_Click );
-                            bSendData = TRUE;
+                            StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), (comm_USHORT)M_Click );
+                            bSendData = sal_True;
                         }
                         if ( m_bLog )
                         {
-                            LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), CUniString("Click") );
+                            LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("Click") );
                         }
                         break;
                     }
@@ -500,13 +500,13 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
                                 // compare to 1 for floating ToolBoxes
                                 if ( m_bRecord )
                                 {
-                                    if ( !pWin->GetSmartUniqueOrHelpId().HasAny() || pWin->GetSmartUniqueOrHelpId().Matches( 1 ) )
+                                    if ( !pWin->GetUniqueOrHelpId().getLength() /* || pWin->GetUniqueOrHelpId().Matches( 1 ) */ )
                                         // generate direct Button access
-                                        StatementList::pRet->GenReturn( RET_MacroRecorder, SmartId( pTB->GetItemCommand( pTB->GetCurItemId() ) ), (comm_USHORT)(M_Click) );
+                                        StatementList::pRet->GenReturn( RET_MacroRecorder, Str2Id( pTB->GetItemCommand( pTB->GetCurItemId() ) ), (comm_USHORT)(M_Click) );
                                     else
                                         // access via Toolbox
-                                        StatementList::pRet->GenReturn( RET_MacroRecorder, pTB->GetSmartUniqueOrHelpId(), (comm_USHORT)(M_Click|M_RET_NUM_CONTROL), static_cast<comm_ULONG>(pTB->GetHelpId( pTB->GetCurItemId() )) ); // GetHelpId() ULONG != comm_ULONG on 64bit
-                                    bSendData = TRUE;
+                                        StatementList::pRet->GenReturn( RET_MacroRecorder, pTB->GetUniqueOrHelpId(), (comm_USHORT)(M_Click|M_RET_NUM_CONTROL), Id2Str( pTB->GetHelpId( pTB->GetCurItemId() ) ) );
+                                    bSendData = sal_True;
                                 }
                             }
                             break;
@@ -534,8 +534,8 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
                                 pKeyWin = pWin;
                                 Window *pIdWin = GetParentWithID( pWin );
                                 if ( pIdWin != pWin )
-                                   bKeyFollowFocus = TRUE;
-                                aKeyUniqueID = pIdWin->GetSmartUniqueOrHelpId();
+                                   bKeyFollowFocus = sal_True;
+                                aKeyUniqueID = pIdWin->GetUniqueOrHelpId();
                                 if ( ( !aKeyCode.IsMod1() && !aKeyCode.IsMod2() ) &&
                                       (( aKeyCode.GetGroup() == KEYGROUP_NUM)   ||
                                        ( aKeyCode.GetGroup() == KEYGROUP_ALPHA) ||
@@ -579,7 +579,7 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
                 {
 //					case 1 .. 0xffff:
     DBG_TRACE3( "TT_VCLMessage %u %u  %X",nEventID, pWin->GetType(), pWin );
-//						BOOL bx = ((DockingWindow*)pWin)->IsFloatingMode();
+//						sal_Bool bx = ((DockingWindow*)pWin)->IsFloatingMode();
 //						break;
                 }
                 break;
@@ -598,12 +598,12 @@ IMPL_LINK( MacroRecorder, EventListener, VclSimpleEvent*, pEvent )
                 {
                     if ( m_bRecord )
                     {
-                        StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetSmartUniqueOrHelpId(), M_SetText, aEditModifyString );
-                        bSendData = TRUE;
+                        StatementList::pRet->GenReturn( RET_MacroRecorder, pWin->GetUniqueOrHelpId(), M_SetText, aEditModifyString );
+                        bSendData = sal_True;
                     }
                     if ( m_bLog )
                     {
-                        LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetSmartUniqueOrHelpId(), CUniString("Modify") );
+                        LogVCL( GetParentID( pWin ), pWin->GetType(), pWin->GetUniqueOrHelpId(), CUniString("Modify") );
                     }
                     pEditModify = NULL;
                     aEditModifyString.Erase();  //could be somewhat lengthy
@@ -655,7 +655,7 @@ MacroRecorder* MacroRecorder::GetMacroRecorder()
     return pMacroRecorder;
 }
 
-BOOL MacroRecorder::HasMacroRecorder()
+sal_Bool MacroRecorder::HasMacroRecorder()
 {
     ::osl::MutexGuard aGuard( getRecorderMutex() );
     return pMacroRecorder != NULL;
diff --git a/automation/source/server/recorder.hxx b/automation/source/server/recorder.hxx
index 362fc706c..179319850 100644
--- a/automation/source/server/recorder.hxx
+++ b/automation/source/server/recorder.hxx
@@ -28,7 +28,6 @@
 
 #include <tools/string.hxx>
 #include <tools/link.hxx>
-#include <vcl/smartid.hxx>
 #include <vcl/timer.hxx>
 
 class ToolBox;
@@ -39,7 +38,7 @@ class MacroRecorder
 {
 private:
     Window* GetParentWithID( Window* pThis );
-    SmartId GetParentID( Window* pThis );
+    rtl::OString GetParentID( Window* pThis );
 
     Link aEventListenerHdl;
     DECL_LINK( EventListener, VclSimpleEvent* );
@@ -52,17 +51,17 @@ private:
 
     // record keys
     String aKeyString;
-    SmartId aKeyUniqueID;     // has to be remembered seperately since Window might be gone when needed
+    rtl::OString aKeyUniqueID;     // has to be remembered seperately since Window might be gone when needed
     Window* pKeyWin;
-    BOOL bKeyFollowFocus;
+    sal_Bool bKeyFollowFocus;
 
     AutoTimer aHookRefresh;
     void AddEventHooks();
     void RemoveEventHooks();
     DECL_LINK( HookRefreshHdl, void* );
 
-    void LogVCL( SmartId aParentID, USHORT nVCLWindowType, SmartId aID, String aMethod, USHORT aParam );
-    void LogVCL( SmartId aParentID, USHORT nVCLWindowType, SmartId aID, String aMethod );
+    void LogVCL( rtl::OString aParentID, sal_uInt16 nVCLWindowType, rtl::OString aID, String aMethod, sal_uInt16 aParam );
+    void LogVCL( rtl::OString aParentID, sal_uInt16 nVCLWindowType, rtl::OString aID, String aMethod );
 
     static MacroRecorder *pMacroRecorder;
 
@@ -71,16 +70,16 @@ private:
     void CheckDelete(); 
 
     // Actions to perform
-    BOOL m_bRecord;
-    BOOL m_bLog;
+    sal_Bool m_bRecord;
+    sal_Bool m_bLog;
 
 public:
 
-    void SetActionRecord( BOOL bRecord = TRUE ) { m_bRecord = bRecord; CheckDelete(); };
-    void SetActionLog( BOOL bLog = TRUE ) { m_bLog = bLog; CheckDelete(); };
+    void SetActionRecord( sal_Bool bRecord = sal_True ) { m_bRecord = bRecord; CheckDelete(); };
+    void SetActionLog( sal_Bool bLog = sal_True ) { m_bLog = bLog; CheckDelete(); };
 
     static MacroRecorder* GetMacroRecorder();
-    static BOOL HasMacroRecorder();
+    static sal_Bool HasMacroRecorder();
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/source/server/retstrm.cxx b/automation/source/server/retstrm.cxx
index cd434a39a..690575eda 100644
--- a/automation/source/server/retstrm.cxx
+++ b/automation/source/server/retstrm.cxx
@@ -29,6 +29,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_automation.hxx"
 #include <tools/stream.hxx>
+#include <basic/ttstrhlp.hxx>
 
 #include "retstrm.hxx"
 #include "rcontrol.hxx"
@@ -48,41 +49,50 @@ RetStream::~RetStream()
     delete pSammel;
 }
 
-void RetStream::GenError ( SmartId aUId, String aString )
+void RetStream::GenError ( rtl::OString aUId, String aString )
 {
     CmdBaseStream::GenError ( &aUId, &aString );
 }
 
-void RetStream::GenReturn ( USHORT nRet, SmartId aUId, String aString )
+void RetStream::GenReturn ( sal_uInt16 nRet, rtl::OString aUId, String aString )
 {
     CmdBaseStream::GenReturn ( nRet, &aUId, &aString );
 }
 
-void RetStream::GenReturn ( USHORT nRet, SmartId aUId, SbxValue &aValue )
-{
-    Write(USHORT(SIReturn));
-    Write(nRet);
-    Write(&aUId);
-    Write(USHORT(PARAM_SBXVALUE_1));		// Typ der folgenden Parameter
-    Write(aValue);
-}
-
-void RetStream::GenReturn ( USHORT nRet, SmartId aUId, comm_ULONG nNr, String aString, BOOL bBool )
+void RetStream::GenReturn ( sal_uInt16 nRet, rtl::OString aUId, comm_ULONG nNr, String aString, sal_Bool bBool )
 {
     CmdBaseStream::GenReturn ( nRet, &aUId, nNr, &aString, bBool );
 }
 
-void RetStream::GenReturn( USHORT nRet, SmartId aUId, comm_USHORT nMethod, String aString )
+// MacroRecorder
+void RetStream::GenReturn( sal_uInt16 nRet, rtl::OString aUId, comm_USHORT nMethod, String aString )
 {
     CmdBaseStream::GenReturn ( nRet, &aUId, nMethod, &aString );
 }
 
-void RetStream::GenReturn( USHORT nRet, SmartId aUId, comm_USHORT nMethod, String aString, BOOL bBool )
+void RetStream::GenReturn( sal_uInt16 nRet, rtl::OString aUId, comm_USHORT nMethod, String aString, sal_Bool bBool )
 {
     CmdBaseStream::GenReturn ( nRet, &aUId, nMethod, &aString, bBool );
 }
 
 
+void RetStream::GenReturn ( sal_uInt16 nRet, sal_uInt16 nMethod, SbxValue &aValue )
+{
+    Write(sal_uInt16(SIReturn));
+    Write(nRet);
+    Write((comm_ULONG)nMethod); //HELPID BACKWARD (no sal_uLong needed)
+    Write(sal_uInt16(PARAM_SBXVALUE_1));		// Typ der folgenden Parameter
+    Write(aValue);
+}
+
+void RetStream::GenReturn( sal_uInt16 nRet, sal_uInt16 nMethod, String aString )
+{
+    CmdBaseStream::GenReturn ( nRet, nMethod, &aString );
+}
+
+
+
+
 void RetStream::Write( String *pString )
 {
     CmdBaseStream::Write( pString->GetBuffer(), pString->Len() );
@@ -90,20 +100,15 @@ void RetStream::Write( String *pString )
 
 void RetStream::Write( SbxValue &aValue )
 {
-    *pSammel << USHORT( BinSbxValue );
+    *pSammel << sal_uInt16( BinSbxValue );
     aValue.Store( *pSammel );
 }
 
-void RetStream::Write( SmartId* pId )
+void RetStream::Write( rtl::OString* pId )
 {
-    DBG_ASSERT( !pId->HasString() || !pId->HasNumeric(), "SmartId contains Number and String. using String only." );
-    if ( pId->HasString() )
-    {
-        String aTmp( pId->GetStr() );
-        Write( &aTmp );
-    }
-    else
-        Write( static_cast<comm_ULONG>(pId->GetNum()) ); ////GetNum() ULONG != comm_ULONG on 64bit
+    //HELPID BACKWARD (should use ByteString or OString)
+    String aTmp( Id2Str( *pId ) );
+    Write( &aTmp );
 }
 
 
diff --git a/automation/source/server/retstrm.hxx b/automation/source/server/retstrm.hxx
index 8f3e62267..2190d15f8 100644
--- a/automation/source/server/retstrm.hxx
+++ b/automation/source/server/retstrm.hxx
@@ -29,7 +29,6 @@
 #define _RETSTRM_HXX
 
 #include <basic/sbxvar.hxx>
-#include <vcl/smartid.hxx>
 #include "cmdbasestream.hxx"
 
 class SvStream;
@@ -42,23 +41,28 @@ public:
     ~RetStream();
 
     using CmdBaseStream::GenError;
-    void GenError( SmartId aUId, String aString );
+    void GenError( rtl::OString aUId, String aString );
 
     using CmdBaseStream::GenReturn;
     void GenReturn( comm_USHORT nRet, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, nNr );}
-    void GenReturn( comm_USHORT nRet, SmartId aUId, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, &aUId, nNr );}
-    void GenReturn( comm_USHORT nRet, SmartId aUId, comm_BOOL bBool ){CmdBaseStream::GenReturn( nRet, &aUId, bBool );}
+    void GenReturn( comm_USHORT nRet, rtl::OString aUId, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, &aUId, nNr );}
+    void GenReturn( comm_USHORT nRet, rtl::OString aUId, comm_BOOL bBool ){CmdBaseStream::GenReturn( nRet, &aUId, bBool );}
+
 // MacroRecorder
-    void GenReturn( comm_USHORT nRet, SmartId aUId, comm_USHORT nMethod ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod );}
-    void GenReturn( comm_USHORT nRet, SmartId aUId, comm_USHORT nMethod, comm_BOOL bBool ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod, bBool );}
-    void GenReturn( comm_USHORT nRet, SmartId aUId, comm_USHORT nMethod, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod, nNr );}
+    void GenReturn( comm_USHORT nRet, rtl::OString aUId, comm_USHORT nMethod ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod );} // also used outside MacroRecorder
+    void GenReturn( comm_USHORT nRet, rtl::OString aUId, comm_USHORT nMethod, comm_BOOL bBool ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod, bBool );}
+    void GenReturn( comm_USHORT nRet, rtl::OString aUId, comm_USHORT nMethod, comm_ULONG nNr ){CmdBaseStream::GenReturn( nRet, &aUId, nMethod, nNr );}
+
+    void GenReturn( sal_uInt16 nRet, rtl::OString aUId, String aString );
+    void GenReturn( sal_uInt16 nRet, rtl::OString aUId, comm_ULONG nNr, String aString, sal_Bool bBool );
+
+// needed for RemoteCommand and Profiling
+    void GenReturn( sal_uInt16 nRet, sal_uInt16 nMethod, SbxValue &aValue );
+    void GenReturn( sal_uInt16 nRet, sal_uInt16 nMethod, String aString );
 
-    void GenReturn( USHORT nRet, SmartId aUId, String aString );
-    void GenReturn( USHORT nRet, SmartId aUId, SbxValue &aValue );
-    void GenReturn( USHORT nRet, SmartId aUId, comm_ULONG nNr, String aString, BOOL bBool );
 // MacroRecorder
-    void GenReturn( USHORT nRet, SmartId aUId, comm_USHORT nMethod, String aString );
-    void GenReturn( USHORT nRet, SmartId aUId, comm_USHORT nMethod, String aString, BOOL bBool );
+    void GenReturn( sal_uInt16 nRet, rtl::OString aUId, comm_USHORT nMethod, String aString );
+    void GenReturn( sal_uInt16 nRet, rtl::OString aUId, comm_USHORT nMethod, String aString, sal_Bool bBool );
 
     void Reset();
     SvStream* GetStream();
@@ -72,7 +76,7 @@ public:
     void Write( SbxValue &aValue );
 
 // Complex Datatypes to be handled system dependent
-    virtual void Write( SmartId* pId );
+    virtual void Write( rtl::OString* pId );
     virtual void Write( String *pString );
 
     SvStream *pSammel;
diff --git a/automation/source/server/scmdstrm.cxx b/automation/source/server/scmdstrm.cxx
index af88f9b65..d486b92aa 100644
--- a/automation/source/server/scmdstrm.cxx
+++ b/automation/source/server/scmdstrm.cxx
@@ -57,7 +57,7 @@ void SCmdStream::Read (String* &pString)
     if ( !pString )
         pString = new String();
     comm_UniChar* pStr;
-    USHORT nLenInChars;
+    sal_uInt16 nLenInChars;
     CmdBaseStream::Read( pStr, nLenInChars );
 
     *pString = String( pStr, nLenInChars );
@@ -67,7 +67,7 @@ void SCmdStream::Read (String* &pString)
 void SCmdStream::Read (String &aString)
 {
     comm_UniChar* pStr;
-    USHORT nLenInChars;
+    sal_uInt16 nLenInChars;
     CmdBaseStream::Read( pStr, nLenInChars );
 
     aString = String( pStr, nLenInChars );
@@ -76,8 +76,8 @@ void SCmdStream::Read (String &aString)
 
 void SCmdStream::Read ( SfxPoolItem *&pItem )
 {
-    USHORT nType;
-    USHORT nId;
+    sal_uInt16 nType;
+    sal_uInt16 nId;
     Read(nId);
 #if OSL_DEBUG_LEVEL > 1
         StatementList::m_pDbgWin->AddText( "Parameter: " );
@@ -146,7 +146,7 @@ void SCmdStream::Read ( SfxPoolItem *&pItem )
 
 void SCmdStream::Read ( ::com::sun::star::beans::PropertyValue &rItem )
 {
-    USHORT nType;
+    sal_uInt16 nType;
     String aId;
     Read(aId);
     rItem.Name = rtl::OUString( aId );
diff --git a/automation/source/server/server.cxx b/automation/source/server/server.cxx
index 4d2266004..2ebcc36b0 100644
--- a/automation/source/server/server.cxx
+++ b/automation/source/server/server.cxx
@@ -84,16 +84,16 @@ void SAL_CALL osl_TestToolDebugPrint( const sal_Char *pString )
 #endif
 
 
-ULONG RemoteControlCommunicationManager::nPortIs = TT_PORT_NOT_INITIALIZED;
-USHORT RemoteControlCommunicationManager::nComm = 0;
-BOOL RemoteControlCommunicationManager::bQuiet = FALSE;
+sal_uLong RemoteControlCommunicationManager::nPortIs = TT_PORT_NOT_INITIALIZED;
+sal_uInt16 RemoteControlCommunicationManager::nComm = 0;
+sal_Bool RemoteControlCommunicationManager::bQuiet = sal_False;
 
 #if OSL_DEBUG_LEVEL > 1
 RemoteControlCommunicationManager::RemoteControlCommunicationManager( EditWindow * pDbgWin )
 #else
 RemoteControlCommunicationManager::RemoteControlCommunicationManager()
 #endif
-: CommunicationManagerServerViaSocket( GetPort(), 1, TRUE )
+: CommunicationManagerServerViaSocket( GetPort(), 1, sal_True )
 #if OSL_DEBUG_LEVEL > 1
 , m_pDbgWin( pDbgWin )
 #endif
@@ -108,7 +108,7 @@ RemoteControlCommunicationManager::RemoteControlCommunicationManager()
     {
         SetInfoType( CM_SHORT_TEXT | CM_ALL );
         ByteString aByteString;
-        InfoMsg( InfoString( aByteString, CM_ALL ) );	// Anzeigen, daß wir da sind
+        InfoMsg( InfoString( aByteString, CM_ALL ) );	// Anzeigen, da� wir da sind
     }
 }
 
@@ -149,7 +149,7 @@ IMPL_LINK( RemoteControlCommunicationManager, SetWinCaption, Timer*, EMPTYARG )
     }
     else
     {	// Dann Probieren wir es eben in 1 Sekunde nochmal
-        pTimer = new Timer();	// Wird im Link gelöscht
+        pTimer = new Timer();	// Wird im Link gel�scht
         pTimer->SetTimeout( 1000 );
         pTimer->SetTimeoutHdl( LINK( this, RemoteControlCommunicationManager, SetWinCaption ) );
         pTimer->Start();
@@ -169,20 +169,20 @@ void RemoteControlCommunicationManager::InfoMsg( InfoString aMsg )
 #endif
 }
 
-ULONG RemoteControlCommunicationManager::GetPort()
+sal_uLong RemoteControlCommunicationManager::GetPort()
 {
     if ( TT_PORT_NOT_INITIALIZED == nPortIs )
     {	// Read Config
 
-        USHORT i;
+        sal_uInt16 i;
         // are we to be automated at all?
-        BOOL bAutomate = FALSE;
+        sal_Bool bAutomate = sal_False;
         for ( i = 0 ; i < Application::GetCommandLineParamCount() ; i++ )
         {
             if ( Application::GetCommandLineParam( i ).EqualsIgnoreCaseAscii("/enableautomation")
                 || Application::GetCommandLineParam( i ).EqualsIgnoreCaseAscii("-enableautomation"))
             {
-                bAutomate = TRUE;
+                bAutomate = sal_True;
                 break;
             }
         }
@@ -225,11 +225,11 @@ ULONG RemoteControlCommunicationManager::GetPort()
 
         nPortIs = aConf.ReadKey("TTPort","0").ToInt32();
 
-        // noch prüfen ob dieses Office getestet werden soll.
+        // noch pr�fen ob dieses Office getestet werden soll.
         if ( !bAutomate || aConf.ReadKey( aNoTesttoolKey, "" ) != "" )
             nPortIs = 0;
 
-        nComm = (USHORT)aConf.ReadKey("Comm","0").ToInt32();
+        nComm = (sal_uInt16)aConf.ReadKey("Comm","0").ToInt32();
         if ( nComm )
             aConf.DeleteKey("Comm");
 
@@ -248,7 +248,7 @@ class ExtraIdle : public AutoTimer
 {
     virtual void    Timeout();
 
-    USHORT nStep;
+    sal_uInt16 nStep;
     ImplRemoteControl *pRemoteControl;
 public:
     ExtraIdle( ImplRemoteControl *pRC );
@@ -277,16 +277,16 @@ void ExtraIdle::Timeout()
         return;
     }
 
-    // Müssen wir selbst idlen?
+    // M�ssen wir selbst idlen?
 #if OSL_DEBUG_LEVEL > 1
-    ULONG nLastInputInterval = Application::GetLastInputInterval();
-    BOOL bIsInModalMode = Application::IsInModalMode();
+    sal_uLong nLastInputInterval = Application::GetLastInputInterval();
+    sal_Bool bIsInModalMode = Application::IsInModalMode();
     if ( bIsInModalMode || nLastInputInterval < MIN_IDLE )
 #else
     if ( Application::IsInModalMode() || Application::GetLastInputInterval() < MIN_IDLE )
 #endif
     {
-        if ( nStep )	// Schon angefangen? dann abbrechen, sonst später nochmal
+        if ( nStep )	// Schon angefangen? dann abbrechen, sonst sp�ter nochmal
         {
             if ( nStep < 15 )
             {
@@ -314,11 +314,11 @@ void ExtraIdle::Timeout()
     }
 
 
-    switch ( nStep++ )		// Probieren ob wir noch was machen können
+    switch ( nStep++ )		// Probieren ob wir noch was machen k�nnen
     {
         case 0:
         {
-            SfxPoolItem *pItem = new SfxStringItem((USHORT)StatementList::pTTProperties->nSidNewDocDirect, CUniString("swriter/web") );
+            SfxPoolItem *pItem = new SfxStringItem((sal_uInt16)StatementList::pTTProperties->nSidNewDocDirect, CUniString("swriter/web") );
             new StatementSlot( StatementList::pTTProperties->nSidNewDocDirect, pItem );
             SetTimeout(30000);
             return;
@@ -378,7 +378,7 @@ void ExtraIdle::Timeout()
 #endif
 
 #ifdef TT_CODE
-            for ( USHORT i = 0 ; i < aStr.Len() ; i++ )
+            for ( sal_uInt16 i = 0 ; i < aStr.Len() ; i++ )
             {
                 if ( aStr.GetChar(i) < 32 || aStr.GetChar(i) > 126 )
                 {
@@ -563,7 +563,7 @@ IMPL_LINK( ImplRemoteControl, CommandHdl, Application*, EMPTYARG )
 
     if ( StatementList::MaybeResetSafeReschedule() )
     {
-        StatementList::bExecuting = FALSE;		// Wird nacher im SafeReschedule wieder zurückgesetzt
+        StatementList::bExecuting = sal_False;		// Wird nacher im SafeReschedule wieder zur�ckgesetzt
 #if OSL_DEBUG_LEVEL > 1
         m_pDbgWin->AddText( "SafeReschedule has been reset\n" );
 #endif
@@ -590,14 +590,14 @@ IMPL_LINK( ImplRemoteControl, CommandHdl, Application*, EMPTYARG )
             }
             m_pDbgWin->AddText( "Leaving CommandHdl\n" );
 #endif
-            return 0;        // Garnicht erst irgendwelchen blödsinn machen
+            return 0;        // Garnicht erst irgendwelchen bl�dsinn machen
         }
 
     while( StatementList::pFirst && ( !StatementList::bReadingCommands || StatementList::bDying ) )
-        // Schleift hier bis Befehl nicht zurückkommt,
-        // Wird dann rekursiv über IdleHdl und PostUserEvent aufgerufen.
+        // Schleift hier bis Befehl nicht zur�ckkommt,
+        // Wird dann rekursiv �ber IdleHdl und PostUserEvent aufgerufen.
     {
-        m_bInsideExecutionLoop = TRUE;
+        m_bInsideExecutionLoop = sal_True;
 #ifdef TIMERIDLE
         m_aIdleTimer.Stop();
         m_aIdleTimer.Start();
@@ -611,7 +611,7 @@ IMPL_LINK( ImplRemoteControl, CommandHdl, Application*, EMPTYARG )
 #if OSL_DEBUG_LEVEL > 1
                 m_pDbgWin->AddText( "Leaving CommandHdl\n" );
 #endif
-                return 0;        // So dass die App nochmal ´ne chance bekommt
+                return 0;        // So dass die App nochmal �ne chance bekommt
             }
         }
         else
@@ -623,7 +623,7 @@ IMPL_LINK( ImplRemoteControl, CommandHdl, Application*, EMPTYARG )
 #if OSL_DEBUG_LEVEL > 1
                     m_pDbgWin->AddText( "Leaving CommandHdl\n" );
 #endif
-                    return 0;        // So dass die App nochmal ´ne chance bekommt
+                    return 0;        // So dass die App nochmal �ne chance bekommt
                 }
             }
             catch( ... )
@@ -639,8 +639,8 @@ IMPL_LINK( ImplRemoteControl, CommandHdl, Application*, EMPTYARG )
                     pDlg->Show();
                     OSL_FAIL("GPF");
                     pC->ReportError( GEN_RES_STR0( S_GPF_ABORT ) );
-                    StatementList::bDying = TRUE;
-                    while ( StatementList::pFirst )			// Kommandos werden übersprungen
+                    StatementList::bDying = sal_True;
+                    while ( StatementList::pFirst )			// Kommandos werden �bersprungen
                         StatementList::NormalReschedule();
                     delete pDlg;
                 }
@@ -652,10 +652,10 @@ IMPL_LINK( ImplRemoteControl, CommandHdl, Application*, EMPTYARG )
             }
         }
 
-        m_bInsideExecutionLoop = FALSE;
+        m_bInsideExecutionLoop = sal_False;
     }
 
-    StatementList::aWindowWaitUId = SmartId();  // Warten rücksetzen, da handler sowieso verlassen wird
+    StatementList::aWindowWaitUId = rtl::OString();  // Warten r�cksetzen, da handler sowieso verlassen wird
 
 #if OSL_DEBUG_LEVEL > 1
     m_pDbgWin->AddText( "Leaving CommandHdl\n" );
@@ -671,9 +671,9 @@ IMPL_LINK( ImplRemoteControl, QueCommandsEvent, CommunicationLink*, pCL )
     return 0;
 }
 
-BOOL ImplRemoteControl::QueCommands( ULONG nServiceId, SvStream *pIn )
+sal_Bool ImplRemoteControl::QueCommands( sal_uLong nServiceId, SvStream *pIn )
 {
-    USHORT nId;
+    sal_uInt16 nId;
 
     if( !m_bIdleInserted )
     {
@@ -684,11 +684,11 @@ BOOL ImplRemoteControl::QueCommands( ULONG nServiceId, SvStream *pIn )
 #else
         GetpApp()->InsertIdleHdl( LINK( this, ImplRemoteControl, IdleHdl ), 1 );
 #endif
-        m_bIdleInserted = TRUE;
+        m_bIdleInserted = sal_True;
     }
 
 
-    StatementList::bReadingCommands = TRUE;
+    StatementList::bReadingCommands = sal_True;
 
 #if OSL_DEBUG_LEVEL > 1
     if (!m_pDbgWin->bQuiet)
@@ -700,8 +700,8 @@ BOOL ImplRemoteControl::QueCommands( ULONG nServiceId, SvStream *pIn )
 
     if( nServiceId != SI_IPCCommandBlock && nServiceId != SI_DirectCommandBlock )
     {
-        DBG_ERROR1( "Ungültiger Request :%i", (int)nServiceId );
-        return FALSE;
+        DBG_ERROR1( "Ung�ltiger Request :%i", (int)nServiceId );
+        return sal_False;
     }
 
     SCmdStream *pCmdStream = new SCmdStream(pIn);
@@ -713,28 +713,28 @@ BOOL ImplRemoteControl::QueCommands( ULONG nServiceId, SvStream *pIn )
         {
             case SICommand:
             {
-                new StatementCommand( pCmdStream );     // Wird im Konstruktor an Liste angehängt
+                new StatementCommand( pCmdStream );     // Wird im Konstruktor an Liste angeh�ngt
                 break;
             }
             case SIControl:
             case SIStringControl:
             {
-                new StatementControl( pCmdStream, nId );     // Wird im Konstruktor an Liste angehängt
+                new StatementControl( pCmdStream, nId );     // Wird im Konstruktor an Liste angeh�ngt
                 break;
             }
             case SISlot:
             {
-                new StatementSlot( pCmdStream );    // Wird im Konstruktor an Liste angehängt
+                new StatementSlot( pCmdStream );    // Wird im Konstruktor an Liste angeh�ngt
                 break;
             }
             case SIUnoSlot:
             {
-                new StatementUnoSlot( pCmdStream );    // Wird im Konstruktor an Liste angehängt
+                new StatementUnoSlot( pCmdStream );    // Wird im Konstruktor an Liste angeh�ngt
                 break;
             }
             case SIFlow:
             {
-                new StatementFlow( nServiceId, pCmdStream, this );              // Wird im Konstruktor an Liste angehängt
+                new StatementFlow( nServiceId, pCmdStream, this );              // Wird im Konstruktor an Liste angeh�ngt
                 break;
             }
             default:
@@ -748,7 +748,7 @@ BOOL ImplRemoteControl::QueCommands( ULONG nServiceId, SvStream *pIn )
         }
     }
 
-    StatementList::bReadingCommands = FALSE;
+    StatementList::bReadingCommands = sal_False;
 
     delete pCmdStream;
 #if OSL_DEBUG_LEVEL > 1
@@ -764,7 +764,7 @@ BOOL ImplRemoteControl::QueCommands( ULONG nServiceId, SvStream *pIn )
 
         GetpApp()->PostUserEvent( LINK( this, ImplRemoteControl, CommandHdl ) );
     }
-    return TRUE;
+    return sal_True;
 }
 
 
@@ -776,8 +776,8 @@ SvStream* ImplRemoteControl::GetReturnStream()
 }
 
 ImplRemoteControl::ImplRemoteControl()
-: m_bIdleInserted( FALSE )
-, m_bInsideExecutionLoop( FALSE )
+: m_bIdleInserted( sal_False )
+, m_bInsideExecutionLoop( sal_False )
 #if OSL_DEBUG_LEVEL > 1
 , m_pDbgWin(NULL)
 #endif
@@ -787,8 +787,11 @@ ImplRemoteControl::ImplRemoteControl()
     if ( RemoteControlCommunicationManager::GetPort() != TT_NO_PORT_DEFINED || RemoteControlCommunicationManager::nComm )
     {
         m_pDbgWin = new EditWindow( NULL, CUniString("Debug Window"), WB_VSCROLL );
-        m_pDbgWin->bQuiet = TRUE;
+        m_pDbgWin->bQuiet = sal_True;
         m_pDbgWin->Hide();
+        m_pDbgWin->bQuiet = sal_False;
+        m_pDbgWin->Show();
+
         StatementList::m_pDbgWin = m_pDbgWin;
     }
 #endif
@@ -819,26 +822,26 @@ ImplRemoteControl::ImplRemoteControl()
 ImplRemoteControl::~ImplRemoteControl()
 {
     if ( MacroRecorder::HasMacroRecorder() )
-        MacroRecorder::GetMacroRecorder()->SetActionRecord( FALSE );   // Will delete MacroRecorder if necessary
+        MacroRecorder::GetMacroRecorder()->SetActionRecord( sal_False );   // Will delete MacroRecorder if necessary
 
     
-    StatementList::bDying = TRUE;
+    StatementList::bDying = sal_True;
 #if OSL_DEBUG_LEVEL > 1
     if ( m_pDbgWin )
-        m_pDbgWin->bQuiet = TRUE;	// Keine Ausgabe mehr im Debugwindow
+        m_pDbgWin->bQuiet = sal_True;	// Keine Ausgabe mehr im Debugwindow
 #endif
 
 #ifdef DBG_UTIL
-    // Zurücksetzen, so daß nachfolgende Assertions nicht verloren gehen
+    // Zur�cksetzen, so da� nachfolgende Assertions nicht verloren gehen
     DbgSetPrintTestTool( NULL );
     osl_setDebugMessageFunc( StatementCommand::pOriginal_osl_DebugMessageFunc );
 #endif
 
     if ( StatementList::pFirst )
-    {	// Es sind noch Kommandos da, also auch eine Möglichkeit zurückzusenden.
+    {	// Es sind noch Kommandos da, also auch eine M�glichkeit zur�ckzusenden.
         StatementList::pFirst->ReportError( GEN_RES_STR0( S_APP_SHUTDOWN ) );
-        while ( StatementList::pFirst )				// Kommandos werden übersprungen
-            StatementList::NormalReschedule();		// Fehler zurückgeschickt
+        while ( StatementList::pFirst )				// Kommandos werden �bersprungen
+            StatementList::NormalReschedule();		// Fehler zur�ckgeschickt
     }
 
     if ( pServiceMgr )
@@ -864,7 +867,7 @@ ImplRemoteControl::~ImplRemoteControl()
 #else
         GetpApp()->RemoveIdleHdl( LINK( this, ImplRemoteControl, IdleHdl ) );
 #endif
-        m_bIdleInserted = FALSE;
+        m_bIdleInserted = sal_False;
     }
     delete pServiceMgr;
 }
@@ -905,7 +908,7 @@ extern "C" void CreateEventLogger()
 
 extern "C" void DestroyEventLogger()
 {
-    MacroRecorder::GetMacroRecorder()->SetActionLog( FALSE );   // Will delete MacroRecorder if necessary
+    MacroRecorder::GetMacroRecorder()->SetActionLog( sal_False );   // Will delete MacroRecorder if necessary
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/automation/source/server/server.hxx b/automation/source/server/server.hxx
index 96294db70..b72ad2e8e 100644
--- a/automation/source/server/server.hxx
+++ b/automation/source/server/server.hxx
@@ -31,7 +31,7 @@
 #include "editwin.hxx"
 #include <automation/communi.hxx>
 
-#define TT_PORT_NOT_INITIALIZED		ULONG(0xFFFFFFFF)	// Eigentlich ja noch mehr, aber soll mal reichen
+#define TT_PORT_NOT_INITIALIZED		sal_uLong(0xFFFFFFFF)	// Eigentlich ja noch mehr, aber soll mal reichen
 #define TT_NO_PORT_DEFINED			0
 
 class RemoteControlCommunicationManager : public CommunicationManagerServerViaSocket
@@ -41,12 +41,12 @@ class RemoteControlCommunicationManager : public CommunicationManagerServerViaSo
 #endif
     String aOriginalWinCaption;
     String aAdditionalWinCaption;
-    BOOL bIsPortValid;
+    sal_Bool bIsPortValid;
     DECL_LINK( SetWinCaption, Timer* = NULL);
     Timer* pTimer;
     virtual void InfoMsg( InfoString aMsg );
-    static ULONG nPortIs;
-    static BOOL bQuiet;
+    static sal_uLong nPortIs;
+    static sal_Bool bQuiet;
 
 public:
 #if OSL_DEBUG_LEVEL > 1
@@ -59,8 +59,8 @@ public:
     virtual void ConnectionOpened( CommunicationLink* pCL );
     virtual void ConnectionClosed( CommunicationLink* pCL );
 
-    static ULONG GetPort();
-    static USHORT nComm;
+    static sal_uLong GetPort();
+    static sal_uInt16 nComm;
 
 #if OSL_DEBUG_LEVEL > 1
 //	virtual void DataReceived( CommunicationLink* pCL );
diff --git a/automation/source/server/sta_list.cxx b/automation/source/server/sta_list.cxx
index 576b1cf1e..99906cd0b 100644
--- a/automation/source/server/sta_list.cxx
+++ b/automation/source/server/sta_list.cxx
@@ -57,45 +57,45 @@
 
 TTProfiler *StatementList::pProfiler = NULL;
 StatementList *StatementList::pFirst = NULL;
-BOOL StatementList::bReadingCommands = FALSE;
-BOOL StatementList::bIsInReschedule = FALSE;
-USHORT StatementList::nModalCount = 0;
+sal_Bool StatementList::bReadingCommands = sal_False;
+sal_Bool StatementList::bIsInReschedule = sal_False;
+sal_uInt16 StatementList::nModalCount = 0;
 Window *StatementList::pLastFocusWindow = NULL;
-BOOL StatementList::bWasDragManager = FALSE;
-BOOL StatementList::bWasPopupMenu = FALSE;
-BOOL StatementList::bBasicWasRunning = FALSE;
+sal_Bool StatementList::bWasDragManager = sal_False;
+sal_Bool StatementList::bWasPopupMenu = sal_False;
+sal_Bool StatementList::bBasicWasRunning = sal_False;
 RetStream *StatementList::pRet = NULL;
-BOOL StatementList::IsError = FALSE;
-BOOL StatementList::bDying = FALSE;
-BOOL StatementList::bExecuting = FALSE;
+sal_Bool StatementList::IsError = sal_False;
+sal_Bool StatementList::bDying = sal_False;
+sal_Bool StatementList::bExecuting = sal_False;
 StatementList *StatementList::pCurrentProfileStatement = NULL;
-BOOL StatementList::bUsePostEvents = TRUE;
+sal_Bool StatementList::bUsePostEvents = sal_True;
 #if OSL_DEBUG_LEVEL > 1
 EditWindow *StatementList::m_pDbgWin;
 #endif
 
 
-SmartId StatementList::aWindowWaitUId = SmartId();
+rtl::OString StatementList::aWindowWaitUId = rtl::OString();
 Window *StatementList::pWindowWaitPointer = NULL;
-SmartId StatementList::aWindowWaitOldHelpId = SmartId();
-SmartId StatementList::aWindowWaitOldUniqueId = SmartId();
-USHORT StatementList::nUseBindings = 0;
+rtl::OString StatementList::aWindowWaitOldHelpId = rtl::OString();
+rtl::OString StatementList::aWindowWaitOldUniqueId = rtl::OString();
+sal_uInt16 StatementList::nUseBindings = 0;
 
-SmartId StatementList::aSubMenuId1 = SmartId();	// Untermenüs bei PopupMenus
-SmartId StatementList::aSubMenuId2 = SmartId();	// erstmal 2-Stufig
-SmartId StatementList::aSubMenuId3 = SmartId();	// and now even 3 levels #i31512#
+sal_uInt16 StatementList::aSubMenuId1 = 0;	// Untermen�s bei PopupMenus
+sal_uInt16 StatementList::aSubMenuId2 = 0;	// erstmal 2-Stufig
+sal_uInt16 StatementList::aSubMenuId3 = 0;	// and now even 3 levels #i31512#
 SystemWindow *StatementList::pMenuWindow = NULL;
 TTProperties *StatementList::pTTProperties = NULL;
 
-USHORT StatementList::nMinTypeKeysDelay = 0;	// Verzögerung der einzelnen Anschläge für TypeKeys
-USHORT StatementList::nMaxTypeKeysDelay = 0;
-BOOL StatementList::bDoTypeKeysDelay = FALSE;
+sal_uInt16 StatementList::nMinTypeKeysDelay = 0;	// Verz�gerung der einzelnen Anschl�ge f�r TypeKeys
+sal_uInt16 StatementList::nMaxTypeKeysDelay = 0;
+sal_Bool StatementList::bDoTypeKeysDelay = sal_False;
 
 Window* StatementList::pFirstDocFrame = NULL;
 
-BOOL StatementList::bIsSlotInExecute = FALSE;
+sal_Bool StatementList::bIsSlotInExecute = sal_False;
 
-BOOL StatementList::bCatchGPF = TRUE;
+sal_Bool StatementList::bCatchGPF = sal_True;
 
 
 IMPL_GEN_RES_STR;
@@ -118,7 +118,7 @@ TTSettings* GetTTSettings()
 
         // Translate
         pTTSettings->pTranslateWin = NULL;
-        pTTSettings->bToTop = TRUE;
+        pTTSettings->bToTop = sal_True;
     }
 
     return pTTSettings;
@@ -127,14 +127,15 @@ TTSettings* GetTTSettings()
 
 
 
-#define IS_WINP_CLOSING(pWin) (pWin->GetSmartHelpId().Matches( 4321 ) && pWin->GetSmartUniqueId().Matches( 1234 ))
+// FIXME: HELPID
+#define IS_WINP_CLOSING(pWin) (pWin->GetHelpId().equals( "TT_Win_is_closing_HID" ) && pWin->GetUniqueId().equals( "TT_Win_is_closing_UID" ))
 
 StatementList::StatementList()
 : nRetryCount(MAX_RETRIES)
-, bStatementInQue(FALSE)
+, bStatementInQue(sal_False)
 {
     if (!pRet)
-        pRet = new RetStream;		// so Spät wie möglich, aber dennoch Zentral und auf jeden Fall rechtzeitig, da pRet private ist.
+        pRet = new RetStream;		// so Sp�t wie m�glich, aber dennoch Zentral und auf jeden Fall rechtzeitig, da pRet private ist.
 }
 
 void StatementList::InitProfile()
@@ -146,7 +147,7 @@ void StatementList::InitProfile()
 
 #if OSL_DEBUG_LEVEL > 1
         if ( pCurrentProfileStatement != NULL && pCurrentProfileStatement != this )
-            pRet->GenReturn( RET_ProfileInfo, SmartId(), CUniString("InitProfile von anderem Statement gerufen ohne SendProfile\n") );
+            pRet->GenReturn( RET_ProfileInfo, 0, CUniString("InitProfile von anderem Statement gerufen ohne SendProfile\n") );
 #endif
         pCurrentProfileStatement = this;
     }
@@ -162,18 +163,19 @@ void StatementList::SendProfile( String aText )
                 pProfiler->EndProfileInterval();
 
             if ( pProfiler->IsProfilingPerCommand() )
-                pRet->GenReturn( RET_ProfileInfo, SmartId(), pProfiler->GetProfileLine( aText ) );
+                pRet->GenReturn( RET_ProfileInfo, 0, pProfiler->GetProfileLine( aText ) );
 
             if ( pProfiler->IsPartitioning() )
-                pRet->GenReturn( RET_ProfileInfo, SmartId( S_ProfileTime ), static_cast<comm_ULONG>(pProfiler->GetPartitioningTime()) ); // GetPartitioningTime() ULONG != comm_ULONG on 64bit
+                                // FIXME: HELPID
+                pRet->GenReturn( RET_ProfileInfo, S_ProfileTime, static_cast<comm_ULONG>(pProfiler->GetPartitioningTime()) ); // GetPartitioningTime() sal_uLong != comm_ULONG on 64bit
         }
 
         if ( pProfiler->IsAutoProfiling() )
-            pRet->GenReturn( RET_ProfileInfo, SmartId(), pProfiler->GetAutoProfiling() );
+            pRet->GenReturn( RET_ProfileInfo, 0, pProfiler->GetAutoProfiling() );
 
 #if OSL_DEBUG_LEVEL > 1
         if ( pCurrentProfileStatement == NULL )
-            pRet->GenReturn( RET_ProfileInfo, SmartId(), CUniString("SendProfile ohne InitProfile\n") );
+            pRet->GenReturn( RET_ProfileInfo, 0, CUniString("SendProfile ohne InitProfile\n") );
 #endif
         pCurrentProfileStatement = NULL;
     }
@@ -181,11 +183,11 @@ void StatementList::SendProfile( String aText )
 
 void StatementList::QueStatement(StatementList *pAfterThis)
 {
-    DBG_ASSERT(!bStatementInQue,"QueStatement für bereits eingetragenes Statement -> Abgebrochen");
+    DBG_ASSERT(!bStatementInQue,"QueStatement f�r bereits eingetragenes Statement -> Abgebrochen");
     if ( bStatementInQue )
         return;
 
-    bStatementInQue = TRUE;
+    bStatementInQue = sal_True;
     if ( pAfterThis )
     {
         if ( pAfterThis->bStatementInQue )
@@ -199,7 +201,7 @@ void StatementList::QueStatement(StatementList *pAfterThis)
             pFirst = this;
         }
     }
-    else	// am Ende einfügen
+    else	// am Ende einf�gen
     {
         pNext = NULL;
         if( !pFirst )
@@ -218,7 +220,7 @@ void StatementList::QueStatement(StatementList *pAfterThis)
 void StatementList::Advance()
 {	// pFirst ist static!
     pFirst = pNext;
-    bStatementInQue = FALSE;
+    bStatementInQue = sal_False;
     pNext = NULL;
 }
 
@@ -231,7 +233,7 @@ StatementList::~StatementList()
     DBG_ASSERT(!bReadingCommands,"Deleting commands while reading them!");
 }
 
-Window* StatementList::GetDocWin( USHORT nNr )
+Window* StatementList::GetDocWin( sal_uInt16 nNr )
 {
     Window* pBase = Application::GetFirstTopLevelWindow();
 
@@ -248,10 +250,10 @@ Window* StatementList::GetDocWin( USHORT nNr )
     return NULL;
 }
 
-USHORT StatementList::GetDocFrameCount()
+sal_uInt16 StatementList::GetDocFrameCount()
 {
     Window* pBase = Application::GetFirstTopLevelWindow();
-    USHORT nCount = 0;
+    sal_uInt16 nCount = 0;
 
     while ( pBase )
     {
@@ -262,10 +264,10 @@ USHORT StatementList::GetDocFrameCount()
     return nCount;
 }
 
-USHORT StatementList::GetDocWinCount()
+sal_uInt16 StatementList::GetDocWinCount()
 {
     Window* pBase = Application::GetFirstTopLevelWindow();
-    USHORT nCount = 0;
+    sal_uInt16 nCount = 0;
 
     while ( pBase )
     {
@@ -276,12 +278,12 @@ USHORT StatementList::GetDocWinCount()
     return nCount;
 }
 
-Window* StatementList::SearchAllWin( Window *pBase, Search &aSearch, BOOL MaybeBase )
+Window* StatementList::SearchAllWin( Window *pBase, Search &aSearch, sal_Bool MaybeBase )
 {
 
     if ( !pBase && !aSearch.HasSearchFlag( SEARCH_NO_TOPLEVEL_WIN ) )
     {
-        BOOL bSearchFocusFirst = aSearch.HasSearchFlag( SEARCH_FOCUS_FIRST );
+        sal_Bool bSearchFocusFirst = aSearch.HasSearchFlag( SEARCH_FOCUS_FIRST );
 
         Window *pControl = NULL;
         if ( bSearchFocusFirst )
@@ -348,7 +350,7 @@ Window* StatementList::SearchAllWin( Window *pBase, Search &aSearch, BOOL MaybeB
 }
 
 
-Window* StatementList::SearchClientWin( Window *pBase, Search &aSearch, BOOL MaybeBase )
+Window* StatementList::SearchClientWin( Window *pBase, Search &aSearch, sal_Bool MaybeBase )
 {
     if ( !pBase )
         return NULL;
@@ -358,7 +360,7 @@ Window* StatementList::SearchClientWin( Window *pBase, Search &aSearch, BOOL May
 
     Window *pResult = NULL;
 
-    USHORT i;
+    sal_uInt16 i;
     for( i = 0 ; i < pBase->GetChildCount() && !pResult; i++ )
         pResult = SearchClientWin( pBase->GetChild(i), aSearch );
 
@@ -366,26 +368,26 @@ Window* StatementList::SearchClientWin( Window *pBase, Search &aSearch, BOOL May
 }
 
 
-BOOL SearchUID::IsWinOK( Window *pWin )
+sal_Bool SearchUID::IsWinOK( Window *pWin )
 {
-    if ( aUId.Matches( pWin->GetSmartUniqueOrHelpId() ) )
+    if ( aUId.equals( pWin->GetUniqueOrHelpId() ) )
     {
         if ( ( pWin->IsEnabled() || HasSearchFlag( SEARCH_FIND_DISABLED ) ) && pWin->IsVisible() )
-            return TRUE;
+            return sal_True;
         else
         {
             if ( !pMaybeResult )
                 pMaybeResult = pWin;
-            return FALSE;
+            return sal_False;
         }
     }
     else if ( pWin->GetType() == WINDOW_TOOLBOX )	// Buttons and Controls on ToolBox.
     {
         ToolBox *pTB = ((ToolBox*)pWin);
-        USHORT i;
+        sal_uInt16 i;
         for ( i = 0; i < pTB->GetItemCount() ; i++ )
         {
-            if ( aUId.Matches( pTB->GetItemCommand(pTB->GetItemId( i )) ) || aUId.Matches( pTB->GetHelpId(pTB->GetItemId( i )) ) )
+            if ( aUId.equals( Str2Id( pTB->GetItemCommand(pTB->GetItemId( i )) ) ) || aUId.equals( pTB->GetHelpId(pTB->GetItemId( i )) ) )
             {		// ID matches.
                 Window *pItemWin;
                 pItemWin = pTB->GetItemWindow( pTB->GetItemId( i ) );
@@ -397,17 +399,17 @@ BOOL SearchUID::IsWinOK( Window *pWin )
                     {	// We got a Button, see if its valid also.
                         if ( ( pTB->IsItemEnabled(pTB->GetItemId(i)) || HasSearchFlag( SEARCH_FIND_DISABLED ) )
                          && pTB->IsItemVisible(pTB->GetItemId(i)) )
-                            return TRUE;	// We got a Button.
+                            return sal_True;	// We got a Button.
                         else
                         {	// better a disabled Button on a valid ToolBox than an invalid ToolBox as below
                             pMaybeResult = pTB;
-                            return FALSE;
+                            return sal_False;
                         }
                     }
                     else if ( !pMaybeResult )
                     {	// invalid ToolBox
                         pMaybeResult = pTB;
-                        return FALSE;
+                        return sal_False;
                     }
                 }
                 if ( pItemWin )
@@ -417,23 +419,23 @@ BOOL SearchUID::IsWinOK( Window *pWin )
                     {
                         if ( !pAlternateResult )    // only take the first found ItemWindow #i35365
                             pAlternateResult = pItemWin;	// since we cannot return a Window here
-                        return FALSE;   // continue searching to prefer a window with the right ID #i32292
+                        return sal_False;   // continue searching to prefer a window with the right ID #i32292
                     }
                     else if ( !pMaybeResult )
                     {
                         pMaybeResult = pItemWin;
-                        return FALSE;
+                        return sal_False;
                     }
                 }
             }
         }
-        return FALSE;
+        return sal_False;
     }
     else
-        return FALSE;
+        return sal_False;
 }
 
-Window* StatementList::SearchTree( SmartId aUId ,BOOL bSearchButtonOnToolbox )
+Window* StatementList::SearchTree( rtl::OString aUId ,sal_Bool bSearchButtonOnToolbox )
 {
     SearchUID aSearch(aUId,bSearchButtonOnToolbox);
 
@@ -447,19 +449,19 @@ Window* StatementList::SearchTree( SmartId aUId ,BOOL bSearchButtonOnToolbox )
 }
 
 
-BOOL SearchWinPtr::IsWinOK( Window *pWin )
+sal_Bool SearchWinPtr::IsWinOK( Window *pWin )
 {
     return pWin == pTest;
 }
 
-BOOL StatementList::WinPtrValid(Window *pTest)
+sal_Bool StatementList::WinPtrValid(Window *pTest)
 {
     SearchWinPtr aSearch( pTest );
     return SearchAllWin( NULL, aSearch ) != NULL;
 }
 
 
-BOOL SearchRT::IsWinOK( Window *pWin )
+sal_Bool SearchRT::IsWinOK( Window *pWin )
 {
     if ( pWin->IsVisible() && pWin->GetType() == mnRT )
     {
@@ -467,15 +469,15 @@ BOOL SearchRT::IsWinOK( Window *pWin )
         if ( mnSkip )
         {
             mnSkip--;
-            return FALSE;
+            return sal_False;
         }
         else
-            return TRUE;
+            return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
-Window* StatementList::GetWinByRT( Window *pBase, WindowType nRT, BOOL MaybeBase, USHORT nSkip, BOOL bSearchAll )
+Window* StatementList::GetWinByRT( Window *pBase, WindowType nRT, sal_Bool MaybeBase, sal_uInt16 nSkip, sal_Bool bSearchAll )
 {
     SearchRT aSearch( nRT, 0, nSkip );
     if ( bSearchAll )
@@ -486,7 +488,7 @@ Window* StatementList::GetWinByRT( Window *pBase, WindowType nRT, BOOL MaybeBase
     return SearchAllWin( pBase, aSearch, MaybeBase );
 }
 
-USHORT StatementList::CountWinByRT( Window *pBase, WindowType nRT, BOOL MaybeBase )
+sal_uInt16 StatementList::CountWinByRT( Window *pBase, WindowType nRT, sal_Bool MaybeBase )
 {
     SearchRT aSearch( nRT, SEARCH_NOOVERLAP | SEARCH_NO_TOPLEVEL_WIN, 0xFFFF );
 
@@ -494,7 +496,7 @@ USHORT StatementList::CountWinByRT( Window *pBase, WindowType nRT, BOOL MaybeBas
     return aSearch.GetCount();
 }
 
-BOOL SearchScroll::IsWinOK( Window *pWin )
+sal_Bool SearchScroll::IsWinOK( Window *pWin )
 {
     if ( SearchRT::IsWinOK( pWin ) )
     {
@@ -502,10 +504,10 @@ BOOL SearchScroll::IsWinOK( Window *pWin )
         return (( pWin->GetStyle() & WB_HORZ ) && ( nDirection == CONST_ALIGN_BOTTOM ))
             || (( pWin->GetStyle() & WB_VERT ) && ( nDirection == CONST_ALIGN_RIGHT ));
     }
-    return FALSE;
+    return sal_False;
 }
 
-ScrollBar* StatementList::GetScrollBar( Window *pBase, USHORT nDirection, BOOL MaybeBase )
+ScrollBar* StatementList::GetScrollBar( Window *pBase, sal_uInt16 nDirection, sal_Bool MaybeBase )
 {
     SearchScroll aSearch( nDirection, SEARCH_NOOVERLAP | SEARCH_NO_TOPLEVEL_WIN );
 
@@ -513,12 +515,12 @@ ScrollBar* StatementList::GetScrollBar( Window *pBase, USHORT nDirection, BOOL M
 }
 
 
-BOOL SearchPopupFloatingWin::IsWinOK( Window *pWin )
+sal_Bool SearchPopupFloatingWin::IsWinOK( Window *pWin )
 {
     return pWin->IsVisible() && pWin->GetType() == WINDOW_FLOATINGWINDOW && ((FloatingWindow*)pWin)->IsInPopupMode();
 }
 
-Window* StatementList::GetPopupFloatingWin( BOOL MaybeBase )
+Window* StatementList::GetPopupFloatingWin( sal_Bool MaybeBase )
 {
     SearchPopupFloatingWin aSearch;
 
@@ -533,7 +535,7 @@ Menu* StatementList::GetMatchingMenu( Window* pWin, Menu* pBaseMenu )
         if ( pBaseMenu->GetWindow() == pWin )
             return pBaseMenu;
 
-        USHORT i;
+        sal_uInt16 i;
             i = 0;
             while ( i < pBaseMenu->GetItemCount() )
             {
@@ -561,16 +563,16 @@ Menu* StatementList::GetMatchingMenu( Window* pWin, Menu* pBaseMenu )
                 return pMenu;
         }
 
-        USHORT nSkip = 0;
+        sal_uInt16 nSkip = 0;
         Window* pMenuBarWin = NULL;
-        while ( (pMenuBarWin = GetWinByRT( NULL, WINDOW_MENUBARWINDOW, TRUE, nSkip++, TRUE )) != NULL )
+        while ( (pMenuBarWin = GetWinByRT( NULL, WINDOW_MENUBARWINDOW, sal_True, nSkip++, sal_True )) != NULL )
         {
             Window* pParent = pMenuBarWin->GET_REAL_PARENT();
             if ( pParent && pParent->GetType() == WINDOW_BORDERWINDOW && pParent->IsVisible() )
             {
                 Menu* pMenu = NULL;
                 // find Menu of MenuBarWindow
-                USHORT nCount;
+                sal_uInt16 nCount;
                 for ( nCount = 0 ; nCount < pParent->GetChildCount() ; nCount++ )
                 {
                     if ( pParent->GetChild( nCount )->GetType() == WINDOW_WORKWINDOW )
@@ -594,25 +596,25 @@ Menu* StatementList::GetMatchingMenu( Window* pWin, Menu* pBaseMenu )
 }
 
 
-BOOL SearchActive::IsWinOK( Window *pWin )
+sal_Bool SearchActive::IsWinOK( Window *pWin )
 {
     // only matches ResID due to problems with UNIX Window Managers
     return pWin->IsVisible() && ( (nRT == WINDOW_ANYTYPE && IsDialog(pWin) ) || pWin->GetType() == nRT );
 }
 
-Window* StatementList::GetActive( WindowType nRT, BOOL MaybeBase )
+Window* StatementList::GetActive( WindowType nRT, sal_Bool MaybeBase )
 {
     SearchActive aSearch( nRT );
 
     return SearchAllWin( NULL, aSearch, MaybeBase );
 }
 
-BOOL SearchFadeSplitWin::IsWinOK( Window *pWin )
+sal_Bool SearchFadeSplitWin::IsWinOK( Window *pWin )
 {
 #if OSL_DEBUG_LEVEL > 1
     if ( pWin->GetType() == WINDOW_SPLITWINDOW )
     {
-        BOOL bResult;
+        sal_Bool bResult;
         WindowAlign aAlign;
         bResult = pWin->IsVisible();
         bResult = ((SplitWindow*)pWin)->IsFadeInButtonVisible();
@@ -626,7 +628,7 @@ BOOL SearchFadeSplitWin::IsWinOK( Window *pWin )
         /*&& ((SplitWindow*)pWin)->IsAutoHideButtonVisible()*/ && ((SplitWindow*)pWin)->GetAlign() == nAlign;
 }
 
-Window* StatementList::GetFadeSplitWin( Window *pBase, WindowAlign nAlign, BOOL MaybeBase )
+Window* StatementList::GetFadeSplitWin( Window *pBase, WindowAlign nAlign, sal_Bool MaybeBase )
 {
     SearchFadeSplitWin aSearch( nAlign );
 
@@ -654,13 +656,13 @@ Window* StatementList::GetMouseWin()
     return NULL;
 }
 
-Window* StatementList::GetFocus( WindowType nRT, BOOL MaybeBase )
+Window* StatementList::GetFocus( WindowType nRT, sal_Bool MaybeBase )
 {
 
     if ( nRT == WINDOW_TABCONTROL )
     {
         Window *pResult = GetActive( WINDOW_TABDIALOG, MaybeBase);
-        for( USHORT i = 0 ; pResult && i < pResult->GetChildCount(); i++ )
+        for( sal_uInt16 i = 0 ; pResult && i < pResult->GetChildCount(); i++ )
             if ( pResult->GetChild(i)->GetType() == nRT )
                 return pResult->GetChild(i);
     }
@@ -668,7 +670,7 @@ Window* StatementList::GetFocus( WindowType nRT, BOOL MaybeBase )
     return NULL;
 }
 
-Window* StatementList::GetAnyActive( BOOL MaybeBase )
+Window* StatementList::GetAnyActive( sal_Bool MaybeBase )
 {
     Window *pControl;
 
@@ -757,7 +759,7 @@ Window* StatementList::GetFirstDocFrame()
     return pFirstDocFrame;
 }
 
-BOOL StatementList::IsFirstDocFrame( Window* pWin )
+sal_Bool StatementList::IsFirstDocFrame( Window* pWin )
 {
     return pWin && ( pWin == GetFirstDocFrame() || ( GetFirstDocFrame() && pWin == GetFirstDocFrame()->GetWindow( WINDOW_CLIENT ) ) ) && ( GetFirstDocFrame() && IsDocFrame( GetFirstDocFrame() ) );
 }
@@ -766,7 +768,7 @@ MenuBar* StatementList::GetDocFrameMenuBar( Window* pWin )
 {
     if ( pWin && pWin->IsVisible() && pWin->GetType() == WINDOW_BORDERWINDOW )
     {
-        USHORT nCount;
+        sal_uInt16 nCount;
         for ( nCount = 0 ; nCount < pWin->GetChildCount() ; nCount++ )
         {
             if ( pWin->GetChild( nCount )->GetType() == WINDOW_WORKWINDOW )
@@ -777,35 +779,35 @@ MenuBar* StatementList::GetDocFrameMenuBar( Window* pWin )
 }
 
 // a Doc Frame is a Document or the Backing Window
-BOOL StatementList::IsDocFrame( Window* pWin )
+sal_Bool StatementList::IsDocFrame( Window* pWin )
 {
     if ( pWin && pWin->IsVisible() && pWin->GetType() == WINDOW_BORDERWINDOW )
     {
-        USHORT nCount;
-        BOOL bHasWorkWindow = FALSE;
-        BOOL bHasMenuBar = FALSE;
+        sal_uInt16 nCount;
+        sal_Bool bHasWorkWindow = sal_False;
+        sal_Bool bHasMenuBar = sal_False;
         // #91724# it is now necessary to sort out the IME WIndow in Solaris as well.
         // so now we check for existence of WINDOW_WORKWINDOW and newly for
         // WINDOW_MENUBARWINDOW which contains the Menu and the close/min/max buttons
         for ( nCount = 0 ; nCount < pWin->GetChildCount() ; nCount++ )
         {
             if ( pWin->GetChild( nCount )->GetType() == WINDOW_WORKWINDOW )
-                bHasWorkWindow = TRUE;
+                bHasWorkWindow = sal_True;
             if ( pWin->GetChild( nCount )->GetType() == WINDOW_MENUBARWINDOW )
-                bHasMenuBar = TRUE;
+                bHasMenuBar = sal_True;
         }
         return bHasWorkWindow && bHasMenuBar;
     }
-    return FALSE;
+    return sal_False;
 }
 
 // a Doc Win is a real document (not the Backing Window)
-BOOL StatementList::IsDocWin( Window* pWin )
+sal_Bool StatementList::IsDocWin( Window* pWin )
 {
     if ( pWin && IsDocFrame( pWin ) )
     {
         if ( GetDocFrameCount() != 1 )
-            return TRUE;
+            return sal_True;
         else
         {
             // check for the close button to see if we are the last one or only the backing Window
@@ -813,28 +815,28 @@ BOOL StatementList::IsDocWin( Window* pWin )
                 return GetDocFrameMenuBar( pWin )->HasCloser();
         }
     }
-    return FALSE;
+    return sal_False;
 }
 
-BOOL StatementList::IsIMEWin( Window* pWin )    // Input Window for CJK under Solaris
+sal_Bool StatementList::IsIMEWin( Window* pWin )    // Input Window for CJK under Solaris
 {
     if ( pWin && pWin->IsVisible() && pWin->GetType() == WINDOW_BORDERWINDOW )
     {
-        USHORT nCount;
-        BOOL bHasWorkWindow = FALSE;
-        BOOL bHasWindow = FALSE;
+        sal_uInt16 nCount;
+        sal_Bool bHasWorkWindow = sal_False;
+        sal_Bool bHasWindow = sal_False;
         // #91724# it is now necessary to sort out the IME WIndow in Solaris as well.
         // so now we check for existence of WINDOW_WORKWINDOW and newly for
         // WINDOW_WINDOW which contains the Menu and the close/min/max buttons
         for ( nCount = 0 ; nCount < pWin->GetChildCount() ; nCount++ )
             if ( pWin->GetChild( nCount )->GetType() == WINDOW_WORKWINDOW )
-                bHasWorkWindow = TRUE;
+                bHasWorkWindow = sal_True;
         for ( nCount = 0 ; nCount < pWin->GetChildCount() ; nCount++ )
             if ( pWin->GetChild( nCount )->GetType() == WINDOW_WINDOW )
-                bHasWindow = TRUE;
+                bHasWindow = sal_True;
         return bHasWorkWindow && !bHasWindow;
     }
-    return FALSE;
+    return sal_False;
 }
 
 UniString StatementList::Tree(Window *pBase, int Indent)
@@ -948,7 +950,7 @@ String StatementList::ClientTree(Window *pBase, int Indent)
 
     WRITE(sIndent);
     WRITEc("UId : ");
-    WRITE(UIdString(pBase->GetSmartUniqueOrHelpId()));
+    WRITE(Id2Str(pBase->GetUniqueOrHelpId()));
     WRITEc(":0x");
     WRITE(
         String::CreateFromInt64(
@@ -982,7 +984,7 @@ String StatementList::ClientTree(Window *pBase, int Indent)
     WRITEc("\n");
 
     aReturn.ConvertLineEnd();
-    USHORT i;
+    sal_uInt16 i;
     for (i = 0 ; i < pBase->GetChildCount() ; i++)
     {
         aReturn += ClientTree(pBase->GetChild(i),Indent+1);
@@ -991,7 +993,7 @@ String StatementList::ClientTree(Window *pBase, int Indent)
 }
 
 
-BOOL StatementList::CheckWindowWait()
+sal_Bool StatementList::CheckWindowWait()
 {
     static Time StartTime = Time(0L);	// Abbruch wenn Fenster absolut nicht schliesst.
     if ( StartTime == Time(0L) )
@@ -1005,7 +1007,7 @@ BOOL StatementList::CheckWindowWait()
         if ( WinPtrValid(pWindowWaitPointer) && IS_WINP_CLOSING(pWindowWaitPointer) )
         {
 #if OSL_DEBUG_LEVEL > 1
-            m_pDbgWin->AddText( aWindowWaitUId.GetText().AppendAscii(" Still Open. RType=") );
+            m_pDbgWin->AddText( Id2Str(aWindowWaitUId).AppendAscii(" Still Open. RType=") );
             m_pDbgWin->AddText( String::CreateFromInt32( pWindowWaitPointer->GetType() ).AppendAscii("\n") );
 #endif
 
@@ -1015,47 +1017,47 @@ BOOL StatementList::CheckWindowWait()
 #if OSL_DEBUG_LEVEL > 1
                 m_pDbgWin->AddText( "Close timed out. Going on!! " );
 #endif
-                pWindowWaitPointer->SetSmartHelpId(aWindowWaitOldHelpId, SMART_SET_ALL);
-                pWindowWaitPointer->SetSmartUniqueId(aWindowWaitOldUniqueId, SMART_SET_ALL);
+                pWindowWaitPointer->SetHelpId(aWindowWaitOldHelpId);
+                pWindowWaitPointer->SetUniqueId(aWindowWaitOldUniqueId);
 
-                aWindowWaitUId = SmartId();
+                aWindowWaitUId = rtl::OString();
                 pWindowWaitPointer = NULL;
                 StartTime = Time(0L);
-                return TRUE;
+                return sal_True;
             }
 
-            return FALSE;
+            return sal_False;
         }
         pWindowWaitPointer = NULL;
-        aWindowWaitUId = SmartId();
+        aWindowWaitUId = rtl::OString();
 #if OSL_DEBUG_LEVEL > 1
         m_pDbgWin->AddText( "Closed, Going on.\n" );
 #endif
     }
     StartTime = Time(0L);
-    return TRUE;
+    return sal_True;
 }
 
 void StatementList::ReportError(String aMessage)
 {
-    ReportError ( SmartId(), aMessage );
+    ReportError ( rtl::OString(), aMessage );
 }
 
-void StatementList::ReportError(SmartId aUId, String aMessage)
+void StatementList::ReportError(rtl::OString aUId, String aMessage)
 {
     pRet->GenError ( aUId, aMessage );
-    IsError = TRUE;
+    IsError = sal_True;
 }
 
-void StatementList::ReportError(String aMessage, ULONG nWhatever)
+void StatementList::ReportError(String aMessage, sal_uLong nWhatever)
 {
     ReportError ( aMessage.AppendAscii(" ").Append(UniString::CreateFromInt32(nWhatever)));
 }
 
-void StatementList::DirectLog( ULONG nType, String aMessage )
+void StatementList::DirectLog( sal_uLong nType, String aMessage )
 {
     if ( pRet )
-        pRet->GenReturn( RET_DirectLoging, SmartId(nType), aMessage );
+        pRet->GenReturn( RET_DirectLoging, (sal_uInt16) nType, aMessage );
 }
 
 
@@ -1069,15 +1071,15 @@ void StatementList::DirectLog( ULONG nType, String aMessage )
     }                                                               \
 }
 
-void ImplKeyInput( Window* pWin, KeyEvent &aKEvnt, BOOL bForceDirect )
+void ImplKeyInput( Window* pWin, KeyEvent &aKEvnt, sal_Bool bForceDirect )
 {
 
     if ( StatementList::bUsePostEvents && !bForceDirect )
     {
         if ( StatementList::WinPtrValid( pWin ) )
         {
-            ULONG nID1;
-            ULONG nID2;
+            sal_uLong nID1;
+            sal_uLong nID2;
             nID1 = Application::PostKeyEvent( VCLEVENT_WINDOW_KEYINPUT, pWin, &aKEvnt );
             nID2 = Application::PostKeyEvent( VCLEVENT_WINDOW_KEYUP, pWin, &aKEvnt );
             // wait after posting both events so deleting pWin will remove the second event also
@@ -1101,7 +1103,7 @@ void ImplKeyInput( Window* pWin, KeyEvent &aKEvnt, BOOL bForceDirect )
                     Size aSize = pWin->GetOutputSize();
                     aPos = Point( aSize.getWidth()/2, aSize.getHeight()/2 );
 
-                    CommandEvent aEvent( aPos, COMMAND_CONTEXTMENU, FALSE );
+                    CommandEvent aEvent( aPos, COMMAND_CONTEXTMENU, sal_False );
                     ImplCommand( pWin, aEvent );
                 }
             }
@@ -1111,13 +1113,13 @@ void ImplKeyInput( Window* pWin, KeyEvent &aKEvnt, BOOL bForceDirect )
     }
 };
 
-void ImplMouseMove( Window* pWin, MouseEvent &aMEvnt, BOOL bForceDirect )
+void ImplMouseMove( Window* pWin, MouseEvent &aMEvnt, sal_Bool bForceDirect )
 {
     if ( StatementList::bUsePostEvents && !bForceDirect )
     {
         if ( StatementList::WinPtrValid( pWin ) )
         {
-            ULONG nID;
+            sal_uLong nID;
             nID = Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEMOVE, pWin, &aMEvnt );
             ImplEventWait( nID );
         }
@@ -1134,13 +1136,13 @@ void ImplMouseMove( Window* pWin, MouseEvent &aMEvnt, BOOL bForceDirect )
     }
 };
 
-void ImplMouseButtonDown( Window* pWin, MouseEvent &aMEvnt, BOOL bForceDirect )
+void ImplMouseButtonDown( Window* pWin, MouseEvent &aMEvnt, sal_Bool bForceDirect )
 {
     if ( StatementList::bUsePostEvents && !bForceDirect )
     {
         if ( StatementList::WinPtrValid( pWin ) )
         {
-            ULONG nID;
+            sal_uLong nID;
             nID = Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEBUTTONDOWN, pWin, &aMEvnt );
             ImplEventWait( nID );
         }
@@ -1151,13 +1153,13 @@ void ImplMouseButtonDown( Window* pWin, MouseEvent &aMEvnt, BOOL bForceDirect )
     }
 };
 
-void ImplMouseButtonUp( Window* pWin, MouseEvent &aMEvnt, BOOL bForceDirect )
+void ImplMouseButtonUp( Window* pWin, MouseEvent &aMEvnt, sal_Bool bForceDirect )
 {
     if ( StatementList::bUsePostEvents && !bForceDirect )
     {
         if ( StatementList::WinPtrValid( pWin ) )
         {
-            ULONG nID;
+            sal_uLong nID;
             nID = Application::PostMouseEvent( VCLEVENT_WINDOW_MOUSEBUTTONUP, pWin, &aMEvnt );
             ImplEventWait( nID );
         }
@@ -1166,7 +1168,7 @@ void ImplMouseButtonUp( Window* pWin, MouseEvent &aMEvnt, BOOL bForceDirect )
     {
             if ( pWin->IsTracking() )
         {
-            // siehe #64693 die Position ist für Toolboxen relevant
+            // siehe #64693 die Position ist f�r Toolboxen relevant
             // #60020 Jetzt hoffentlich kein GPF mehr
             // Zuerst Tracking beenden ohne Event
             pWin->EndTracking( ENDTRACK_DONTCALLHDL );
@@ -1179,7 +1181,7 @@ void ImplMouseButtonUp( Window* pWin, MouseEvent &aMEvnt, BOOL bForceDirect )
     }
 };
 
-void ImplEventWait( ULONG nID )
+void ImplEventWait( sal_uLong nID )
 {
     while ( !Application::IsProcessedMouseOrKeyEvent( nID ) )
         Application::Yield();
diff --git a/automation/source/server/statemnt.cxx b/automation/source/server/statemnt.cxx
index 58b1afc57..ef91a0177 100644
--- a/automation/source/server/statemnt.cxx
+++ b/automation/source/server/statemnt.cxx
@@ -35,6 +35,7 @@
 #include <comphelper/processfactory.hxx>
 #include <comphelper/uieventslogger.hxx>
 
+#include <tools/wintypes.hxx>
 #include <vcl/dialog.hxx>
 #include <vcl/button.hxx>
 #include <vcl/menubtn.hxx>
@@ -59,10 +60,10 @@
 #include <vcl/fixed.hxx>
 #include <vcl/wrkwin.hxx>
 #include <osl/diagnose.h>
-#include <vcl/wintypes.hxx>
 #include <svtools/valueset.hxx>
 #include <svtools/roadmap.hxx>
 #include <svtools/table/tablecontrol.hxx>
+#include <svtools/table/tablecontrolinterface.hxx>
 #include <svl/poolitem.hxx>
 #include <svtools/extensionlistbox.hxx>
 // Hat keinen Includeschutz
@@ -117,11 +118,11 @@ SV_DECL_REF(SbxValue)
 SV_IMPL_REF(SbxValue)
 
 CommunicationLink *StatementFlow::pCommLink = NULL;
-BOOL StatementFlow::bUseIPC = TRUE;
-BOOL StatementFlow::bSending = FALSE;
+sal_Bool StatementFlow::bUseIPC = sal_True;
+sal_Bool StatementFlow::bSending = sal_False;
 ImplRemoteControl *StatementFlow::pRemoteControl = NULL;
 
-USHORT StatementCommand::nDirPos = 0;
+sal_uInt16 StatementCommand::nDirPos = 0;
 Dir *StatementCommand::pDir = NULL;
 pfunc_osl_printDebugMessage StatementCommand::pOriginal_osl_DebugMessageFunc = NULL;
 
@@ -131,31 +132,31 @@ pfunc_osl_printDebugMessage StatementCommand::pOriginal_osl_DebugMessageFunc = N
 
 #define SET_WINP_CLOSING(pWin) \
     pWindowWaitPointer = pWin; \
-    aWindowWaitUId = pControl->GetSmartUniqueOrHelpId(); \
-    aWindowWaitOldHelpId = pWin->GetSmartHelpId(); \
-    aWindowWaitOldUniqueId = pWin->GetSmartUniqueId(); \
-    pWin->SetSmartHelpId( SmartId(4321) ); \
-    pWin->SetSmartUniqueId( SmartId(1234) );
+    aWindowWaitUId = pControl->GetUniqueOrHelpId(); \
+    aWindowWaitOldHelpId = pWin->GetHelpId(); \
+    aWindowWaitOldUniqueId = pWin->GetUniqueId(); \
+    pWin->SetHelpId( rtl::OString("TT_Win_is_closing_HID") ); \
+    pWin->SetUniqueId( rtl::OString("TT_Win_is_closing_UID") );
 
 
-StatementFlow::StatementFlow( StatementList *pAfterThis, USHORT nArtP )
+StatementFlow::StatementFlow( StatementList *pAfterThis, sal_uInt16 nArtP )
 : nArt(nArtP)
 , nParams(0)
 , nSNr1(0)
 , nLNr1(0)
 , aString1()
-, bBool1(FALSE)
+, bBool1(sal_False)
 {
     QueStatement( pAfterThis );
 }
 
-StatementFlow::StatementFlow( ULONG nServiceId, SCmdStream *pCmdIn, ImplRemoteControl *pRC )
+StatementFlow::StatementFlow( sal_uLong nServiceId, SCmdStream *pCmdIn, ImplRemoteControl *pRC )
 : nArt(0)
 , nParams(0)
 , nSNr1(0)
 , nLNr1(0)
 , aString1()
-, bBool1(FALSE)
+, bBool1(sal_False)
 {
     QueStatement( NULL );
     bUseIPC = (nServiceId == SI_IPCCommandBlock);
@@ -190,10 +191,10 @@ void StatementFlow::SendViaSocket()
         OSL_FAIL("SendViaSocket called recursively. Aborted!!!");
         return;
     }
-    bSending = TRUE;
+    bSending = sal_True;
     if ( pCommLink )
     {
-        if ( !pCommLink->TransferDataStream( pRet->GetStream() ) )	// tritt ein Fehler auf, so wird sofort gelöscht ...
+        if ( !pCommLink->TransferDataStream( pRet->GetStream() ) )	// tritt ein Fehler auf, so wird sofort gel�scht ...
             pCommLink = NULL;
     }
     else
@@ -203,11 +204,11 @@ void StatementFlow::SendViaSocket()
     }
 
     pRet->Reset();
-    bSending = FALSE;
-    IsError = FALSE;
+    bSending = sal_False;
+    IsError = sal_False;
 }
 
-BOOL StatementFlow::Execute()
+sal_Bool StatementFlow::Execute()
 {
 #if OSL_DEBUG_LEVEL > 1
     m_pDbgWin->AddText( "Executing Flow: " );
@@ -221,16 +222,16 @@ BOOL StatementFlow::Execute()
 
             if ( !bUseIPC )
             {
-                // bBool1 wurde im CTOR auf FALSE initialisiert
+                // bBool1 wurde im CTOR auf sal_False initialisiert
                 if ( !bBool1 )	// also erster Durchlauf
                 {
                     pRemoteControl->pRetStream = pRet->GetStream();
-                    bBool1 = TRUE;	// wurde im CTOR auf FALSE initialisiert
+                    bBool1 = sal_True;	// wurde im CTOR auf sal_False initialisiert
                     nRetryCount = nRetryCount * 4;
                 }
                 if ( pRemoteControl->pRetStream && (nRetryCount--) )	// also solange nicht abgeholt
                 {
-                    return FALSE;	// Bitte einmal vom Callstack runter
+                    return sal_False;	// Bitte einmal vom Callstack runter
                 }
             }
 
@@ -245,7 +246,7 @@ BOOL StatementFlow::Execute()
         if ( !bUseIPC )
         {	// wird oben abgehandelt
             pRet->Reset();
-            IsError = FALSE;
+            IsError = sal_False;
         }
         else
             SendViaSocket();
@@ -268,37 +269,14 @@ BOOL StatementFlow::Execute()
     }
 
     delete this;
-    return TRUE;
+    return sal_True;
 }
 
 
 // neue Hilfsfunktion, die stetig erweitert werden muss
-static short ImpGetRType( Window *pWin, SmartId aUId )
+static short ImpGetRType( Window *pWin )
 {
-    ULONG nUId = aUId.GetNum(); // GetNum() is always zero if no num is defined
-    // GGGg gggg::gggg gggg::ggLL LLLl::llll llll
-    DBG_ASSERT( pWin, "missing Parameter" );
-    short nRT;
-    if( (nUId & 0xE0000000) == 0 ) // keine auto ID
-        nRT = C_NoType;
-    else {
-        if( (nUId & 0x1FF) == 0 ) // globale Resource GH: soweit ich das verstanden habe 1FF
-            nRT = (short)(C_TabPage - 1 + (nUId >> 29));
-        else
-            nRT = (short)((nUId & 0x00003E00) >> 9);
-        if ( nRT == C_TabPage ) // wegen TabDialog.UId = TabPage.UId
-            nRT = C_NoType;
-        else
-        {
-#ifndef DBG_UTIL
-            return nRT;
-#endif
-        }
-    }
-
-#ifdef DBG_UTIL
-    short n = nRT;
-#endif
+    short nRT = C_NoType;
     WindowType eRT = pWin->GetType();
     switch( eRT ) {
         case WINDOW_WINDOW:				nRT = C_Window		      ; break;
@@ -355,15 +333,6 @@ static short ImpGetRType( Window *pWin, SmartId aUId )
 
         case WINDOW_DIALOG:				nRT = C_Dialog;			break;
     }
-#ifdef DBG_UTIL
-    // Die Werte n sind bei den WindowTypen nicht mehr vergeben, werden aber in der AutoID noch verwendet
-    // Sie werden jetzt durch den Typ nRT implementiert.
-    DBG_ASSERT( n == C_NoType || n == nRT
-        || ( n == C_ImageButton && nRT == C_PushButton )
-        || ( n == C_TriStateBox && nRT == C_CheckBox )
-        || ( n == C_ImageRadioButton && nRT == C_RadioButton )
-        , "error in algorithm" );
-#endif
     return nRT;
 }
 
@@ -387,7 +356,7 @@ StatementSlot::StatementSlot( SCmdStream *pCmdIn )
                 {
                     nAnzahl++;
                     pItemArr = new SfxPoolItem*[nAnzahl];
-                    for (USHORT i = 0 ; i+1 < nAnzahl ; i++)
+                    for (sal_uInt16 i = 0 ; i+1 < nAnzahl ; i++)
                         pCmdIn->Read( pItemArr[i] );
                     pItemArr[nAnzahl-1] = NULL;
                 }
@@ -396,7 +365,7 @@ StatementSlot::StatementSlot( SCmdStream *pCmdIn )
                 {
                     aArgs.realloc(nAnzahl);
                     PropertyValue* pArg = aArgs.getArray();
-                    for (USHORT i = 0 ; i < nAnzahl ; i++)
+                    for (sal_uInt16 i = 0 ; i < nAnzahl ; i++)
                         pCmdIn->Read( pArg[i] );
                 }
                 break;
@@ -409,15 +378,15 @@ StatementSlot::StatementSlot()
 : nAnzahl( 0 )
 , pItemArr(NULL)
 , nFunctionId( 0 )
-, bMenuClosed(FALSE)
+, bMenuClosed(sal_False)
 {}
 
-StatementSlot::StatementSlot( ULONG nSlot, SfxPoolItem* pItem )
+StatementSlot::StatementSlot( sal_uLong nSlot, SfxPoolItem* pItem )
 : pItemArr(NULL)
-, bMenuClosed(FALSE)
+, bMenuClosed(sal_False)
 {
     QueStatement( NULL );
-    nFunctionId = USHORT(nSlot);
+    nFunctionId = sal_uInt16(nSlot);
 #if OSL_DEBUG_LEVEL > 1
     m_pDbgWin->AddText( "Reading Slot: " );
     m_pDbgWin->AddText( String::CreateFromInt32( nFunctionId ) );
@@ -440,7 +409,7 @@ StatementSlot::~StatementSlot()
     {
         if ( pItemArr )
         {
-            for (USHORT i = 0 ; i+1 < nAnzahl ; i++)
+            for (sal_uInt16 i = 0 ; i+1 < nAnzahl ; i++)
                 delete pItemArr[i];
             delete[] pItemArr;
         }
@@ -470,7 +439,7 @@ void StatementSlot::AddReferer()
     aArgs.realloc(nAnzahl);
     pArg = aArgs.getArray();
     pArg[nAnzahl-1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SynchronMode" ));
-    pArg[nAnzahl-1].Value <<= sal_Bool( TRUE );
+    pArg[nAnzahl-1].Value <<= sal_Bool( sal_True );
 }
 
 class SlotStatusListener : public cppu::WeakImplHelper1< XStatusListener >
@@ -484,13 +453,13 @@ public:
     virtual void SAL_CALL disposing( const ::com::sun::star::lang::EventObject& Source ) throw (::com::sun::star::uno::RuntimeException);
 
     // local Members
-    BOOL bDisposed;
-    BOOL bEnabled;
+    sal_Bool bDisposed;
+    sal_Bool bEnabled;
 };
 
 SlotStatusListener::SlotStatusListener()
-: bDisposed( FALSE )
-, bEnabled( TRUE )
+: bDisposed( sal_False )
+, bEnabled( sal_True )
 {}
 
 // XStatusListener
@@ -502,10 +471,10 @@ void SAL_CALL SlotStatusListener::statusChanged( const ::com::sun::star::frame::
 // XEventListener
 void SAL_CALL SlotStatusListener::disposing( const ::com::sun::star::lang::EventObject& ) throw (::com::sun::star::uno::RuntimeException)
 {
-    bDisposed = TRUE;
+    bDisposed = sal_True;
 }
 
-BOOL StatementSlot::Execute()
+sal_Bool StatementSlot::Execute()
 {
     if ( IsError )
     {
@@ -517,7 +486,7 @@ BOOL StatementSlot::Execute()
 
         Advance();
         delete this;
-        return TRUE;
+        return sal_True;
     }
 
     InitProfile();
@@ -537,22 +506,22 @@ BOOL StatementSlot::Execute()
         if ( !bMenuClosed )
         {
             pPopup->EndExecute(0);
-            aSubMenuId1 = SmartId();
-            aSubMenuId2 = SmartId();
-            aSubMenuId3 = SmartId();
+            aSubMenuId1 = 0;
+            aSubMenuId2 = 0;
+            aSubMenuId3 = 0;
             pMenuWindow = NULL;
-            bMenuClosed = TRUE;
+            bMenuClosed = sal_True;
 #if OSL_DEBUG_LEVEL > 1
             m_pDbgWin->AddText( "Closed contextmenu\n" );
 #endif
-            return FALSE;
+            return sal_False;
         }
         else if ( nRetryCount-- )
         {
 #if OSL_DEBUG_LEVEL > 1
             m_pDbgWin->AddText( "Waiting for contextmenu to close\n" );
 #endif
-            return FALSE;
+            return sal_False;
         }
         else
             ReportError( GEN_RES_STR0( S_MENU_NOT_CLOSING ) );
@@ -638,9 +607,9 @@ BOOL StatementSlot::Execute()
                             ReportError( GEN_RES_STR0( S_SLOT_IN_EXECUTE ) );
                         else
                         {
-                            bIsSlotInExecute = TRUE;
+                            bIsSlotInExecute = sal_True;
                             xDisp->dispatch( aTargetURL, aArgs );
-                            bIsSlotInExecute = FALSE;
+                            bIsSlotInExecute = sal_False;
                         }
                     }
                     else
@@ -661,12 +630,12 @@ BOOL StatementSlot::Execute()
             {
             case TT_PR_ERR_NODISPATCHER:
                 {
-                    ReportError( SmartId(nFunctionId), GEN_RES_STR0( S_SID_EXECUTE_FAILED_NO_DISPATCHER ) );
+                    ReportError( rtl::OString::valueOf((sal_Int32)nFunctionId), GEN_RES_STR0( S_SID_EXECUTE_FAILED_NO_DISPATCHER ) );
                 }
                 break;
             case TT_PR_ERR_NOEXECUTE:
                 {
-                    ReportError(SmartId(nFunctionId), GEN_RES_STR0( S_SID_EXECUTE_FAILED ) );
+                    ReportError( rtl::OString::valueOf((sal_Int32)nFunctionId), GEN_RES_STR0( S_SID_EXECUTE_FAILED ) );
                 }
                 break;
             }
@@ -675,14 +644,14 @@ BOOL StatementSlot::Execute()
 
 
 /*	Neues Verfahren ab 334!
-    Neue Methode zum einstellen, daß Modale Dialoge immer Asynchron aufgerufen werden
+    Neue Methode zum einstellen, da� Modale Dialoge immer Asynchron aufgerufen werden
     und echter Returnwert, ob Slot geklappt hat
-    und Testen ob Slot überhaupt durch UI aufgerufen werden kann        */
+    und Testen ob Slot �berhaupt durch UI aufgerufen werden kann        */
 
 
     SendProfile( SlotString( nFunctionId ) );
     delete this;
-    return TRUE;
+    return sal_True;
 }
 
 
@@ -701,9 +670,8 @@ StatementUnoSlot::StatementUnoSlot(SCmdStream *pIn)
 }
 
 
-StatementCommand::StatementCommand( StatementList *pAfterThis, USHORT MethodId, USHORT Params, USHORT Nr1 )
+StatementCommand::StatementCommand( StatementList *pAfterThis, sal_uInt16 MethodId, sal_uInt16 Params, sal_uInt16 Nr1 )
 : nMethodId( MethodId )
-, aSmartMethodId()
 , nParams(Params)
 , nNr1(Nr1)
 , nNr2(0)
@@ -712,16 +680,15 @@ StatementCommand::StatementCommand( StatementList *pAfterThis, USHORT MethodId,
 , nLNr1(0)
 , aString1()
 , aString2()
-, bBool1(FALSE)
-, bBool2(FALSE)
+, bBool1(sal_False)
+, bBool2(sal_False)
 {
     QueStatement( pAfterThis );
-    aSmartMethodId = SmartId( nMethodId );
 
 #if OSL_DEBUG_LEVEL > 1
     m_pDbgWin->AddText( "Directly adding Conmmand:" );
     m_pDbgWin->AddText( " Methode: " );
-    m_pDbgWin->AddText( aSmartMethodId.GetText() );
+    m_pDbgWin->AddText( String::CreateFromInt32( nMethodId ) );
     m_pDbgWin->AddText( " Params:" );
     if( nParams & PARAM_USHORT_1 )	{m_pDbgWin->AddText( " n1:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr1 ) );}
     if( nParams & PARAM_USHORT_2 )	{m_pDbgWin->AddText( " n2:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr2 ) );}
@@ -739,7 +706,6 @@ StatementCommand::StatementCommand( StatementList *pAfterThis, USHORT MethodId,
 
 StatementCommand::StatementCommand( SCmdStream *pCmdIn )
 : nMethodId(0)
-, aSmartMethodId()
 , nParams(0)
 , nNr1(0)
 , nNr2(0)
@@ -748,12 +714,11 @@ StatementCommand::StatementCommand( SCmdStream *pCmdIn )
 , nLNr1(0)
 , aString1()
 , aString2()
-, bBool1(FALSE)
-, bBool2(FALSE)
+, bBool1(sal_False)
+, bBool2(sal_False)
 {
     QueStatement( NULL );
     pCmdIn->Read( nMethodId );
-    aSmartMethodId = SmartId( nMethodId );
     pCmdIn->Read( nParams );
 
     if( nParams & PARAM_USHORT_1 )	pCmdIn->Read( nNr1 );
@@ -769,7 +734,7 @@ StatementCommand::StatementCommand( SCmdStream *pCmdIn )
 #if OSL_DEBUG_LEVEL > 1
     m_pDbgWin->AddText( "Reading Conmmand:" );
     m_pDbgWin->AddText( " Methode: " );
-    m_pDbgWin->AddText( aSmartMethodId.GetText() );
+    m_pDbgWin->AddText( String::CreateFromInt32( nMethodId ) );
     m_pDbgWin->AddText( " Params:" );
     if( nParams & PARAM_USHORT_1 )	{m_pDbgWin->AddText( " n1:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr1 ) );}
     if( nParams & PARAM_USHORT_2 )	{m_pDbgWin->AddText( " n2:" );m_pDbgWin->AddText( String::CreateFromInt32( nNr2 ) );}
@@ -788,14 +753,14 @@ StatementCommand::StatementCommand( SCmdStream *pCmdIn )
         #if OSL_DEBUG_LEVEL > 1
         m_pDbgWin->AddText( "*Deleting all Commands:\n" );
         #endif
-        bReadingCommands = FALSE;
-        while ( StatementList::pFirst != this ) // Alles Löschen außer mich selbst
+        bReadingCommands = sal_False;
+        while ( StatementList::pFirst != this ) // Alles L�schen au�er mich selbst
         {
             StatementList *pDeQue = StatementList::pFirst;
             pDeQue->Advance();
             delete pDeQue;
         }
-        bReadingCommands = TRUE;
+        bReadingCommands = sal_True;
         #if OSL_DEBUG_LEVEL > 1
         m_pDbgWin->AddText( "*Done deleting all Commands:\n" );
         #endif
@@ -803,14 +768,14 @@ StatementCommand::StatementCommand( SCmdStream *pCmdIn )
 
 }
 
-void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst )
+void StatementCommand::WriteControlData( Window *pBase, sal_uLong nConf, sal_Bool bFirst )
 {
 
     if ( IsDialog(pBase) && !bFirst )
         return;
 
     if ( bFirst )
-        pRet->GenReturn ( RET_WinInfo, SmartId(), (comm_ULONG)nConf | DH_MODE_DATA_VALID, UniString(), TRUE );
+        pRet->GenReturn ( RET_WinInfo, rtl::OString(), (comm_ULONG)nConf | DH_MODE_DATA_VALID, UniString(), sal_True );
 
     if ( bFirst )
     {
@@ -819,9 +784,9 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst
             pBase = pBase->GetParent();
     }
 
-    {	// Klammerung, so daß der String nicht während der Rekursion bestehen bleibt
+    {	// Klammerung, so da� der String nicht w�hrend der Rekursion bestehen bleibt
         String aName;
-        BOOL bSkip = FALSE;
+        sal_Bool bSkip = sal_False;
 
         switch ( pBase->GetType() )
         {
@@ -887,8 +852,9 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst
                 break;
 
             default:
-                if ( pBase->GetSmartUniqueOrHelpId().Equals( SmartId() ) && !( nConf & DH_MODE_ALLWIN ) )
-                    bSkip = TRUE;
+                if ( ( pBase->GetUniqueOrHelpId().getLength() == 0 ) && !( nConf & DH_MODE_ALLWIN ) )
+                    bSkip = sal_True;
+                break;
         }
 
         if ( !bSkip )
@@ -918,19 +884,15 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst
                     aTypeSuffix.AppendAscii( "/Unknown", 8 );
             }
 
-            SmartId aId = pBase->GetSmartUniqueOrHelpId();
-            if ( aId.HasString() || ( nConf & DH_MODE_ALLWIN ) )
-                pRet->GenReturn ( RET_WinInfo, SmartId( aId.GetStr() ), (comm_ULONG)pBase->GetType(),
-                    TypeString(pBase->GetType()).Append(aTypeSuffix).AppendAscii(": ").Append(aName), FALSE );
-            if ( !aId.HasString() || ( nConf & DH_MODE_ALLWIN ) )
-                pRet->GenReturn ( RET_WinInfo, SmartId( aId.GetNum() ), (comm_ULONG)pBase->GetType(),
-                    TypeString(pBase->GetType()).Append(aTypeSuffix).AppendAscii(": ").Append(aName), FALSE );
+            rtl::OString aId = pBase->GetUniqueOrHelpId();
+            pRet->GenReturn ( RET_WinInfo, aId, (comm_ULONG)pBase->GetType(),
+                TypeString(pBase->GetType()).Append(aTypeSuffix).AppendAscii(": ").Append(aName), sal_False );
 
 
             if ( pBase->GetType() == WINDOW_TOOLBOX )	// Buttons und Controls auf Toolboxen.
             {
                 ToolBox *pTB = ((ToolBox*)pBase);
-                USHORT i;
+                sal_uInt16 i;
                 for ( i = 0; i < pTB->GetItemCount() ; i++ )
                 {
                     aName = String();
@@ -944,25 +906,25 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst
                     if ( pTB->GetItemType( i ) == TOOLBOXITEM_BUTTON && ( !pItemWin || !pItemWin->IsVisible() ) )
                     {
                         if ( pTB->GetItemCommand(pTB->GetItemId( i )).Len() || ( nConf & DH_MODE_ALLWIN ) )
-                            pRet->GenReturn ( RET_WinInfo, SmartId( pTB->GetItemCommand(pTB->GetItemId( i )) ), (comm_ULONG)WINDOW_BUTTON,
-                                TypeString(WINDOW_BUTTON).AppendAscii(": ").Append(aName), FALSE );
+                            pRet->GenReturn ( RET_WinInfo, Str2Id(pTB->GetItemCommand(pTB->GetItemId( i ))), (comm_ULONG)WINDOW_BUTTON,
+                                TypeString(WINDOW_BUTTON).AppendAscii(": ").Append(aName), sal_False );
                         if ( !pTB->GetItemCommand(pTB->GetItemId( i )).Len() || ( nConf & DH_MODE_ALLWIN ) )
-                            pRet->GenReturn ( RET_WinInfo, SmartId( pTB->GetHelpId(pTB->GetItemId( i )) ), (comm_ULONG)WINDOW_BUTTON,
-                                TypeString(WINDOW_BUTTON).AppendAscii(": ").Append(aName), FALSE );
+                            pRet->GenReturn ( RET_WinInfo, pTB->GetHelpId(pTB->GetItemId( i )), (comm_ULONG)WINDOW_BUTTON,
+                                TypeString(WINDOW_BUTTON).AppendAscii(": ").Append(aName), sal_False );
                     }
                     else
                     {
                         if ( pItemWin )
                         {
                             if ( pTB->GetItemCommand(pTB->GetItemId( i )).Len() || ( nConf & DH_MODE_ALLWIN ) )
-                                pRet->GenReturn ( RET_WinInfo, SmartId( pTB->GetItemCommand(pTB->GetItemId( i )) ), (comm_ULONG)pItemWin->GetType(),
-                                    TypeString(pItemWin->GetType()).AppendAscii(": ").Append(aName), FALSE );
+                                pRet->GenReturn ( RET_WinInfo, Str2Id(pTB->GetItemCommand(pTB->GetItemId( i ))), (comm_ULONG)pItemWin->GetType(),
+                                    TypeString(pItemWin->GetType()).AppendAscii(": ").Append(aName), sal_False );
                             if ( !pTB->GetItemCommand(pTB->GetItemId( i )).Len() || ( nConf & DH_MODE_ALLWIN ) )
-                                pRet->GenReturn ( RET_WinInfo, SmartId( pTB->GetHelpId(pTB->GetItemId( i )) ), (comm_ULONG)pItemWin->GetType(),
-                                    TypeString(pItemWin->GetType()).AppendAscii(": ").Append(aName), FALSE );
-                            USHORT ii;
+                                pRet->GenReturn ( RET_WinInfo, pTB->GetHelpId(pTB->GetItemId( i )), (comm_ULONG)pItemWin->GetType(),
+                                    TypeString(pItemWin->GetType()).AppendAscii(": ").Append(aName), sal_False );
+                            sal_uInt16 ii;
                             for( ii = 0 ; ii < pItemWin->GetChildCount(); ii++ )
-                                WriteControlData( pItemWin->GetChild(ii), nConf, FALSE );
+                                WriteControlData( pItemWin->GetChild(ii), nConf, sal_False );
                         }
                         else
                         {
@@ -990,11 +952,11 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst
                                     DBG_ERROR1( "Unknown TOOLBOXITEM %i", pTB->GetItemType( i ) );
                                 }
                                 if ( pTB->GetItemCommand(pTB->GetItemId( i )).Len() || ( nConf & DH_MODE_ALLWIN ) )
-                                    pRet->GenReturn ( RET_WinInfo, SmartId( pTB->GetItemCommand(pTB->GetItemId( i )) ), (comm_ULONG)WINDOW_BASE,
-                                        aToolBoxItemType.AppendAscii(": ").Append(aName), FALSE );
+                                    pRet->GenReturn ( RET_WinInfo, Str2Id( pTB->GetItemCommand(pTB->GetItemId( i )) ), (comm_ULONG)WINDOW_BASE,
+                                        aToolBoxItemType.AppendAscii(": ").Append(aName), sal_False );
                                 if ( !pTB->GetItemCommand(pTB->GetItemId( i )).Len() || ( nConf & DH_MODE_ALLWIN ) )
-                                    pRet->GenReturn ( RET_WinInfo, SmartId( pTB->GetHelpId(pTB->GetItemId( i )) ), (comm_ULONG)WINDOW_BASE,
-                                        aToolBoxItemType.AppendAscii(": ").Append(aName), FALSE );
+                                    pRet->GenReturn ( RET_WinInfo, pTB->GetHelpId(pTB->GetItemId( i )), (comm_ULONG)WINDOW_BASE,
+                                        aToolBoxItemType.AppendAscii(": ").Append(aName), sal_False );
                             }
                         }
                     }
@@ -1012,41 +974,41 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst
                 || pBase->GetType() == WINDOW_QUERYBOX )
             {
                 ButtonDialog *pBD = ((ButtonDialog*)pBase);
-                USHORT i;
+                sal_uInt16 i;
                 for ( i = 0; i < pBD->GetButtonCount() ; i++ )
                 {
                     aName = String();
                     if ( aName.Len() == 0 )
                         aName = pBD->GetPushButton( pBD->GetButtonId(i) )->GetText();
-                    String aID;
+                    ByteString aID;
                     switch ( pBD->GetButtonId(i) )
                     {
                         case BUTTONID_OK:
-                            aID.AssignAscii("Ok");
+                            aID.Assign("Ok");
                             break;
                         case BUTTONID_CANCEL:
-                            aID.AssignAscii("Cancel");
+                            aID.Assign("Cancel");
                             break;
                         case BUTTONID_YES:
-                            aID.AssignAscii("Yes");
+                            aID.Assign("Yes");
                             break;
                         case BUTTONID_NO:
-                            aID.AssignAscii("No");
+                            aID.Assign("No");
                             break;
                         case BUTTONID_RETRY:
-                            aID.AssignAscii("Retry");
+                            aID.Assign("Retry");
                             break;
                         case BUTTONID_HELP:
-                            aID.AssignAscii("Help");
+                            aID.Assign("Help");
                             break;
                         default:
-                            aID = UniString::CreateFromInt32( pBD->GetButtonId(i) );
+                            aID = ByteString::CreateFromInt32( pBD->GetButtonId(i) );
                             break;
                     }
 
-                    pRet->GenReturn ( RET_WinInfo, SmartId( aID ), (comm_ULONG)pBD->GetPushButton( pBD->GetButtonId(i) )->GetType(),	// So daß der Text angezeigt wird!
+                    pRet->GenReturn ( RET_WinInfo, aID, (comm_ULONG)pBD->GetPushButton( pBD->GetButtonId(i) )->GetType(),	// So da� der Text angezeigt wird!
                         TypeString(pBD->GetPushButton( pBD->GetButtonId(i) )->GetType()).AppendAscii(": ").Append(aName)
-                        .AppendAscii(" ButtonId = ").Append(aID), FALSE );
+                        .AppendAscii(" ButtonId = ").AppendAscii( aID.GetBuffer() ), sal_False );
                 }
 
                 return;	// ButtonDialog ist hier schon komplett abgehandelt.
@@ -1057,10 +1019,10 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst
 
             if ( pMenu )	// Menus
             {
-                USHORT i;
+                sal_uInt16 i;
                 for ( i = 0; i < pMenu->GetItemCount() ; i++ )
                 {
-                    USHORT nID = pMenu->GetItemId( i );
+                    sal_uInt16 nID = pMenu->GetItemId( i );
                     
                     aName = String();
                     if ( aName.Len() == 0 )
@@ -1093,11 +1055,11 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst
                             DBG_ERROR1( "Unknown MENUITEM %i", pMenu->GetItemType( i ) );
                         }
                         if ( pMenu->GetItemCommand(nID).Len() || ( nConf & DH_MODE_ALLWIN ) )
-                            pRet->GenReturn ( RET_WinInfo, SmartId( pMenu->GetItemCommand(nID) ), (comm_ULONG)0,
-                                aMenuItemType.AppendAscii(": ").Append(aName), FALSE );
+                            pRet->GenReturn ( RET_WinInfo, Str2Id( pMenu->GetItemCommand(nID) ), (comm_ULONG)0,
+                                aMenuItemType.AppendAscii(": ").Append(aName), sal_False );
                         if ( !pMenu->GetItemCommand(nID).Len() || ( nConf & DH_MODE_ALLWIN ) )
-                            pRet->GenReturn ( RET_WinInfo, SmartId( nID ), (comm_ULONG)0,
-                                aMenuItemType.AppendAscii(": ").Append(aName), FALSE );
+                            pRet->GenReturn ( RET_WinInfo, rtl::OString::valueOf( (sal_Int32)nID ), (comm_ULONG)0,
+                                aMenuItemType.AppendAscii(": ").Append(aName), sal_False );
                     }
                 }
 
@@ -1106,8 +1068,8 @@ void StatementCommand::WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst
         }
     }
 
-    for( USHORT i = 0 ; i < pBase->GetChildCount(); i++ )
-        WriteControlData( pBase->GetChild(i), nConf, FALSE );
+    for( sal_uInt16 i = 0 ; i < pBase->GetChildCount(); i++ )
+        WriteControlData( pBase->GetChild(i), nConf, sal_False );
 }
 
 class SysWinContainer : public WorkWindow
@@ -1128,7 +1090,7 @@ SysWinContainer::SysWinContainer( ToolBox *pClient )
 {
     pDock = new DockingWindow( this );
     pClientWin->SetParent( pDock );
-    pClientWin->SetFloatingMode( FALSE );
+    pClientWin->SetFloatingMode( sal_False );
     SetText( pClient->GetText() );
     SetPosPixel( Point( 1,40 ) );
     Resize();
@@ -1159,10 +1121,10 @@ void SysWinContainer::Resizing( Size& rSize )
 {
     Size aSize;
     Size aBestSize;
-    USHORT i;
-    BOOL bHasValue = FALSE;
-    ULONG nBestValue = 0;
-    ULONG nThisValue;
+    sal_uInt16 i;
+    sal_Bool bHasValue = sal_False;
+    sal_uLong nBestValue = 0;
+    sal_uLong nThisValue;
     for ( i=1 ; i<=1 ; i++ )
     {
         aSize = pClientWin->CalcWindowSizePixel( i );
@@ -1171,7 +1133,7 @@ void SysWinContainer::Resizing( Size& rSize )
         {
             nBestValue = nThisValue;
             aBestSize = aSize;
-            bHasValue = TRUE;
+            bHasValue = sal_True;
         }
     }
     rSize = aBestSize;
@@ -1182,15 +1144,15 @@ class DisplayHidWin : public ToolBox
 {
     Edit	*pEdit;
     Size	aMinEditSize;
-    USHORT	nLastItemID;
-    BOOL bIsDraging;
-    BOOL bIsPermanentDraging;
-    void SetDraging( BOOL bNewDraging );
+    sal_uInt16	nLastItemID;
+    sal_Bool bIsDraging;
+    sal_Bool bIsPermanentDraging;
+    void SetDraging( sal_Bool bNewDraging );
     Image *pShow, *pShow2;
-    BOOL bConfigChanged;
-    void EnableButtons( ULONG nConf );
+    sal_Bool bConfigChanged;
+    void EnableButtons( sal_uLong nConf );
 
-    ULONG nEventHookID;
+    sal_uLong nEventHookID;
     static long stub_VCLEventHookProc( NotifyEvent& rEvt, void* pData )
     {
         return ((DisplayHidWin*)pData)->VCLEventHook( rEvt );
@@ -1202,9 +1164,9 @@ class DisplayHidWin : public ToolBox
     SysWinContainer *pContainer;
 
     // aborting by pressing shist twice
-    BOOL bOldShift;
+    sal_Bool bOldShift;
     Time aLatest;
-    USHORT nShiftCount;
+    sal_uInt16 nShiftCount;
 
 public:
     DisplayHidWin();
@@ -1217,26 +1179,26 @@ public:
 
     void SetDisplayText( const String &aNewText ){ pEdit->SetText(aNewText); }
     String GetDisplayText() const { return pEdit->GetText(); }
-    BOOL IsDisplayTextModified() const { return pEdit->IsModified(); }
+    sal_Bool IsDisplayTextModified() const { return pEdit->IsModified(); }
     void ClearDisplayTextModified() const { pEdit->ClearModifyFlag(); }
 
-    void SetConfig( ULONG nConf );
-    ULONG GetConfig();
+    void SetConfig( sal_uLong nConf );
+    sal_uLong GetConfig();
 
-    BOOL IsConfigChanged() { return bConfigChanged; }
-    void ConfigSent() { bConfigChanged = FALSE; }
+    sal_Bool IsConfigChanged() { return bConfigChanged; }
+    void ConfigSent() { bConfigChanged = sal_False; }
 
-    BOOL IsSendData() { return GetItemState( TT_SEND_DATA ) == STATE_CHECK; }
+    sal_Bool IsSendData() { return GetItemState( TT_SEND_DATA ) == STATE_CHECK; }
 
-    BOOL IsDraging() { return bIsDraging; }
+    sal_Bool IsDraging() { return bIsDraging; }
 
     Window* LastMouseMoveWin() { return pLastMouseMoveWin; }
 };
 
 DisplayHidWin::DisplayHidWin()
 : ToolBox( StatementList::GetFirstDocFrame(), TTProperties::GetSvtResId(DisplayHidToolBox) )
-, bIsDraging( FALSE )
-, bIsPermanentDraging( FALSE )
+, bIsDraging( sal_False )
+, bIsPermanentDraging( sal_False )
 , pShow( NULL )
 , pShow2( NULL )
 , pLastMouseMoveWin( NULL )
@@ -1265,7 +1227,7 @@ DisplayHidWin::~DisplayHidWin()
     delete pEdit;
 }
 
-void DisplayHidWin::SetDraging( BOOL bNewDraging )
+void DisplayHidWin::SetDraging( sal_Bool bNewDraging )
 {
     if ( !pShow )
         pShow = new Image( GetItemImage( TT_SHOW ) );
@@ -1280,9 +1242,9 @@ void DisplayHidWin::SetDraging( BOOL bNewDraging )
     bIsDraging = bNewDraging;
 }
 
-void DisplayHidWin::EnableButtons( ULONG nConf )
+void DisplayHidWin::EnableButtons( sal_uLong nConf )
 {
-    BOOL bSend = BOOL(nConf & DH_MODE_SEND_DATA);
+    sal_Bool bSend = sal_Bool(nConf & DH_MODE_SEND_DATA);
     EnableItem( TT_ALLWIN, bSend );
     EnableItem( TT_KURZNAME, bSend );
     EnableItem( TT_LANGNAME, bSend );
@@ -1300,7 +1262,7 @@ void DisplayHidWin::Click()
     nLastItemID = GetCurItemId();
     if ( nLastItemID == TT_SHOW )
     {
-        SetDraging( TRUE );
+        SetDraging( sal_True );
     }
     ToolBox::Click();
 }
@@ -1312,8 +1274,8 @@ void DisplayHidWin::Select()
         SetItemState( GetCurItemId(), STATE_CHECK );
         if ( GetCurItemId() == TT_SHOW )
         {
-            bIsPermanentDraging = TRUE;
-            SetDraging( TRUE );
+            bIsPermanentDraging = sal_True;
+            SetDraging( sal_True );
         }
     }
     else
@@ -1321,8 +1283,8 @@ void DisplayHidWin::Select()
         SetItemState( GetCurItemId(), STATE_NOCHECK );
         if ( GetCurItemId() == TT_SHOW )
         {
-            bIsPermanentDraging = FALSE;
-            SetDraging( FALSE );
+            bIsPermanentDraging = sal_False;
+            SetDraging( sal_False );
         }
     }
     if ( GetCurItemId() == TT_SEND_DATA )
@@ -1331,7 +1293,7 @@ void DisplayHidWin::Select()
     }
 }
 
-void DisplayHidWin::SetConfig( ULONG nConf )
+void DisplayHidWin::SetConfig( sal_uLong nConf )
 {
     SetItemState( TT_KURZNAME,  ( nConf & DH_MODE_KURZNAME )  ? STATE_CHECK : STATE_NOCHECK );
     SetItemState( TT_LANGNAME,  ( nConf & DH_MODE_LANGNAME )  ? STATE_CHECK : STATE_NOCHECK );
@@ -1340,9 +1302,9 @@ void DisplayHidWin::SetConfig( ULONG nConf )
     EnableButtons( nConf );
 }
 
-ULONG DisplayHidWin::GetConfig()
+sal_uLong DisplayHidWin::GetConfig()
 {
-    ULONG nConf = 0;
+    sal_uLong nConf = 0;
     if ( GetItemState( TT_KURZNAME ) == STATE_CHECK )
         nConf |= DH_MODE_KURZNAME;
     if ( GetItemState( TT_LANGNAME ) == STATE_CHECK )
@@ -1383,8 +1345,8 @@ long DisplayHidWin::VCLEventHook( NotifyEvent& rEvt )
             nShiftCount++;
             if ( nShiftCount == 4 && aLatest > Time() )
             {
-                bIsPermanentDraging = FALSE;
-                SetDraging( FALSE );
+                bIsPermanentDraging = sal_False;
+                SetDraging( sal_False );
                 SetItemState( TT_SHOW, STATE_NOCHECK );
             }
         }
@@ -1392,23 +1354,23 @@ long DisplayHidWin::VCLEventHook( NotifyEvent& rEvt )
     }
     if ( ( ( EVENT_MOUSEBUTTONUP == rEvt.GetType() && rEvt.GetMouseEvent()->GetButtons() == MOUSE_LEFT) || ( EVENT_MOUSEMOVE == rEvt.GetType() && !rEvt.GetMouseEvent()->GetButtons() ) )
             && IsDraging() && !bIsPermanentDraging )
-        SetDraging( FALSE );
+        SetDraging( sal_False );
     return 0;
 }
 
 
-BOOL StatementCommand::DisplayHID()
+sal_Bool StatementCommand::DisplayHID()
 {
-    // Return TRUE -> reexecute command
+    // Return sal_True -> reexecute command
 
-    if ( !bBool2 )	// Wird auf FALSE initialisiert
+    if ( !bBool2 )	// Wird auf sal_False initialisiert
     {
-        bBool2 = TRUE;				// Wir sind initialisiert.
+        bBool2 = sal_True;				// Wir sind initialisiert.
         GetTTSettings()->pDisplayInstance = this;	// Und haben die Macht (Alle anderen beenden sich)
 
         if ( !(nParams & PARAM_ULONG_1) )
         {
-            if( GetTTSettings()->pDisplayHidWin )	// Nichts verändern
+            if( GetTTSettings()->pDisplayHidWin )	// Nichts ver�ndern
                 nLNr1 = GetTTSettings()->pDisplayHidWin->GetConfig();
             else	// Beim ersten Aufruf wollen wir alles richtig einstellen
                 nLNr1 = DH_MODE_KURZNAME | DH_MODE_LANGNAME;
@@ -1426,7 +1388,7 @@ BOOL StatementCommand::DisplayHID()
     if ( GetTTSettings()->pDisplayInstance && GetTTSettings()->pDisplayInstance != this )
     {
         DBG_WARNING("Mehrere DisplayHID am laufen");
-        return FALSE;		// Noch eine andere Instanz macht das gleiche!
+        return sal_False;		// Noch eine andere Instanz macht das gleiche!
     }
 
     if ( !GetTTSettings()->pDisplayHidWin )
@@ -1444,8 +1406,8 @@ BOOL StatementCommand::DisplayHID()
     }
     else
     {
-        GetTTSettings()->pDisplayHidWin->GetWindow( WINDOW_OVERLAP )->Enable( TRUE, TRUE );
-        GetTTSettings()->pDisplayHidWin->GetWindow( WINDOW_OVERLAP )->EnableInput( TRUE, TRUE );
+        GetTTSettings()->pDisplayHidWin->GetWindow( WINDOW_OVERLAP )->Enable( sal_True, sal_True );
+        GetTTSettings()->pDisplayHidWin->GetWindow( WINDOW_OVERLAP )->EnableInput( sal_True, sal_True );
     }
 
 
@@ -1465,8 +1427,8 @@ BOOL StatementCommand::DisplayHID()
             RasterOp aROp = WinPtr->GetRasterOp();					\
             WinPtr->SetRasterOp( ROP_XOR );							\
             Size aSz = WinPtr->PixelToLogic( WinPtr->GetSizePixel() );\
-            ULONG nMaxCornerRadius = WinPtr->PixelToLogic( Point( 80, 0 ) ).X();\
-            ULONG iCorner = std::max ((ULONG) 8, (ULONG) std::min( nMaxCornerRadius, (ULONG) std::min((ULONG) (aSz.Width() / 6), (ULONG)(aSz.Height() / 6))));\
+            sal_uLong nMaxCornerRadius = WinPtr->PixelToLogic( Point( 80, 0 ) ).X();\
+            sal_uLong iCorner = std::max ((sal_uLong) 8, (sal_uLong) std::min( nMaxCornerRadius, (sal_uLong) std::min((sal_uLong) (aSz.Width() / 6), (sal_uLong)(aSz.Height() / 6))));\
             WinPtr->DrawRect(Rectangle(Point(),aSz), iCorner, iCorner);\
             WinPtr->SetLineColor( aLineColMem );					\
             WinPtr->SetFillColor( aFillColMem );					\
@@ -1508,10 +1470,10 @@ BOOL StatementCommand::DisplayHID()
                 if ( GetTTSettings()->Act )
                 {
                     SET_WIN(GetTTSettings()->Act);
-                    GetTTSettings()->pDisplayHidWin->SetDisplayText(GetTTSettings()->Act->GetSmartUniqueOrHelpId().GetText().AppendAscii(" WinType: ")
+                    GetTTSettings()->pDisplayHidWin->SetDisplayText( Id2Str(GetTTSettings()->Act->GetUniqueOrHelpId()).AppendAscii(" WinType: ")
                         .Append(UniString::CreateFromInt64(GetTTSettings()->Act->GetType())).AppendAscii("  ").Append(GetTTSettings()->Act->GetText()));
-                    if ( GetTTSettings()->Act && !GetTTSettings()->Act->GetSmartUniqueId().Equals( GetTTSettings()->Act->GetSmartHelpId() ) )
-                        GetTTSettings()->pDisplayHidWin->SetText(UniString( TTProperties::GetSvtResId( TT_ALTERNATE_CAPTION ) ).Append(GetTTSettings()->Act->GetSmartHelpId().GetText()));
+                    if ( GetTTSettings()->Act && !GetTTSettings()->Act->GetUniqueId().equals( GetTTSettings()->Act->GetHelpId() ) )
+                        GetTTSettings()->pDisplayHidWin->SetText(UniString( TTProperties::GetSvtResId( TT_ALTERNATE_CAPTION ) ).AppendAscii(GetTTSettings()->Act->GetHelpId().getStr()));
                     else
                         GetTTSettings()->pDisplayHidWin->SetText( GetTTSettings()->aOriginalCaption );
                 }
@@ -1520,9 +1482,10 @@ BOOL StatementCommand::DisplayHID()
             }
             else if ( GetTTSettings()->Act )
             {
-                if ( GetTTSettings()->pDisplayHidWin->IsDisplayTextModified() && GetTTSettings()->pDisplayHidWin->GetDisplayText().Len() > 0 )
+                // allow setting a HelpID manually (just enter the ID in the displayHID Window and terminate it by |
+                if ( GetTTSettings()->pDisplayHidWin->IsDisplayTextModified() && GetTTSettings()->pDisplayHidWin->GetDisplayText().GetTokenCount( '|' ) > 1 )
                 {
-                    GetTTSettings()->Act->SetSmartUniqueId( SmartId( GetTTSettings()->pDisplayHidWin->GetDisplayText().ToInt32() ) );
+                    GetTTSettings()->Act->SetUniqueId( Str2Id( GetTTSettings()->pDisplayHidWin->GetDisplayText().GetToken( '|' ) ) );
                     GetTTSettings()->pDisplayHidWin->ClearDisplayTextModified();
                 }
             }
@@ -1530,7 +1493,7 @@ BOOL StatementCommand::DisplayHID()
             if ( GetTTSettings()->pDisplayHidWin->IsSendData() && GetTTSettings()->Act )
             {
                 if ( !StatementFlow::bSending )
-                {	// Normalerweise syncronisierung über Protokoll. Hier ist das aber asyncron!!!
+                {	// Normalerweise syncronisierung �ber Protokoll. Hier ist das aber asyncron!!!
                     WriteControlData( GetTTSettings()->Act, GetTTSettings()->pDisplayHidWin->GetConfig() );
                     new StatementFlow( this, F_EndCommandBlock );	// Kommando zum Senden erzeugen und in que eintragen
                 }
@@ -1546,7 +1509,7 @@ BOOL StatementCommand::DisplayHID()
         }
 
         if ( pFirst == this )	// Sollte immer so sein, aber besser isses
-            if ( pNext )		// Befehle warten auf Ausführung
+            if ( pNext )		// Befehle warten auf Ausf�hrung
             {					// An Ende neu einsortieren
                 Advance();
                 QueStatement( NULL );
@@ -1587,15 +1550,15 @@ private:
     Window *Old;
     Window *Act;
     Window *pTranslateWin;
-    BOOL bSelecting;
+    sal_Bool bSelecting;
 
-    BOOL bAvailable;
-    BOOL bNext;
+    sal_Bool bAvailable;
+    sal_Bool bNext;
 
-    BOOL TestChangedDataSaved();
+    sal_Bool TestChangedDataSaved();
 
 
-    ULONG nEventHookID;
+    sal_uLong nEventHookID;
     static long stub_VCLEventHookProc( NotifyEvent& rEvt, void* pData )
     {
         return ((TranslateWin*)pData)->VCLEventHook( rEvt );
@@ -1607,11 +1570,11 @@ public:
     TranslateWin();
     ~TranslateWin();
 
-    static String MarkShortcutErrors( Window* pBase, BOOL bMark );
+    static String MarkShortcutErrors( Window* pBase, sal_Bool bMark );
 
-    BOOL IsTranslationAvailable(){ return bAvailable; }
-    BOOL IsNextDialog(){ return bNext; }
-    void ResetNextDialog(){ bNext = FALSE; }
+    sal_Bool IsTranslationAvailable(){ return bAvailable; }
+    sal_Bool IsNextDialog(){ return bNext; }
+    void ResetNextDialog(){ bNext = sal_False; }
 
     Window* GetTranslationWindow(){ return pTranslateWin; }
     String GetOriginalText(){ return FixedTextTT_FT_OLD.GetText(); }
@@ -1635,9 +1598,9 @@ TranslateWin::TranslateWin()
 , Old( NULL )
 , Act( NULL )
 , pTranslateWin( NULL )
-, bSelecting( FALSE )
-, bAvailable( FALSE )
-, bNext( FALSE )
+, bSelecting( sal_False )
+, bAvailable( sal_False )
+, bNext( sal_False )
 {
     FreeResource();
     PushButtonTT_PB_NEXT.SetClickHdl( LINK( this, TranslateWin, DoNext ) );
@@ -1656,7 +1619,7 @@ TranslateWin::~TranslateWin()
     Application::RemoveEventHook( nEventHookID );
 }
 
-BOOL TranslateWin::TestChangedDataSaved()
+sal_Bool TranslateWin::TestChangedDataSaved()
 {
     if ( ( EditTT_E_NEW.GetText().CompareTo( FixedTextTT_FT_OLD.GetText() ) != COMPARE_EQUAL
             || EditTT_E_COMMENT.GetText().Len() )
@@ -1665,7 +1628,7 @@ BOOL TranslateWin::TestChangedDataSaved()
         return MessBox( this, TTProperties::GetSvtResId( TT_DISCARD_CHANGED_DATA ) ).Execute() == RET_YES;
     }
     else
-        return TRUE;
+        return sal_True;
 }
 
 IMPL_LINK( TranslateWin, DoAccept, PushButton*, EMPTYARG )
@@ -1676,7 +1639,7 @@ IMPL_LINK( TranslateWin, DoAccept, PushButton*, EMPTYARG )
     EditTT_E_NEW.Disable();
     EditTT_E_COMMENT.Disable();
     PushButtonTT_PB_ACCEPT.Disable();
-    bAvailable = TRUE;
+    bAvailable = sal_True;
     return 0;
 }
 
@@ -1690,7 +1653,7 @@ IMPL_LINK( TranslateWin, DoNext, PushButton*, EMPTYARG )
         EditTT_E_NEW.Disable();
         EditTT_E_COMMENT.Disable();
         PushButtonTT_PB_ACCEPT.Disable();
-        bNext = TRUE;
+        bNext = sal_True;
     }
     return 0;
 }
@@ -1699,14 +1662,14 @@ IMPL_LINK( TranslateWin, DoSelect, PushButton*, EMPTYARG )
 {
     if ( bSelecting )
     {
-        bSelecting = FALSE;
+        bSelecting = sal_False;
     }
     else
     {
         if ( TestChangedDataSaved() )
         {
             PushButtonTT_PB_RESTORE.Disable();
-            bSelecting = TRUE;
+            bSelecting = sal_True;
         }
     }
     return 0;
@@ -1723,7 +1686,7 @@ IMPL_LINK( TranslateWin, DoRestore, PushButton*, EMPTYARG )
     sTT_E_NEW.SearchAndReplaceAll( CUniString("\\t"), CUniString("\t") );
 
     if ( StatementList::WinPtrValid( pTranslateWin ) && pTranslateWin->GetText().CompareTo( sTT_E_NEW ) == COMPARE_EQUAL )
-    {	// Im ersten schritt nur in der UI zurück
+    {	// Im ersten schritt nur in der UI zur�ck
         pTranslateWin->SetText( sTT_E_OLD );
     }
     else
@@ -1732,7 +1695,7 @@ IMPL_LINK( TranslateWin, DoRestore, PushButton*, EMPTYARG )
         PushButtonTT_PB_RESTORE.Disable();
     }
     if ( StatementList::WinPtrValid( pTranslateWin ) )
-        MarkShortcutErrors( pTranslateWin->GetWindow( WINDOW_OVERLAP ), TRUE );
+        MarkShortcutErrors( pTranslateWin->GetWindow( WINDOW_OVERLAP ), sal_True );
     return 0;
 }
 
@@ -1756,7 +1719,7 @@ IMPL_LINK( TranslateWin, ShowInplace, Timer*, EMPTYARG )
         sTT_E_NEW.SearchAndReplaceAll( CUniString("\\t"), CUniString("\t") );
         pTranslateWin->SetText( sTT_E_NEW );
 
-        MarkShortcutErrors( pTranslateWin->GetWindow( WINDOW_OVERLAP ), TRUE );
+        MarkShortcutErrors( pTranslateWin->GetWindow( WINDOW_OVERLAP ), sal_True );
     }
     return 0;
 }
@@ -1774,7 +1737,7 @@ long TranslateWin::VCLEventHook( NotifyEvent& rEvt )
             if ( Act )
             {
                 Window *pWin = Act;
-                USHORT i;
+                sal_uInt16 i;
                 for ( i = 0 ; i < Act->GetChildCount() ; i++ )
                 {
                     pWin = Act->GetChild(i);
@@ -1832,7 +1795,7 @@ long TranslateWin::VCLEventHook( NotifyEvent& rEvt )
             pTranslateWin = Act;
             if ( pTranslateWin )
             {
-                MarkShortcutErrors( pTranslateWin->GetWindow( WINDOW_OVERLAP ), TRUE );
+                MarkShortcutErrors( pTranslateWin->GetWindow( WINDOW_OVERLAP ), sal_True );
                 // alle CRs quoten (NF)
                 String sTT_E_NEW( pTranslateWin->GetText());
                 sTT_E_NEW.SearchAndReplaceAll( CUniString("\n"), CUniString("\\n") );
@@ -1847,7 +1810,7 @@ long TranslateWin::VCLEventHook( NotifyEvent& rEvt )
                 EditTT_E_COMMENT.Enable();
                 PushButtonTT_PB_ACCEPT.Enable();
             }
-            bSelecting = FALSE;
+            bSelecting = sal_False;
         }
     }
 
@@ -1861,11 +1824,11 @@ long TranslateWin::VCLEventHook( NotifyEvent& rEvt )
 class FindShortcutErrors: public Search
 {
     String aShortcuts,aDoubleShortcuts;
-    USHORT nAction;
+    sal_uInt16 nAction;
 public:
     FindShortcutErrors();
-    virtual BOOL IsWinOK( Window *pWin );
-    void SetAction( USHORT nA );
+    virtual sal_Bool IsWinOK( Window *pWin );
+    void SetAction( sal_uInt16 nA );
     String GetDoubleShortcuts() { return aDoubleShortcuts; }
 };
 
@@ -1875,7 +1838,7 @@ FindShortcutErrors::FindShortcutErrors()
     SetAction( FDS_ACTION_COLLECT );	// Wir fange immer mit sammeln an, ODER??
 }
 
-void FindShortcutErrors::SetAction( USHORT nA )
+void FindShortcutErrors::SetAction( sal_uInt16 nA )
 {
     nAction = nA;
     if ( FDS_ACTION_COLLECT == nAction )
@@ -1885,14 +1848,14 @@ void FindShortcutErrors::SetAction( USHORT nA )
     }
 }
 
-BOOL FindShortcutErrors::IsWinOK( Window *pWin )
+sal_Bool FindShortcutErrors::IsWinOK( Window *pWin )
 {
     if ( pWin->IsReallyVisible() )
     {
         String aText = pWin->GetText();
         xub_StrLen nPos = aText.Search('~');
         String aShortcut;
-        BOOL bHasAccel = FALSE;
+        sal_Bool bHasAccel = sal_False;
         if ( nPos != STRING_NOTFOUND )
         {
             aShortcut = aText.Copy( nPos+1, 1 );
@@ -1912,7 +1875,7 @@ BOOL FindShortcutErrors::IsWinOK( Window *pWin )
                 break;
             case FDS_ACTION_MARK:
                 {
-                    BOOL bMissing = FALSE;
+                    sal_Bool bMissing = sal_False;
                     if ( !bHasAccel && aText.Len() )	// should there be an accelarator defined
                     {
 
@@ -1926,7 +1889,7 @@ BOOL FindShortcutErrors::IsWinOK( Window *pWin )
                              (pChild->GetType() == WINDOW_PUSHBUTTON) )
                         {
                             if ( !pChild->GetText().EqualsAscii( "..." ) )
-                                bMissing = TRUE;
+                                bMissing = sal_True;
                         }
 
                         if ( pChild->GetType() == WINDOW_FIXEDTEXT )
@@ -1956,7 +1919,7 @@ BOOL FindShortcutErrors::IsWinOK( Window *pWin )
                                      (pTempChild->GetType() == WINDOW_DATEBOX) ||
                                      (pTempChild->GetType() == WINDOW_TIMEBOX) )
                                 {
-                                    bMissing = TRUE;
+                                    bMissing = sal_True;
                                 }
                             }
                         }
@@ -2004,22 +1967,22 @@ BOOL FindShortcutErrors::IsWinOK( Window *pWin )
             pWin->SetControlBackground();
         }
 
-    return FALSE;
+    return sal_False;
 }
 
-String TranslateWin::MarkShortcutErrors( Window* pBase, BOOL bMark )
+String TranslateWin::MarkShortcutErrors( Window* pBase, sal_Bool bMark )
 {
     if ( pBase )
     {
         FindShortcutErrors aFinder;
         if ( bMark )
         {
-            StatementList::SearchAllWin( pBase, aFinder, TRUE );	// collect Shortcuts first
+            StatementList::SearchAllWin( pBase, aFinder, sal_True );	// collect Shortcuts first
             aFinder.SetAction( FDS_ACTION_MARK );
         }
         else
             aFinder.SetAction( FDS_ACTION_UNMARK );
-        StatementList::SearchAllWin( pBase, aFinder, TRUE );
+        StatementList::SearchAllWin( pBase, aFinder, sal_True );
         return aFinder.GetDoubleShortcuts();
     }
     return UniString();
@@ -2029,40 +1992,40 @@ void TranslateWin::EnableTranslation()
 {
     PushButtonTT_PB_SELECT.Enable();
     PushButtonTT_PB_NEXT.Enable();
-    bAvailable = FALSE;
-    bNext = FALSE;
+    bAvailable = sal_False;
+    bNext = sal_False;
 }
 
 void StatementCommand::Translate()
 {
     // Es wurde eine initale UniqueId mitgegeben. Dann nur die dopelten Shortcuts liefern
-    if( (nParams & PARAM_ULONG_1) && nLNr1 )
+    if( (nParams & PARAM_STR_1) && nLNr1 )
     {
         String aDouble;
-        Window *pWin = SearchTree( SmartId( nLNr1 ) ,FALSE );
+        Window *pWin = SearchTree( Str2Id( aString1 ) ,sal_False );
         if ( pWin )
         {
             pWin = pWin->GetWindow( WINDOW_OVERLAP );
-            aDouble = TranslateWin::MarkShortcutErrors( pWin, TRUE );
+            aDouble = TranslateWin::MarkShortcutErrors( pWin, sal_True );
         }
-        pRet->GenReturn ( RET_Value, aSmartMethodId, aDouble );
+        pRet->GenReturn ( RET_Value, nMethodId, aDouble );
         return;
     }
 
     if ( !GetTTSettings()->pTranslateWin )
     {
         GetTTSettings()->pTranslateWin = new TranslateWin;
-        GetTTSettings()->bToTop = TRUE;
+        GetTTSettings()->bToTop = sal_True;
     }
 
     GetTTSettings()->pTranslateWin->Show();
     if ( GetTTSettings()->bToTop )
     {
         GetTTSettings()->pTranslateWin->ToTop();
-        GetTTSettings()->bToTop = FALSE;
+        GetTTSettings()->bToTop = sal_False;
     }
 
-    GetTTSettings()->pTranslateWin->GetWindow( WINDOW_OVERLAP )->EnableInput( TRUE, TRUE );
+    GetTTSettings()->pTranslateWin->GetWindow( WINDOW_OVERLAP )->EnableInput( sal_True, sal_True );
 
     if ( GetTTSettings()->pTranslateWin->IsTranslationAvailable() )
     {
@@ -2076,15 +2039,15 @@ void StatementCommand::Translate()
             if ( pTranslationWindow->GetType() == WINDOW_BORDERWINDOW && pTranslationWindow->GetWindow( WINDOW_CLIENT ) )
             {
                 Window* pNew = pTranslationWindow->GetWindow( WINDOW_CLIENT );
-                // Bei Dockingwindoes das kanze Geraffel von Docking Floating überspringen
-                while ( IsDialog( pNew ) && !pNew->GetSmartUniqueOrHelpId().HasAny() && pNew->GetChildCount() == 1 )
+                // Bei Dockingwindoes das kanze Geraffel von Docking Floating �berspringen
+                while ( IsDialog( pNew ) && !pNew->GetUniqueOrHelpId().getLength() && pNew->GetChildCount() == 1 )
                     pNew = pNew->GetChild( 0 );
                 pTranslationWindow = pNew;
             }
 
             aTranslation = CUniString("0;");
 
-            aTranslation += pTranslationWindow->GetSmartUniqueOrHelpId().GetText();
+            aTranslation += Id2Str( pTranslationWindow->GetUniqueOrHelpId() );
             aTranslation += ';';
 
             aTranslation += TypeString( pTranslationWindow->GetType() );
@@ -2098,7 +2061,7 @@ void StatementCommand::Translate()
 
             if ( pParentDialog )
             {
-                aTranslation += pParentDialog->GetSmartUniqueOrHelpId().GetText();
+                aTranslation += Id2Str(pParentDialog->GetUniqueOrHelpId());
                 aTranslation += ';';
                 aTranslation += TypeString( pParentDialog->GetType() );
             }
@@ -2127,37 +2090,37 @@ void StatementCommand::Translate()
             // alle TABSs quoten ()
             aTranslation.SearchAndReplaceAll( CUniString("\t"), CUniString("\\t") );
 
-            pRet->GenReturn ( RET_Value, aSmartMethodId, aTranslation );
+            pRet->GenReturn ( RET_Value, nMethodId, aTranslation );
             GetTTSettings()->pTranslateWin->EnableTranslation();
-            GetTTSettings()->bToTop = TRUE;
+            GetTTSettings()->bToTop = sal_True;
         }
         else
         {
-            pRet->GenReturn ( RET_Value, aSmartMethodId, String() );
+            pRet->GenReturn ( RET_Value, nMethodId, String() );
             GetTTSettings()->pTranslateWin->EnableTranslation();
             ErrorBox err( GetTTSettings()->pTranslateWin, TTProperties::GetSvtResId( TT_NO_CONTROL ));
             err.Execute();
-            GetTTSettings()->bToTop = TRUE;
+            GetTTSettings()->bToTop = sal_True;
         }
 
     }
     else if ( GetTTSettings()->pTranslateWin->IsNextDialog() )
     {
-        pRet->GenReturn ( RET_Value, aSmartMethodId, CUniString("1") );
+        pRet->GenReturn ( RET_Value, nMethodId, CUniString("1") );
         GetTTSettings()->pTranslateWin->ResetNextDialog();
         GetTTSettings()->pTranslateWin->LoseFocus();
-        GetTTSettings()->bToTop = TRUE;
+        GetTTSettings()->bToTop = sal_True;
     }
     else
     {
         GetTTSettings()->pTranslateWin->EnableTranslation();
-        pRet->GenReturn ( RET_Value, aSmartMethodId, String() );
+        pRet->GenReturn ( RET_Value, nMethodId, String() );
     }
 }
 
 Window* StatementCommand::GetNextOverlap( Window* pBase )
-{	// Findet irgendwelche Overlap-Fenster, die schließbar aussehen
-    // Eventuell muß noch die Auswahl verfeinert werden.
+{	// Findet irgendwelche Overlap-Fenster, die schlie�bar aussehen
+    // Eventuell mu� noch die Auswahl verfeinert werden.
 
     if ( pBase->GetType() != WINDOW_BORDERWINDOW )
         pBase = pBase->GetWindow( WINDOW_OVERLAP );
@@ -2190,7 +2153,7 @@ Window* StatementCommand::GetNextOverlap( Window* pBase )
 
 Window* StatementCommand::GetNextRecoverWin()
 {
-    // über die TopLevelWindows der App iterieren
+    // �ber die TopLevelWindows der App iterieren
     Window* pBase = Application::GetFirstTopLevelWindow();
     Window *pControl = NULL;
     Window* pMyFirstDocFrame = NULL;
@@ -2212,7 +2175,7 @@ Window* StatementCommand::GetNextRecoverWin()
             }
 
             // dann das Fenster selbst Schliessen
-               // erstes DocWin überspringen
+               // erstes DocWin �berspringen
             // Assumption that Doc Windows are Borderwindows and ButtonDialog and such are not
             if ( pBase->IsVisible() && !IsFirstDocFrame( pBase ) && pBase->GetType() != WINDOW_BORDERWINDOW && !IsIMEWin( pBase ) )
                 return pBase;
@@ -2232,25 +2195,25 @@ Window* StatementCommand::GetNextRecoverWin()
     return NULL;
 }
 
-BOOL StatementCommand::Execute()
+sal_Bool StatementCommand::Execute()
 {
     if ( IsError )
     {
 #if OSL_DEBUG_LEVEL > 1
         m_pDbgWin->AddText( "Skipping Command: " );
-        m_pDbgWin->AddText( aSmartMethodId.GetText() );
+        m_pDbgWin->AddText( String::CreateFromInt32( nMethodId ) );
         m_pDbgWin->AddText( "\n" );
         #endif
 
         Advance();
         delete this;
-        return TRUE;
+        return sal_True;
     }
 
     InitProfile();
 #if OSL_DEBUG_LEVEL > 1
     m_pDbgWin->AddText( "Executing Command: " );
-    m_pDbgWin->AddText( aSmartMethodId.GetText() );
+    m_pDbgWin->AddText( String::CreateFromInt32( nMethodId ) );
     m_pDbgWin->AddText( "\n" );
 #endif
 
@@ -2261,7 +2224,7 @@ BOOL StatementCommand::Execute()
 #if OSL_DEBUG_LEVEL > 1
 #define	REPORT_WIN_CLOSED(pControl, aInfo)			\
     _REPORT_WIN_CLOSED(pControl, aInfo)				\
-    m_pDbgWin->AddText( aInfo.AppendAscii(" \"").Append( pControl->GetText() ).AppendAscii("\" geschlossen, RType = ").Append( TypeString(pControl->GetType()) ).AppendAscii(", UId = ").Append( UIdString(pControl->GetSmartUniqueOrHelpId()) ) );
+    m_pDbgWin->AddText( aInfo.AppendAscii(" \"").Append( pControl->GetText() ).AppendAscii("\" geschlossen, RType = ").Append( TypeString(pControl->GetType()) ).AppendAscii(", UId = ").Append( UIdString( pControl->GetUniqueOrHelpId() ) ) );
 #else
 #define	REPORT_WIN_CLOSED(pControl, aInfo) _REPORT_WIN_CLOSED(pControl, aInfo)
 #endif
@@ -2278,7 +2241,7 @@ BOOL StatementCommand::Execute()
     aString1.AppendAscii("\" geschlossen, RType = ");\
     aString1 += TypeString(pControl->GetType());	\
     aString1.AppendAscii(", UId = ");				\
-    aString1 += UIdString(pControl->GetSmartUniqueOrHelpId());
+    aString1 += UIdString(pControl->GetUniqueOrHelpId());
 
 
     switch ( nMethodId )
@@ -2287,33 +2250,33 @@ BOOL StatementCommand::Execute()
             if ( !bBool1 )
             {
                 nLNr1 = Time().GetTime() + nNr1/10;
-                bBool1 = TRUE;
+                bBool1 = sal_True;
             }
             if ( Time().GetTime() < long(nLNr1) )	// Aktuelle Zeit kleiner Endzeit
-                return FALSE;
+                return sal_False;
             break;
         case RC_DisplayHid:
             if ( DisplayHID() )
-                return FALSE;
+                return sal_False;
             break;
         case RC_ResetApplication:
             {
                 if ( !bBool1 )
                 {
                     nRetryCount = 150;		// das sollte reichen.
-                    bBool1 = TRUE;			// Nur beim ersten mal!
+                    bBool1 = sal_True;			// Nur beim ersten mal!
                     nNr1 = 1;				// Welcher Button ist dran?
                     nLNr1 = 0;				// Speichern des AppWin
                     aString1 = UniString();	// Liste der geschlossenen Fenster
 
-                    // So daß nacher auch wieder alles auf Default steht
+                    // So da� nacher auch wieder alles auf Default steht
                     nUseBindings = 0;
-                    bCatchGPF = TRUE;
-                    bUsePostEvents = TRUE;
+                    bCatchGPF = sal_True;
+                    bUsePostEvents = sal_True;
 
-                    aSubMenuId1 = SmartId();
-                    aSubMenuId2 = SmartId();
-                    aSubMenuId3 = SmartId();
+                    aSubMenuId1 = 0;
+                    aSubMenuId2 = 0;
+                    aSubMenuId3 = 0;
                     pMenuWindow = NULL;
                 }
                 if ( !nRetryCount )
@@ -2323,7 +2286,7 @@ BOOL StatementCommand::Execute()
 
                 if ( pControl )
                 {
-                    bBool2 = FALSE; // flag for wait when all windows are closed
+                    bBool2 = sal_False; // flag for wait when all windows are closed
                     pControl->GrabFocus();
 
                     if (	pControl->GetType() != WINDOW_DOCKINGWINDOW
@@ -2334,12 +2297,12 @@ BOOL StatementCommand::Execute()
                          && pControl->GetType() != WINDOW_BORDERWINDOW
                          && nRetryCount-- )
                     {
-                        short nRT = ImpGetRType( pControl, pControl->GetSmartUniqueOrHelpId() );
+                        short nRT = ImpGetRType( pControl );
 
                         if ( nRT == C_TabControl && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_TABDIALOG )
-                        {	// Bei Tabcontrol den zugehörigen Tabdialog nehmen
+                        {	// Bei Tabcontrol den zugeh�rigen Tabdialog nehmen
                             pControl = pControl->GET_REAL_PARENT();
-                            nRT = ImpGetRType( pControl, pControl->GetSmartUniqueOrHelpId() );
+                            nRT = ImpGetRType( pControl );
                         }
 
                         switch( nRT )
@@ -2404,7 +2367,7 @@ BOOL StatementCommand::Execute()
                                             break;
                                         default:
                                             {
-                                                USHORT nID = pBD->GetButtonId( nNr1-10 );
+                                                sal_uInt16 nID = pBD->GetButtonId( nNr1-10 );
                                                 if ( nID != BUTTONID_HELP )
                                                 {
                                                     REPORT_WIN_CLOSED(pControl, CUniString("Message Box (").Append( UniString::CreateFromInt32(nID) ).AppendAscii(")"));
@@ -2425,7 +2388,7 @@ BOOL StatementCommand::Execute()
                                 #endif
                                 break;
                         }
-                        return FALSE;
+                        return sal_False;
                     }
                     else
                     {
@@ -2437,12 +2400,12 @@ BOOL StatementCommand::Execute()
                                 SET_WINP_CLOSING(pControl);
                                 ((DockingWindow*)pControl)->Close();
 
-                                // Eigentlich nur bei TaskWindows! Hoffen wir mal, daß keine anderen DockingWindows dazwischen hauen.
+                                // Eigentlich nur bei TaskWindows! Hoffen wir mal, da� keine anderen DockingWindows dazwischen hauen.
                                 if ( (Window*)nLNr1 != pControl )
-                                    nNr1 = 1;		// Zum durchprobieren der Buttons beim Schließen
-                                nLNr1 = (ULONG)pControl;
+                                    nNr1 = 1;		// Zum durchprobieren der Buttons beim Schlie�en
+                                nLNr1 = (sal_uLong)pControl;
 
-                                return FALSE;
+                                return sal_False;
                             }
                         }
                         if ( nRetryCount--
@@ -2469,10 +2432,10 @@ BOOL StatementCommand::Execute()
 
                                             // nur bei TaskWindows!
                                             if ( (Window*)nLNr1 != pControl )
-                                                nNr1 = 1;		// Zum durchprobieren der Buttons beim Schließen
-                                            nLNr1 = (ULONG)pControl;
+                                                nNr1 = 1;		// Zum durchprobieren der Buttons beim Schlie�en
+                                            nLNr1 = (sal_uLong)pControl;
 
-                                            return FALSE;
+                                            return sal_False;
                                         }
                                     }
                                 }
@@ -2486,8 +2449,8 @@ BOOL StatementCommand::Execute()
 
                                 // Eigentlich nur bei TaskWindows!
                                 if ( (Window*)nLNr1 != pControl )
-                                    nNr1 = 1;		// Zum durchprobieren der Buttons beim Schließen
-                                nLNr1 = (ULONG)pControl;
+                                    nNr1 = 1;		// Zum durchprobieren der Buttons beim Schlie�en
+                                nLNr1 = (sal_uLong)pControl;
 
                                 return FALSE;
                             }
@@ -2499,12 +2462,12 @@ BOOL StatementCommand::Execute()
                 if ( !bBool2 )
                 {
                     nLNr1 = Time().GetTime() + 100; // 100 = 1 Second
-                    bBool2 = TRUE;
+                    bBool2 = sal_True;
                 }
                 if ( Time().GetTime() < long(nLNr1) )	// Aktuelle Zeit kleiner Endzeit
-                    return FALSE;
+                    return sal_False;
                 else
-                    pRet->GenReturn ( RET_Value, aSmartMethodId, aString1);
+                    pRet->GenReturn ( RET_Value, nMethodId, aString1);
             }
             break;
         case RC_WaitSlot:
@@ -2514,16 +2477,16 @@ BOOL StatementCommand::Execute()
                 if ( !bBool1 )
                 {
                     nLNr1 = Time().GetTime() + nNr1/10;
-                    bBool1 = TRUE;
+                    bBool1 = sal_True;
                 }
 
                 if ( !bIsSlotInExecute )
-                    pRet->GenReturn ( RET_Value, aSmartMethodId, comm_USHORT(CONST_WSFinished) );
+                    pRet->GenReturn ( RET_Value, nMethodId, comm_USHORT(CONST_WSFinished) );
                 else
                 {
                     if ( Time().GetTime() < long(nLNr1) )	// Aktuelle Zeit kleiner Endzeit
-                        return FALSE;
-                    pRet->GenReturn ( RET_Value, aSmartMethodId, comm_USHORT(CONST_WSTimeout) );
+                        return sal_False;
+                    pRet->GenReturn ( RET_Value, nMethodId, comm_USHORT(CONST_WSTimeout) );
                 }
             }
             break;
@@ -2540,11 +2503,11 @@ BOOL StatementCommand::Execute()
         case RC_ResetApplication:
         case RC_WaitSlot:
 
-        case RC_AppAbort:		// Sofortiges Löschen aller Befehle
+        case RC_AppAbort:		// Sofortiges L�schen aller Befehle
             break;
         case RC_Assert:
             {
-                ByteString aAssertion( "Diese Assertion wurde vom Testtool per Befehl ausgelöst" );
+                ByteString aAssertion( "Diese Assertion wurde vom Testtool per Befehl ausgel�st" );
                 aAssertion = ByteString( String( aAssertion, RTL_TEXTENCODING_MS_1252 ), RTL_TEXTENCODING_UTF8 );
                 DBG_ASSERT( !aString1.Len(), ByteString( aString1, RTL_TEXTENCODING_UTF8 ).GetBuffer() );
                 DBG_ASSERT(  aString1.Len(), aAssertion.GetBuffer() );
@@ -2571,32 +2534,32 @@ BOOL StatementCommand::Execute()
             break;
         case RC_ApplicationBusy:
         {
-            BOOL bWait = FALSE;
+            sal_Bool bWait = sal_False;
             ReportError( GEN_RES_STR0( S_NO_ACTIVE_WINDOW ) );
-            pRet->GenReturn ( RET_Value, aSmartMethodId, bWait );
+            pRet->GenReturn ( RET_Value, nMethodId, bWait );
             break;
         }
         case RC_GetClipboard:
             {
                 ::rtl::OUString aTemp;
                 ::svt::OStringTransfer::PasteString( aTemp, GetFirstDocFrame() );
-                pRet->GenReturn ( RET_Value, aSmartMethodId, String( aTemp ) );
+                pRet->GenReturn ( RET_Value, nMethodId, String( aTemp ) );
             }
             break;
         case RC_SetClipboard:
             ::svt::OStringTransfer::CopyString(aString1,GetFirstDocFrame());
             break;
         case RC_WinTree:
-            pRet->GenReturn ( RET_Value, aSmartMethodId, Tree( NULL, 0));
+            pRet->GenReturn ( RET_Value, nMethodId, Tree( NULL, 0));
             break;
     #if OSL_DEBUG_LEVEL > 1
         case RC_NoDebug:
-            m_pDbgWin->bQuiet = TRUE;
+            m_pDbgWin->bQuiet = sal_True;
             m_pDbgWin->Hide();
             m_pDbgWin->Clear();
             break;
         case RC_Debug:
-            m_pDbgWin->bQuiet = FALSE;
+            m_pDbgWin->bQuiet = sal_False;
             m_pDbgWin->Show();
             break;
     #endif
@@ -2611,7 +2574,9 @@ BOOL StatementCommand::Execute()
                 else if ( !IsDialog(pWin) )
                     ReportError( GEN_RES_STR0( S_NO_DIALOG_IN_GETACTIVE ) );
                 else
-                    pRet->GenReturn( RET_Value, aSmartMethodId, static_cast<comm_ULONG>(pWin->GetSmartUniqueOrHelpId().GetNum())); //GetNum() ULONG != comm_ULONG on 64bit
+                {
+                    pRet->GenReturn( RET_Value, nMethodId, Id2Str(pWin->GetUniqueOrHelpId()) );
+                }
             }
             break;
         case RC_UseBindings:
@@ -2623,10 +2588,10 @@ BOOL StatementCommand::Execute()
         case RC_Profile:
             //	Bei folgenden Parametern passiert folgendes:
             //	ein boolean=false					Alles Profiling stoppen (Ergebnisse liefern)
-            //	ein boolean=true, 1-4 ints			Einteilung der Zeiten in Kästchen
+            //	ein boolean=true, 1-4 ints			Einteilung der Zeiten in K�stchen
             //	kein! boolean keine ints			loggen jeden Befehls
             //	kein! boolean 1 int					loggen alle int Millisekunden
-            //  ein String							wird in das Logfile übernommen(sonst passiert nichts)
+            //  ein String							wird in das Logfile �bernommen(sonst passiert nichts)
             if( !(nParams & PARAM_BOOL_1) || bBool1 )
             {
                 if ( !pProfiler )
@@ -2643,8 +2608,8 @@ BOOL StatementCommand::Execute()
                     }
                     pProfiler->StartAutoProfiling( nNr1 );
 
-                    // Der Header ist abhängig vom Modus
-                    pRet->GenReturn( RET_ProfileInfo, SmartId(), pProfiler->GetProfileHeader() );
+                    // Der Header ist abh�ngig vom Modus
+                    pRet->GenReturn( RET_ProfileInfo, 0, pProfiler->GetProfileHeader() );
                 }
                 else if ( nParams & PARAM_USHORT_1 )
                 {	// Partitioning initialisieren: Profile true [,nNr][,nNr][,nNr][,nNr]
@@ -2654,35 +2619,35 @@ BOOL StatementCommand::Execute()
                     if ( nParams & PARAM_USHORT_3 ) { nAnzahl++; };
                     if ( nParams & PARAM_USHORT_4 ) { nAnzahl++; };
 
-                    // Hier werden die Parameter ans Testtool zurück übertragen.
-                    // Das ist zwar etwas eigenartig, aber ansonsten müsste man im Testtool
+                    // Hier werden die Parameter ans Testtool zur�ck �bertragen.
+                    // Das ist zwar etwas eigenartig, aber ansonsten m�sste man im Testtool
                     // die einfache Struktur der Remotebefehle aufbrechen.
-                    pRet->GenReturn( RET_ProfileInfo, SmartId( S_ProfileReset ), nAnzahl );
+                    pRet->GenReturn( RET_ProfileInfo, S_ProfileReset, nAnzahl );
 
                     // Und die einzelnen Grenzen
-                    if ( nParams & PARAM_USHORT_1 ) { pRet->GenReturn( RET_ProfileInfo, SmartId( S_ProfileBorder1 ), (comm_ULONG)nNr1 ); };
-                    if ( nParams & PARAM_USHORT_2 ) { pRet->GenReturn( RET_ProfileInfo, SmartId( S_ProfileBorder2 ), (comm_ULONG)nNr2 ); };
-                    if ( nParams & PARAM_USHORT_3 ) { pRet->GenReturn( RET_ProfileInfo, SmartId( S_ProfileBorder3 ), (comm_ULONG)nNr3 ); };
-                    if ( nParams & PARAM_USHORT_4 ) { pRet->GenReturn( RET_ProfileInfo, SmartId( S_ProfileBorder4 ), (comm_ULONG)nNr4 ); };
+                    if ( nParams & PARAM_USHORT_1 ) { pRet->GenReturn( RET_ProfileInfo, S_ProfileBorder1, (comm_ULONG)nNr1 ); };
+                    if ( nParams & PARAM_USHORT_2 ) { pRet->GenReturn( RET_ProfileInfo, S_ProfileBorder2, (comm_ULONG)nNr2 ); };
+                    if ( nParams & PARAM_USHORT_3 ) { pRet->GenReturn( RET_ProfileInfo, S_ProfileBorder3, (comm_ULONG)nNr3 ); };
+                    if ( nParams & PARAM_USHORT_4 ) { pRet->GenReturn( RET_ProfileInfo, S_ProfileBorder4, (comm_ULONG)nNr4 ); };
 
                     pProfiler->StartPartitioning();
                 }
                 else if( nParams == PARAM_STR_1 )	// Genau ein String!
                 {	// Nur einen String ins Profiling aufnehmen
                     aString1 += '\n';
-                    pRet->GenReturn( RET_ProfileInfo, SmartId(), aString1 );
+                    pRet->GenReturn( RET_ProfileInfo, 0, aString1 );
                 }
                 else
                 {	// Normales Profiling je Kommando: profile
                     if ( pProfiler->IsAutoProfiling() )
                     {
-                        pRet->GenReturn( RET_ProfileInfo, SmartId(), pProfiler->GetAutoProfiling() );
+                        pRet->GenReturn( RET_ProfileInfo, 0, pProfiler->GetAutoProfiling() );
                         pProfiler->StopAutoProfiling();
                     }
                     pProfiler->StartProfilingPerCommand();
 
-                    // Der Header ist abhängig vom Modus
-                    pRet->GenReturn( RET_ProfileInfo, SmartId(), pProfiler->GetProfileHeader() );
+                    // Der Header ist abh�ngig vom Modus
+                    pRet->GenReturn( RET_ProfileInfo, 0, pProfiler->GetProfileHeader() );
                 }
             }
             else		// Profiling wieder ausschalten: Profile false
@@ -2693,13 +2658,13 @@ BOOL StatementCommand::Execute()
 
                     if ( pProfiler->IsAutoProfiling() )
                     {
-                        pRet->GenReturn( RET_ProfileInfo, SmartId(), pProfiler->GetAutoProfiling() );
+                        pRet->GenReturn( RET_ProfileInfo, 0, pProfiler->GetAutoProfiling() );
                         pProfiler->StopAutoProfiling();
                     }
 
                     if ( pProfiler->IsPartitioning() )
                     {
-                        pRet->GenReturn( RET_ProfileInfo, SmartId( S_ProfileDump ), (comm_ULONG)0 );
+                        pRet->GenReturn( RET_ProfileInfo, S_ProfileDump, (comm_ULONG)0 );
                         pProfiler->StopPartitioning();
                     }
 
@@ -2722,7 +2687,7 @@ BOOL StatementCommand::Execute()
                 MenuBar *pMenuBar = NULL;
                 Menu *pMenu;
 
-                USHORT nErr = GetCurrentMenues( pPopup, pMenuBar, pMenu );
+                sal_uInt16 nErr = GetCurrentMenues( pPopup, pMenuBar, pMenu );
 
                 if ( !pMenu )
                 {
@@ -2733,7 +2698,7 @@ BOOL StatementCommand::Execute()
                     break;
                 }
 
-                USHORT nItemCount = 0;
+                sal_uInt16 nItemCount = 0;
                 switch ( nMethodId )
                 {
                     case RC_MenuGetItemCount:
@@ -2743,8 +2708,8 @@ BOOL StatementCommand::Execute()
                             nItemCount = pMenu->GetItemCount();
                             if ( pMenu->GetMenuFlags() & MENU_FLAG_HIDEDISABLEDENTRIES )
                             {	// jep, we have to adjust the count
-                                BOOL bLastWasSeperator = TRUE;	// TRUE for Separator at the top
-                                for ( USHORT i = 0 ; i < pMenu->GetItemCount() ; i++ )
+                                sal_Bool bLastWasSeperator = sal_True;	// sal_True for Separator at the top
+                                for ( sal_uInt16 i = 0 ; i < pMenu->GetItemCount() ; i++ )
                                 {
                                     if ( !pMenu->IsItemEnabled( pMenu->GetItemId( i ) ) )
                                         nItemCount--;
@@ -2763,7 +2728,7 @@ BOOL StatementCommand::Execute()
                 }
 
                 // for certain methods calculate the physical index (reinserting the hidden entries)
-                USHORT nPhysicalIndex = 0;
+                sal_uInt16 nPhysicalIndex = 0;
                 switch ( nMethodId )
                 {
                     case RC_MenuGetItemId:
@@ -2772,9 +2737,9 @@ BOOL StatementCommand::Execute()
                             nPhysicalIndex = nNr1;
                             if ( pMenu->GetMenuFlags() & MENU_FLAG_HIDEDISABLEDENTRIES )
                             {	// jep, we have to adjust the position
-                                BOOL bLastWasSeperator = TRUE;	// TRUE for Separator at the top
-                                USHORT nVisibleCount = 0;
-                                for ( USHORT i = 0 ; i < pMenu->GetItemCount() && nVisibleCount < nNr1 ; i++ )
+                                sal_Bool bLastWasSeperator = sal_True;	// sal_True for Separator at the top
+                                sal_uInt16 nVisibleCount = 0;
+                                for ( sal_uInt16 i = 0 ; i < pMenu->GetItemCount() && nVisibleCount < nNr1 ; i++ )
                                 {
                                     if ( pMenu->IsItemEnabled( pMenu->GetItemId( i ) )
                                          && !( pMenu->GetItemType( i ) == MENUITEM_SEPARATOR && bLastWasSeperator ) )
@@ -2797,78 +2762,78 @@ BOOL StatementCommand::Execute()
                 {
                     case RC_MenuGetItemCount:
                         {
-                            pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_ULONG)nItemCount );
+                            pRet->GenReturn ( RET_Value, nMethodId, (comm_ULONG)nItemCount );
                         }
                         break;
                     case RC_MenuGetItemId:
                         {
-                            if ( ValueOK(aSmartMethodId, RcString( nMethodId ),nNr1,nItemCount) )
-                                pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_ULONG)pMenu->GetItemId(nPhysicalIndex-1) );
+                            if ( ValueOK( rtl::OString(), RcString( nMethodId ),nNr1,nItemCount) )
+                                pRet->GenReturn ( RET_Value, nMethodId, (comm_ULONG)pMenu->GetItemId(nPhysicalIndex-1) );
                         }
                         break;
                     case RC_MenuGetItemPos:
                         {
-                            USHORT nLogicalPos = pMenu->GetItemPos(nNr1);
+                            sal_uInt16 nLogicalPos = pMenu->GetItemPos(nNr1);
                             if ( MENU_ITEM_NOTFOUND != nLogicalPos && pMenu->GetMenuFlags() & MENU_FLAG_HIDEDISABLEDENTRIES )
                             {	// jep, we have to adjust the position
                                 if ( !pMenu->IsItemEnabled( nNr1 ) )
                                     nLogicalPos = MENU_ITEM_NOTFOUND;
                                 else
                                 {
-                                    BOOL bLastWasSeperator = FALSE;
+                                    sal_Bool bLastWasSeperator = sal_False;
                                     for ( int i = nLogicalPos ; i >= 0 ; i-- )
                                     {
-                                        if ( !pMenu->IsItemEnabled( pMenu->GetItemId( sal::static_int_cast< USHORT >(i) ) ) ||
-                                             ( pMenu->GetItemType( sal::static_int_cast< USHORT >(i) ) == MENUITEM_SEPARATOR && bLastWasSeperator ) )
+                                        if ( !pMenu->IsItemEnabled( pMenu->GetItemId( sal::static_int_cast< sal_uInt16 >(i) ) ) ||
+                                             ( pMenu->GetItemType( sal::static_int_cast< sal_uInt16 >(i) ) == MENUITEM_SEPARATOR && bLastWasSeperator ) )
                                             nLogicalPos--;
-                                        bLastWasSeperator = pMenu->GetItemType( sal::static_int_cast< USHORT >(i) ) == MENUITEM_SEPARATOR;
+                                        bLastWasSeperator = pMenu->GetItemType( sal::static_int_cast< sal_uInt16 >(i) ) == MENUITEM_SEPARATOR;
                                     }
                                 }
                             }
-                            pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_ULONG)(nLogicalPos+1) );
+                            pRet->GenReturn ( RET_Value, nMethodId, (comm_ULONG)(nLogicalPos+1) );
                         }
                         break;
                     case RC_MenuIsSeperator:
                         {
-                            if ( ValueOK(aSmartMethodId, RcString( nMethodId ),nNr1,nItemCount) )
-                                pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_BOOL)(pMenu->GetItemType(nPhysicalIndex-1) == MENUITEM_SEPARATOR) );
+                            if ( ValueOK( rtl::OString(), RcString( nMethodId ),nNr1,nItemCount) )
+                                pRet->GenReturn ( RET_Value, nMethodId, (comm_BOOL)(pMenu->GetItemType(nPhysicalIndex-1) == MENUITEM_SEPARATOR) );
                         }
                         break;
                     case RC_MenuIsItemChecked:
                         {
-                            pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_BOOL)pMenu->IsItemChecked(nNr1) );
+                            pRet->GenReturn ( RET_Value, nMethodId, (comm_BOOL)pMenu->IsItemChecked(nNr1) );
                         }
                         break;
                     case RC_MenuIsItemEnabled:
                         {
-                            pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_BOOL)pMenu->IsItemEnabled(nNr1) );
+                            pRet->GenReturn ( RET_Value, nMethodId, (comm_BOOL)pMenu->IsItemEnabled(nNr1) );
                         }
                         break;
                     case RC_MenuGetItemText:
                         {
-                            pRet->GenReturn ( RET_Value, aSmartMethodId, (String)pMenu->GetItemText(nNr1) );
+                            pRet->GenReturn ( RET_Value, nMethodId, (String)pMenu->GetItemText(nNr1) );
                         }
                         break;
                     case RC_MenuGetItemCommand:
                         {
-                            pRet->GenReturn ( RET_Value, aSmartMethodId, (String)pMenu->GetItemCommand(nNr1) );
+                            pRet->GenReturn ( RET_Value, nMethodId, (String)pMenu->GetItemCommand(nNr1) );
                         }
                         break;
                     case RC_MenuHasSubMenu:
                         {
-                            pRet->GenReturn ( RET_Value, aSmartMethodId, (BOOL)(pMenu->GetPopupMenu(nNr1) != NULL) );
+                            pRet->GenReturn ( RET_Value, nMethodId, (sal_Bool)(pMenu->GetPopupMenu(nNr1) != NULL) );
                         }
                         break;
                     case RC_MenuSelect:
                         {
                             if ( pMenu->GetPopupMenu(nNr1) )
                             {
-                                if ( !aSubMenuId1.GetNum() )
-                                    aSubMenuId1 = SmartId(nNr1);
-                                else if ( !aSubMenuId2.GetNum() )
-                                    aSubMenuId2 = SmartId(nNr1);
-                                else if ( !aSubMenuId3.GetNum() )
-                                    aSubMenuId3 = SmartId(nNr1);
+                                if ( !aSubMenuId1 )
+                                    aSubMenuId1 = nNr1;
+                                else if ( !aSubMenuId2 )
+                                    aSubMenuId2 = nNr1;
+                                else if ( !aSubMenuId3 )
+                                    aSubMenuId3 = nNr1;
 
                                 if ( pPopup )
                                     pPopup->SelectEntry(nNr1);
@@ -2880,17 +2845,17 @@ BOOL StatementCommand::Execute()
                                 if ( pPopup )
                                 {
                                     pPopup->EndExecute(nNr1);
-                                    aSubMenuId1 = SmartId();
-                                    aSubMenuId2 = SmartId();
-                                    aSubMenuId3 = SmartId();
+                                    aSubMenuId1 = 0;
+                                    aSubMenuId2 = 0;
+                                    aSubMenuId3 = 0;
                                     pMenuWindow = NULL;
                                 }
                                 else
                                 {
                                     pMenuBar->SelectEntry(nNr1);
-                                    aSubMenuId1 = SmartId();
-                                    aSubMenuId2 = SmartId();
-                                    aSubMenuId3 = SmartId();
+                                    aSubMenuId1 = 0;
+                                    aSubMenuId2 = 0;
+                                    aSubMenuId3 = 0;
                                     pMenuWindow = NULL;
                                 }
                             }
@@ -2958,7 +2923,7 @@ BOOL StatementCommand::Execute()
                         {
 
                             String aPath;
-                            USHORT nDirFlags = 0;
+                            sal_uInt16 nDirFlags = 0;
 // from basic/source/inc/runtime.hxx
 #define Sb_ATTR_NORMAL          0x0000
 #define Sb_ATTR_HIDDEN          0x0002
@@ -2981,27 +2946,20 @@ BOOL StatementCommand::Execute()
                                 }
                                 else
                                 {
-                                    USHORT nFlags = 0;
+                                    sal_uInt16 nFlags = 0;
                                     if ( (nParams & PARAM_USHORT_1) )
                                         nDirFlags = nFlags = nNr1;
                                     else
                                         nDirFlags = nFlags = Sb_ATTR_HIDDEN | Sb_ATTR_SYSTEM | Sb_ATTR_DIRECTORY;
 
                                     // Nur diese Bitmaske ist unter Windows erlaubt
-                        #ifdef WIN
-                                    if( nFlags & ~0x1E )
-                                    {
-                                        nDirFlags = 0;
-                                        StarBASIC::Error( SbERR_BAD_ARGUMENT );
-                                    }
-                        #endif
                                     // Sb_ATTR_VOLUME wird getrennt gehandelt
                                     if( nDirFlags & Sb_ATTR_VOLUME )
                                         aPath = aEntry.GetVolume();
                                     else
                                     {
                                         // Die richtige Auswahl treffen
-                                        USHORT nMode = FSYS_KIND_FILE;
+                                        sal_uInt16 nMode = FSYS_KIND_FILE;
                                         if( nFlags & Sb_ATTR_DIRECTORY )
                                             nMode |= FSYS_KIND_DIR;
                                         if( nFlags == Sb_ATTR_DIRECTORY )
@@ -3026,36 +2984,12 @@ BOOL StatementCommand::Execute()
                                     }
                                     DirEntry aNextEntry=(*(pDir))[nDirPos++];
                                     aPath = aNextEntry.GetName();
-                    #ifdef WIN
-                                    aNextEntry.ToAbs();
-                                    String sFull(aNextEntry.GetFull());
-                                    unsigned nFlags;
-
-                                    if (_dos_getfileattr( sFull.GetStr(), &nFlags ))
-                                        nErrorcode = FSYS_ERR_NOTEXISTS;
-                                    else
-                                    {
-                                        INT16 nCurFlags = nDirFlags;
-                                        if( (nCurFlags == Sb_ATTR_NORMAL)
-                                        && !(nFlags & ( _A_HIDDEN | _A_SYSTEM | _A_VOLID | _A_SUBDIR ) ) )
-                                            break;
-                                        else if( (nCurFlags & Sb_ATTR_HIDDEN) && (nFlags & _A_HIDDEN) )
-                                            break;
-                                        else if( (nCurFlags & Sb_ATTR_SYSTEM) && (nFlags & _A_SYSTEM) )
-                                            break;
-                                        else if( (nCurFlags & Sb_ATTR_VOLUME) && (nFlags & _A_VOLID) )
-                                            break;
-                                        else if( (nCurFlags & Sb_ATTR_DIRECTORY) && (nFlags & _A_SUBDIR) )
-                                            break;
-                                    }
-                    #else
                                     break;
-                    #endif
                                 }
                             }
                             if ( !nErrorcode )
                             {
-                                pRet->GenReturn ( RET_Value, aSmartMethodId, aPath );
+                                pRet->GenReturn ( RET_Value, nMethodId, aPath );
                             }
                             
                         }
@@ -3067,7 +3001,7 @@ BOOL StatementCommand::Execute()
                             if ( FSYS_ERR_OK == nErrorcode )
                             {
                                 FileStat aFS( aFile );
-                                pRet->GenReturn ( RET_Value, aSmartMethodId, static_cast<comm_ULONG>(aFS.GetSize()) ); //GetSize() ULONG != comm_ULONG on 64bit
+                                pRet->GenReturn ( RET_Value, nMethodId, static_cast<comm_ULONG>(aFS.GetSize()) ); //GetSize() sal_uLong != comm_ULONG on 64bit
                                 nErrorcode = aFS.GetError();
                             }
                         }
@@ -3094,7 +3028,7 @@ BOOL StatementCommand::Execute()
                                 SbxValueRef xValue = new SbxValue( SbxDATE );
                                 xValue->PutDate( fSerial );
 
-                                pRet->GenReturn ( RET_Value, aSmartMethodId, *xValue );
+                                pRet->GenReturn ( RET_Value, nMethodId, *xValue );
                             }
                         }
                         break;
@@ -3205,7 +3139,7 @@ BOOL StatementCommand::Execute()
                     ReportError( GEN_RES_STR1( S_POINTER_OUTSIDE_APPWIN, RcString( nMethodId ) ) );
                     aPointer = Pointer( POINTER_NULL );
                 }
-                pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_ULONG)aPointer.GetStyle() );
+                pRet->GenReturn ( RET_Value, nMethodId, (comm_ULONG)aPointer.GetStyle() );
             }
             break;
         case RC_UnpackStorage:
@@ -3223,7 +3157,7 @@ BOOL StatementCommand::Execute()
                     }
 
 #if OSL_DEBUG_LEVEL > 1
-                    USHORT nEntries = Dir( aDestPath, FSYS_KIND_FILE | FSYS_KIND_DIR ).Count();
+                    sal_uInt16 nEntries = Dir( aDestPath, FSYS_KIND_FILE | FSYS_KIND_DIR ).Count();
                     (void) nEntries; /* avoid warning about unused parameter */ 
 #endif
                     // The Count is only larger than 2 is the path is a directory which is not empty
@@ -3274,7 +3208,7 @@ BOOL StatementCommand::Execute()
                             break;
                         case RC_ExistsSysDialog:
                             {
-                                pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_BOOL)xPicker.is() );
+                                pRet->GenReturn ( RET_Value, nMethodId, (comm_BOOL)xPicker.is() );
                             }
                             break;
                         default:
@@ -3308,21 +3242,21 @@ BOOL StatementCommand::Execute()
         case RC_RecordMacro:
             {
                 if ( ! (nParams & PARAM_BOOL_1) )
-                    bBool1 = TRUE;
+                    bBool1 = sal_True;
 
                 MacroRecorder::GetMacroRecorder()->SetActionRecord( bBool1 );
             }
             break;
         case RC_GetDocumentCount :
             {
-                pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_USHORT)GetDocWinCount() );
+                pRet->GenReturn ( RET_Value, nMethodId, (comm_USHORT)GetDocWinCount() );
             }
             break;
         case RC_ActivateDocument :
             {
                 if( nParams & PARAM_USHORT_1 )
                 {
-                    if ( ValueOK(aSmartMethodId, RcString( nMethodId ), nNr1, GetDocWinCount() ) )
+                    if ( ValueOK( rtl::OString(), RcString( nMethodId ), nNr1, GetDocWinCount() ) )
                     {
                         Window* pWin = GetDocWin( nNr1-1 );
                         if ( pWin )
@@ -3338,7 +3272,7 @@ BOOL StatementCommand::Execute()
             break;
         case RC_GetSystemLanguage :
             {
-                pRet->GenReturn ( RET_Value, aSmartMethodId, (comm_USHORT)Application::GetSettings().GetLanguage() );
+                pRet->GenReturn ( RET_Value, nMethodId, (comm_USHORT)Application::GetSettings().GetLanguage() );
             }
             break;
         case RC_CatchGPF :
@@ -3346,18 +3280,18 @@ BOOL StatementCommand::Execute()
                 if( (nParams & PARAM_BOOL_1) )
                     bCatchGPF = bBool1;
                 else
-                    bCatchGPF = TRUE;
+                    bCatchGPF = sal_True;
             }
             break;
         case RC_IsProduct :
             {
-                BOOL bIsProduct;
+                sal_Bool bIsProduct;
                 #ifdef DBG_UTIL
-                    bIsProduct = FALSE;
+                    bIsProduct = sal_False;
                 #else
-                    bIsProduct = TRUE;
+                    bIsProduct = sal_True;
                 #endif
-                pRet->GenReturn ( RET_Value, aSmartMethodId, (BOOL)bIsProduct );
+                pRet->GenReturn ( RET_Value, nMethodId, (sal_Bool)bIsProduct );
             }
             break;
         case RC_UsePostEvents :
@@ -3365,7 +3299,7 @@ BOOL StatementCommand::Execute()
                 if( (nParams & PARAM_BOOL_1) )
                     bUsePostEvents = bBool1;
                 else
-                    bUsePostEvents = TRUE;
+                    bUsePostEvents = sal_True;
             }
             break;
         default:
@@ -3373,38 +3307,38 @@ BOOL StatementCommand::Execute()
     }
     SendProfile( RcString(nMethodId) );
     delete this;
-    return TRUE;
+    return sal_True;
 }
 
 
-BOOL StatementCommand::UnpackStorage( SotStorageRef xStorage, DirEntry &aBaseDir )
+sal_Bool StatementCommand::UnpackStorage( SotStorageRef xStorage, DirEntry &aBaseDir )
 {
     SvStorageInfoList aList;
     xStorage->FillInfoList( &aList );
 
-    for( USHORT i = 0; i < aList.Count(); i++ )
+    for( sal_uInt16 i = 0; i < aList.Count(); i++ )
     {
         SvStorageInfo& rInfo = aList.GetObject( i );
         String aName = rInfo.GetName();
         DirEntry aPath ( aBaseDir );
         aPath += DirEntry( aName );
-        BOOL bIsStorage = xStorage->IsStorage( aName );
+        sal_Bool bIsStorage = xStorage->IsStorage( aName );
         if ( bIsStorage )
         {
             SotStorageRef xSubStorage = xStorage->OpenSotStorage( aName, STREAM_STD_READ );
                 if ( xSubStorage->GetError() )
                 {
                     ReportError( GEN_RES_STR2(S_UNPACKING_STORAGE_FAILED, aName, aPath.GetFull()) );
-                    return FALSE;
+                    return sal_False;
                 }
                 UnpackStorage( xSubStorage, aPath );
         }
         else
         {
-            if ( !aPath.MakeDir( TRUE ) )
+            if ( !aPath.MakeDir( sal_True ) )
             {
                 ReportError( GEN_RES_STR1(S_CANNOT_CREATE_DIRECTORY, aPath.GetFull()) );
-                return FALSE;
+                return sal_False;
             }
             SotStorageStreamRef xStream = xStorage->OpenSotStream( aName, STREAM_STD_READ );
             SvFileStream aDestination( aPath.GetFull(), STREAM_STD_READWRITE | STREAM_TRUNC );
@@ -3412,16 +3346,16 @@ BOOL StatementCommand::UnpackStorage( SotStorageRef xStorage, DirEntry &aBaseDir
             if ( aDestination.GetError() != ERRCODE_NONE )
             {
                 ReportError( GEN_RES_STR2(S_UNPACKING_STORAGE_FAILED, aName, aPath.GetFull()) );
-                return FALSE;
+                return sal_False;
             }
             aDestination.Close();
         }
     }
-    return TRUE;
+    return sal_True;
 }
 
 
-StatementControl::StatementControl( SCmdStream *pCmdIn, USHORT nControlIdType )
+StatementControl::StatementControl( SCmdStream *pCmdIn, sal_uInt16 nControlIdType )
 : StatementList()
 , nNr1( 0 )
 , nNr2( 0 )
@@ -3430,21 +3364,26 @@ StatementControl::StatementControl( SCmdStream *pCmdIn, USHORT nControlIdType )
 , nLNr1( 0 )
 , aString1()
 , aString2()
-, bBool1(FALSE)
-, bBool2(FALSE)
+, bBool1(sal_False)
+, bBool2(sal_False)
 {
     QueStatement( NULL );
+    //HELPID BACKWARD (SIControl is no longer needed)
     if ( nControlIdType == SIControl )
     {
         comm_ULONG nId;
         pCmdIn->Read( nId );
-        aUId = SmartId( nId );
+        aUId = rtl::OString( nId );
+        if ( nId == 0 )
+            aUId = UID_ACTIVE;
+        else
+            ReportError( aUId, GEN_RES_STR1c( S_INTERNAL_ERROR, "using numeric HelpID from old Testtool" ) );
     }
     else if ( nControlIdType == SIStringControl )
     {
         String aId;
         pCmdIn->Read( aId );
-        aUId = SmartId( aId );
+        aUId = Str2Id( aId );
     }
     else
     {
@@ -3466,7 +3405,7 @@ StatementControl::StatementControl( SCmdStream *pCmdIn, USHORT nControlIdType )
 
 #if OSL_DEBUG_LEVEL > 1
     m_pDbgWin->AddText( "Reading Control: UId: " );
-    m_pDbgWin->AddText( aUId.GetText() );
+    m_pDbgWin->AddText( Id2Str( aUId ) );
     m_pDbgWin->AddText( " Methode: " );
     m_pDbgWin->AddText( String::CreateFromInt32( nMethodId ) );
     m_pDbgWin->AddText( " Params:" );
@@ -3481,10 +3420,10 @@ StatementControl::StatementControl( SCmdStream *pCmdIn, USHORT nControlIdType )
 #endif
 }
 
-BOOL IsDialog(Window *pWin)
+sal_Bool IsDialog(Window *pWin)
 {	// Alles was von SystemWindow abgeleitet ist
     if ( !pWin )
-        return FALSE;
+        return sal_False;
 
     switch (pWin->GetType())
     {
@@ -3514,17 +3453,17 @@ BOOL IsDialog(Window *pWin)
         case WINDOW_PATHDIALOG:
 
 
-            return TRUE;
+            return sal_True;
         default:
-            return FALSE;
+            return sal_False;
     }
 }
 
 
-BOOL IsAccessable(Window *pWin)
+sal_Bool IsAccessable(Window *pWin)
 {
     if ( pWin == NULL )
-        return FALSE;
+        return sal_False;
 
     return pWin->IsEnabled() && pWin->IsInputEnabled();
 }
@@ -3534,8 +3473,8 @@ BOOL IsAccessable(Window *pWin)
 // neue Hilfsfunktion
 static Window*ImpGetButton( Window *pBase, WinBits nMask, WinBits nWinBits )
 {
-    USHORT n = pBase->GetChildCount();
-    for( USHORT i = 0 ; i < n; i++ ) {
+    sal_uInt16 n = pBase->GetChildCount();
+    for( sal_uInt16 i = 0 ; i < n; i++ ) {
         Window *pChild = pBase->GetChild(i);
         if(    pChild->GetType() == WINDOW_OKBUTTON
             || pChild->GetType() == WINDOW_CANCELBUTTON
@@ -3547,12 +3486,12 @@ static Window*ImpGetButton( Window *pBase, WinBits nMask, WinBits nWinBits )
     return NULL;
 }
 
-BOOL StatementControl::ControlOK( Window *pControl, const sal_Char* cBezeichnung )
+sal_Bool StatementControl::ControlOK( Window *pControl, const sal_Char* cBezeichnung )
 {
     if ( pControl && ( ( ( IsAccessable(pControl) || (nMethodId & M_WITH_RETURN) ) &&
                          pControl->IsVisible() ) ||
-                         aUId.Matches( UID_ACTIVE ) ) )
-        return TRUE;
+                         aUId.equals( UID_ACTIVE ) ) )
+        return sal_True;
     else
     {
         UniString aBezeichnung( cBezeichnung, RTL_TEXTENCODING_ASCII_US );
@@ -3569,30 +3508,30 @@ BOOL StatementControl::ControlOK( Window *pControl, const sal_Char* cBezeichnung
         m_pDbgWin->AddText( aBezeichnung.AppendAscii(" NotFound or Disabled or Invisible") );
         #endif
 
-        return FALSE;
+        return sal_False;
     }
 }
 
 
-BOOL StatementList::ValueOK( SmartId aId, String aBezeichnung, ULONG nValue, ULONG nMax )
+sal_Bool StatementList::ValueOK( rtl::OString aId, String aBezeichnung, sal_uLong nValue, sal_uLong nMax )
 {
 
     if ( nMax < nValue )
     {
         if ( aBezeichnung.Len() > 0 )
             ReportError( aId, GEN_RES_STR3( S_NUMBER_TOO_BIG, aBezeichnung, UniString::CreateFromInt32( nValue ), UniString::CreateFromInt32( nMax ) ) );
-        return FALSE;
+        return sal_False;
     }
     if ( nValue < 1 )
     {
         if ( aBezeichnung.Len() > 0 )
             ReportError( aId, GEN_RES_STR3c3( S_NUMBER_TOO_SMALL, aBezeichnung, UniString::CreateFromInt32( nValue ), "1" ) );
-        return FALSE;
+        return sal_False;
     }
-    return TRUE;
+    return sal_True;
 }
 
-USHORT StatementList::GetCurrentMenues( PopupMenu *&pPopup, MenuBar *&pMenuBar, Menu *&pMenu )
+sal_uInt16 StatementList::GetCurrentMenues( PopupMenu *&pPopup, MenuBar *&pMenuBar, Menu *&pMenu )
 {
     if ( WinPtrValid( pMenuWindow ) )
         pMenuBar = pMenuWindow->GetMenuBar();
@@ -3608,24 +3547,21 @@ USHORT StatementList::GetCurrentMenues( PopupMenu *&pPopup, MenuBar *&pMenuBar,
     if ( !pMenu )
         return 1;
 
-    if ( aSubMenuId1.GetNum() )
+    if ( aSubMenuId1 )
     {
-        pPopup = pMenu->GetPopupMenu(
-            sal::static_int_cast< USHORT >(aSubMenuId1.GetNum()));
+        pPopup = pMenu->GetPopupMenu( aSubMenuId1 );
         pMenu = pPopup;
     }
 
-    if ( pMenu && aSubMenuId2.GetNum() )
+    if ( pMenu && aSubMenuId2 )
     {
-        pPopup = pMenu->GetPopupMenu(
-            sal::static_int_cast< USHORT >(aSubMenuId2.GetNum()));
+        pPopup = pMenu->GetPopupMenu( aSubMenuId2 );
         pMenu = pPopup;
     }
 
-    if ( pMenu && aSubMenuId3.GetNum() )
+    if ( pMenu && aSubMenuId3 )
     {
-        pPopup = pMenu->GetPopupMenu(
-            sal::static_int_cast< USHORT >(aSubMenuId3.GetNum()));
+        pPopup = pMenu->GetPopupMenu( aSubMenuId3 );
         pMenu = pPopup;
     }
 
@@ -3681,8 +3617,8 @@ void StatementControl::AnimateMouse( Window *pControl, Point aWohin )
     aDiff *= 1000;
     aDiff /= nSteps;
 
-    StatementList::bExecuting = TRUE;		// Bah ist das ein ekliger Hack
-                                                // Das verhindert, daß schon der nächste Befehl ausgeführt wird.
+    StatementList::bExecuting = sal_True;		// Bah ist das ein ekliger Hack
+                                                // Das verhindert, da� schon der n�chste Befehl ausgef�hrt wird.
 
     for ( ; nSteps ; nSteps-- )
     {
@@ -3694,37 +3630,37 @@ void StatementControl::AnimateMouse( Window *pControl, Point aWohin )
         SafeReschedule();
     }
     pControl->SetPointerPosPixel(aZiel);
-    StatementList::bExecuting = FALSE;	// Bah ist das ein ekliger Hack
+    StatementList::bExecuting = sal_False;	// Bah ist das ein ekliger Hack
 }
 
 
-BOOL StatementControl::MaybeDoTypeKeysDelay( Window *pTestWindow )
+sal_Bool StatementControl::MaybeDoTypeKeysDelay( Window *pTestWindow )
 {
     if ( bDoTypeKeysDelay )
     {
-        ULONG nTimeWait = nMinTypeKeysDelay;
+        sal_uLong nTimeWait = nMinTypeKeysDelay;
         if ( nMaxTypeKeysDelay != nMinTypeKeysDelay )
             nTimeWait  += Time::GetSystemTicks() % ( nMaxTypeKeysDelay - nMinTypeKeysDelay );
         Timer aTimer;
         aTimer.SetTimeout( nTimeWait );
         aTimer.Start();
-        StatementList::bExecuting = TRUE;		// Bah ist das ein ekliger Hack
-                                                    // Das verhindert, daß schon der nächste Befehl ausgeführt wird.
+        StatementList::bExecuting = sal_True;		// Bah ist das ein ekliger Hack
+                                                    // Das verhindert, da� schon der n�chste Befehl ausgef�hrt wird.
         while ( aTimer.IsActive() )
         {
-            SafeReschedule( TRUE );
+            SafeReschedule( sal_True );
         }
-        StatementList::bExecuting = FALSE;	// Bah ist das ein ekliger Hack
+        StatementList::bExecuting = sal_False;	// Bah ist das ein ekliger Hack
         if ( !WinPtrValid(pTestWindow ) )
         {
             ReportError( aUId, GEN_RES_STR1( S_WINDOW_DISAPPEARED, MethodString( nMethodId ) ) );
-            return FALSE;
+            return sal_False;
         }
     }
-    return TRUE;
+    return sal_True;
 }
 
-BOOL StatementControl::HandleVisibleControls( Window *pControl )
+sal_Bool StatementControl::HandleVisibleControls( Window *pControl )
 {
     if( pControl )		// Also auch bei Disabled nicht jedoch bei Invisible
     {
@@ -3738,11 +3674,11 @@ BOOL StatementControl::HandleVisibleControls( Window *pControl )
             break;
         case M_GetPosX:
             if ( pControl->GetType() == WINDOW_DOCKINGWINDOW && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_FLOATINGWINDOW )
-                pControl = pControl->GET_REAL_PARENT();		// Sonderbehandlung für FloatingWindows
+                pControl = pControl->GET_REAL_PARENT();		// Sonderbehandlung f�r FloatingWindows
             if ( pControl->GetType() == WINDOW_TABCONTROL && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_TABDIALOG )
-                pControl = pControl->GET_REAL_PARENT();		// Sonderbehandlung für TabDialoge
+                pControl = pControl->GET_REAL_PARENT();		// Sonderbehandlung f�r TabDialoge
             if ( pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_BORDERWINDOW )
-                pControl = pControl->GET_REAL_PARENT();		// Sonderbehandlung für Border
+                pControl = pControl->GET_REAL_PARENT();		// Sonderbehandlung f�r Border
             if ( (nParams & PARAM_BOOL_1) && bBool1 )
                 pControl = pControl->GetWindow( WINDOW_OVERLAP );
 
@@ -3757,11 +3693,11 @@ BOOL StatementControl::HandleVisibleControls( Window *pControl )
             break;
         case M_GetPosY:
             if ( pControl->GetType() == WINDOW_DOCKINGWINDOW && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_FLOATINGWINDOW )
-                pControl = pControl->GET_REAL_PARENT();		// Sonderbehandlung für FloatingWindows
+                pControl = pControl->GET_REAL_PARENT();		// Sonderbehandlung f�r FloatingWindows
             if ( pControl->GetType() == WINDOW_TABCONTROL && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_TABDIALOG )
-                pControl = pControl->GET_REAL_PARENT();		// Sonderbehandlung für TabDialoge
+                pControl = pControl->GET_REAL_PARENT();		// Sonderbehandlung f�r TabDialoge
             if ( pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_BORDERWINDOW )
-                pControl = pControl->GET_REAL_PARENT();		// Sonderbehandlung für Border
+                pControl = pControl->GET_REAL_PARENT();		// Sonderbehandlung f�r Border
             if ( (nParams & PARAM_BOOL_1) && bBool1 )
                 pControl = pControl->GetWindow( WINDOW_OVERLAP );
 
@@ -3776,11 +3712,11 @@ BOOL StatementControl::HandleVisibleControls( Window *pControl )
             break;
         case M_GetSizeX:
             if ( pControl->GetType() == WINDOW_DOCKINGWINDOW && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_FLOATINGWINDOW )
-                pControl = pControl->GET_REAL_PARENT();		// Sonderbehandlung für FloatingWindows
+                pControl = pControl->GET_REAL_PARENT();		// Sonderbehandlung f�r FloatingWindows
             if ( pControl->GetType() == WINDOW_TABCONTROL && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_TABDIALOG )
-                pControl = pControl->GET_REAL_PARENT();		// Sonderbehandlung für TabDialoge
+                pControl = pControl->GET_REAL_PARENT();		// Sonderbehandlung f�r TabDialoge
             if ( pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_BORDERWINDOW )
-                pControl = pControl->GET_REAL_PARENT();		// Sonderbehandlung für Border
+                pControl = pControl->GET_REAL_PARENT();		// Sonderbehandlung f�r Border
             if ( (nParams & PARAM_BOOL_1) && bBool1 )
                 pControl = pControl->GetWindow( WINDOW_OVERLAP );
 
@@ -3788,11 +3724,11 @@ BOOL StatementControl::HandleVisibleControls( Window *pControl )
             break;
         case M_GetSizeY:
             if ( pControl->GetType() == WINDOW_DOCKINGWINDOW && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_FLOATINGWINDOW )
-                pControl = pControl->GET_REAL_PARENT();		// Sonderbehandlung für FloatingWindows
+                pControl = pControl->GET_REAL_PARENT();		// Sonderbehandlung f�r FloatingWindows
             if ( pControl->GetType() == WINDOW_TABCONTROL && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_TABDIALOG )
-                pControl = pControl->GET_REAL_PARENT();		// Sonderbehandlung für TabDialoge
+                pControl = pControl->GET_REAL_PARENT();		// Sonderbehandlung f�r TabDialoge
             if ( pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_BORDERWINDOW )
-                pControl = pControl->GET_REAL_PARENT();		// Sonderbehandlung für Border
+                pControl = pControl->GET_REAL_PARENT();		// Sonderbehandlung f�r Border
             if ( (nParams & PARAM_BOOL_1) && bBool1 )
                 pControl = pControl->GetWindow( WINDOW_OVERLAP );
 
@@ -3801,11 +3737,11 @@ BOOL StatementControl::HandleVisibleControls( Window *pControl )
         case M_SnapShot:
             {
                 if ( pControl->GetType() == WINDOW_DOCKINGWINDOW && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_FLOATINGWINDOW )
-                    pControl = pControl->GET_REAL_PARENT();		// Sonderbehandlung für FloatingWindows
+                    pControl = pControl->GET_REAL_PARENT();		// Sonderbehandlung f�r FloatingWindows
                 if ( pControl->GetType() == WINDOW_TABCONTROL && pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_TABDIALOG )
-                    pControl = pControl->GET_REAL_PARENT();		// Sonderbehandlung für TabDialoge
+                    pControl = pControl->GET_REAL_PARENT();		// Sonderbehandlung f�r TabDialoge
                 if ( pControl->GET_REAL_PARENT() && pControl->GET_REAL_PARENT()->GetType() == WINDOW_BORDERWINDOW )
-                    pControl = pControl->GET_REAL_PARENT();		// Sonderbehandlung für Border
+                    pControl = pControl->GET_REAL_PARENT();		// Sonderbehandlung f�r Border
                 if ( (nParams & PARAM_BOOL_1) && bBool1 )
                     pControl = pControl->GetWindow( WINDOW_OVERLAP );
 
@@ -3819,15 +3755,15 @@ BOOL StatementControl::HandleVisibleControls( Window *pControl )
                         nParams |= PARAM_USHORT_2;
                         nParams |= PARAM_USHORT_3;
                         nParams |= PARAM_USHORT_4;
-                        nNr1 = (USHORT)-aStart.X();
-                        nNr2 = (USHORT)-aStart.Y();
-                        nNr3 = (USHORT)pControl->GetSizePixel().Width() + 2*(USHORT)aStart.X();
-                        nNr4 = (USHORT)pControl->GetSizePixel().Height() + 2*(USHORT)aStart.Y();
+                        nNr1 = (sal_uInt16)-aStart.X();
+                        nNr2 = (sal_uInt16)-aStart.Y();
+                        nNr3 = (sal_uInt16)pControl->GetSizePixel().Width() + 2*(sal_uInt16)aStart.X();
+                        nNr4 = (sal_uInt16)pControl->GetSizePixel().Height() + 2*(sal_uInt16)aStart.Y();
                     }
-                    nNr1 = std::max((USHORT)-aStart.X(),nNr1);
-                    nNr2 = std::max((USHORT)-aStart.Y(),nNr2);
-                    nNr3 = std::min((USHORT)(pControl->GetSizePixel().Width() + 2*(USHORT)aStart.X()),nNr3);
-                    nNr4 = std::min((USHORT)(pControl->GetSizePixel().Height() + 2*(USHORT)aStart.Y()),nNr4);
+                    nNr1 = std::max((sal_uInt16)-aStart.X(),nNr1);
+                    nNr2 = std::max((sal_uInt16)-aStart.Y(),nNr2);
+                    nNr3 = std::min((sal_uInt16)(pControl->GetSizePixel().Width() + 2*(sal_uInt16)aStart.X()),nNr3);
+                    nNr4 = std::min((sal_uInt16)(pControl->GetSizePixel().Height() + 2*(sal_uInt16)aStart.Y()),nNr4);
                 }
                 if( nParams & PARAM_USHORT_4 )
                 {	// Zuschneiden
@@ -3850,7 +3786,7 @@ BOOL StatementControl::HandleVisibleControls( Window *pControl )
             break;
         case M_GetFixedTextCount:
             {
-                pRet->GenReturn ( RET_Value, aUId, CountWinByRT( pControl, WINDOW_FIXEDTEXT, TRUE ) );
+                pRet->GenReturn ( RET_Value, aUId, CountWinByRT( pControl, WINDOW_FIXEDTEXT, sal_True ) );
             }
             break;
         case M_GetFixedText:
@@ -3858,27 +3794,27 @@ BOOL StatementControl::HandleVisibleControls( Window *pControl )
                 if( ( nParams & PARAM_USHORT_1 ) == 0 )
                     nNr1 = 1;
 
-                FixedText* pFixedText = (FixedText*)GetWinByRT( pControl, WINDOW_FIXEDTEXT, TRUE, nNr1-1 );
+                FixedText* pFixedText = (FixedText*)GetWinByRT( pControl, WINDOW_FIXEDTEXT, sal_True, nNr1-1 );
                 if ( pFixedText )
                     pRet->GenReturn ( RET_Value, aUId, pFixedText->GetText() );
                 else
-                    ValueOK(aUId, MethodString( nMethodId ),nNr1,CountWinByRT( pControl, WINDOW_FIXEDTEXT, TRUE ) );
+                    ValueOK(aUId, MethodString( nMethodId ),nNr1,CountWinByRT( pControl, WINDOW_FIXEDTEXT, sal_True ) );
             }
             break;
         default:
-            return FALSE;
+            return sal_False;
         }
         SendProfile( UIdString( aUId ).Append('.').Append( MethodString( nMethodId ) ) );
-        return TRUE;
+        return sal_True;
     }
-    return FALSE;
+    return sal_False;
 }
 
-BOOL StatementControl::HandleCommonMethods( Window *pControl )
+sal_Bool StatementControl::HandleCommonMethods( Window *pControl )
 {
-    switch( nMethodId )		// Diese können an jedem Window ausgeführt werden
+    switch( nMethodId )		// Diese k�nnen an jedem Window ausgef�hrt werden
     {
-        case M_Exists:			// Oben schon Behandelt. Unterdrückt hier nur Fehler
+        case M_Exists:			// Oben schon Behandelt. Unterdr�ckt hier nur Fehler
         case M_NotExists:
         case M_IsEnabled:
         case M_IsVisible:
@@ -3902,14 +3838,14 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl )
                 if( !(nParams & PARAM_USHORT_1) )	// Anzahl wiederholungen
                     nNr1 = 1;
                 if( !(nParams & PARAM_BOOL_1) )		// Follow Focus
-                    bBool1 = FALSE;		// so bleibt das bisherige Verhalten
+                    bBool1 = sal_False;		// so bleibt das bisherige Verhalten
 
                 if ( !bBool1 )			// Altes Verhalten
                     pControl->GrabFocus();
                 else    // If focus is not inside given control we grab it once.
                 {
                     Window *pFocus = GetpApp()->GetFocusWindow();
-                    if ( !pFocus || !pControl->IsWindowOrChild( pFocus, TRUE ) )
+                    if ( !pFocus || !pControl->IsWindowOrChild( pFocus, sal_True ) )
                         pControl->GrabFocus();
                 }
 
@@ -3918,7 +3854,7 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl )
                 if ( pControl->GetType() == WINDOW_COMBOBOX )
                 {	// Bei COMBOBOX an das Edit direkt liefern
                     Window *pTemp = NULL;
-                    for ( USHORT i = 0 ; i < pControl->GetChildCount() && !pTemp ; i++ )
+                    for ( sal_uInt16 i = 0 ; i < pControl->GetChildCount() && !pTemp ; i++ )
                         if ( pControl->GetChild( i )->GetType() == WINDOW_EDIT )
                             pTemp = pControl->GetChild( i );
                     if ( pTemp )
@@ -3932,22 +3868,22 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl )
                          if ( StatementList::bUsePostEvents )
                         { // grab focus every time
                             Window *pFocus = GetpApp()->GetFocusWindow();
-                            if ( !pFocus || !pControl->IsWindowOrChild( pFocus, TRUE ) )
+                            if ( !pFocus || !pControl->IsWindowOrChild( pFocus, sal_True ) )
                                 pControl->GrabFocus();
                         }
                         if ( bBool1 )	// Jedesmal das FocusWindow finden
                         {
                             Window *pFocus = GetpApp()->GetFocusWindow();
-                            if ( pFocus && pControl->IsWindowOrChild( pFocus, TRUE ) )
+                            if ( pFocus && pControl->IsWindowOrChild( pFocus, sal_True ) )
                                 pDeliverHere = pFocus;
                             else	// sonst fallback auf das Basisfenster
                                 pDeliverHere = pControl;
                         }
                         pDeliverHere = pDeliverHere->GetPreferredKeyInputWindow();
                         KeyEvent aEvent;
-                        if ( ((USHORT)aString1.GetChar(i)) <= 7 )
+                        if ( ((sal_uInt16)aString1.GetChar(i)) <= 7 )
                         {
-                            USHORT nVal = 0;
+                            sal_uInt16 nVal = 0;
                             switch (aString1.GetChar(i))
                             {
                                 case 1: nVal = aString1.GetChar(i+1) + (aString1.GetChar(i+2) << 8);
@@ -3964,8 +3900,8 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl )
                             }
                             // #105672#
                             // find out the keycode
-                            USHORT nKeygroup = nVal & KEYGROUP_TYPE;
-                            USHORT nKeyCode = nVal & KEY_CODE;
+                            sal_uInt16 nKeygroup = nVal & KEYGROUP_TYPE;
+                            sal_uInt16 nKeyCode = nVal & KEY_CODE;
                             sal_Unicode aCh;
                             switch (nKeygroup)
                             {
@@ -4010,7 +3946,7 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl )
                             else if ( aCh >= '0' && aCh <= '9' )
                                 aEvent = KeyEvent(aCh, KeyCode(KEYGROUP_NUM + aCh-'0', 0));
                             else if ( aPrintableMisc.Search(aCh) != STRING_NOTFOUND )
-                                aEvent = KeyEvent(aCh, KeyCode(KEYGROUP_MISC + (USHORT)aPrintableMisc.Search(aCh), 0));
+                                aEvent = KeyEvent(aCh, KeyCode(KEYGROUP_MISC + (sal_uInt16)aPrintableMisc.Search(aCh), 0));
                             else	// Sollte eigentlich nicht auftreten
                                 aEvent = KeyEvent(aCh, KeyCode());
                         }
@@ -4024,7 +3960,7 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl )
             break;
 
 #define CalcMouseButton\
-    USHORT nButton = MOUSE_LEFT;\
+    sal_uInt16 nButton = MOUSE_LEFT;\
     if ( (nParams & PARAM_USHORT_3) )\
     {\
         switch ( nNr3 )\
@@ -4121,10 +4057,10 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl )
 
                 Edit *pMyEd = new Edit(pDlg,WB_CENTER | WB_BORDER );
                 pMyEd->SetSizePixel(Size(100,30));
-                pDlg->SetText(UniString("Schließen", RTL_TEXTENCODING_ISO_8859_1));
+                pDlg->SetText(UniString("Schlie�en", RTL_TEXTENCODING_ISO_8859_1));
                 pDlg->Show();
                 pMyEd->Show();
-                ULONG nTime = Time().GetTime();
+                sal_uLong nTime = Time().GetTime();
 
                 while (pDlg->IsVisible())
                 {
@@ -4146,9 +4082,9 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl )
             break;
         case M_OpenContextMenu:
             {
-                aSubMenuId1 = SmartId();
-                aSubMenuId2 = SmartId();
-                aSubMenuId3 = SmartId();
+                aSubMenuId1 = 0;
+                aSubMenuId2 = 0;
+                aSubMenuId3 = 0;
                 pMenuWindow = NULL;
                 Point aPos;
                 ToolBox* pTB = (ToolBox*)pControl;
@@ -4158,7 +4094,7 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl )
                 }
                 else
                 {
-                    BOOL bAtMousePos = ( nParams & PARAM_BOOL_1 ) && bBool1;
+                    sal_Bool bAtMousePos = ( nParams & PARAM_BOOL_1 ) && bBool1;
                     if ( bAtMousePos )
                     {
                         aPos = pControl->GetPointerPosPixel();
@@ -4177,9 +4113,9 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl )
             break;
         case M_UseMenu:
             {
-                aSubMenuId1 = SmartId();
-                aSubMenuId2 = SmartId();
-                aSubMenuId3 = SmartId();
+                aSubMenuId1 = 0;
+                aSubMenuId2 = 0;
+                aSubMenuId3 = 0;
                 pMenuWindow = NULL;
 
                 while ( pControl && !( ( pControl->GetType() == WINDOW_SYSWINDOW || pControl->GetType() == WINDOW_WORKWINDOW ) && ControlOK( pControl, "" ) ) )
@@ -4232,7 +4168,7 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl )
                     break;
                 }
 
-                pControl = pTemp;	// So daß wir unten ohne Fehler durchkommen
+                pControl = pTemp;	// So da� wir unten ohne Fehler durchkommen
                 SplitWindow *pSW = (SplitWindow*) pTemp;
 
                 switch( nMethodId )
@@ -4276,7 +4212,7 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl )
                 StatusBar *pStatus = NULL;
                 while ( !pStatus && pControl )
                 {
-                    pStatus = (StatusBar*)GetWinByRT( pControl, WINDOW_STATUSBAR, TRUE );
+                    pStatus = (StatusBar*)GetWinByRT( pControl, WINDOW_STATUSBAR, sal_True );
                     pControl = pControl->GET_REAL_PARENT();
                 }
 
@@ -4353,10 +4289,10 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl )
 
                 ScrollBar *pScroll = NULL;
 
-                USHORT nSteps = 2;
+                sal_uInt16 nSteps = 2;
                 while ( !pScroll && pControl && nSteps-- )
                 {
-                    pScroll = GetScrollBar( pControl, nNr1, TRUE );
+                    pScroll = GetScrollBar( pControl, nNr1, sal_True );
                     pControl = pControl->GET_REAL_PARENT();
                 }
 
@@ -4365,9 +4301,9 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl )
                     case M_HasScrollBar:
                         {
                             if ( pScroll )
-                                pRet->GenReturn ( RET_Value, aUId, (comm_BOOL)TRUE );
+                                pRet->GenReturn ( RET_Value, aUId, (comm_BOOL)sal_True );
                             else
-                                pRet->GenReturn ( RET_Value, aUId, (comm_BOOL)FALSE );
+                                pRet->GenReturn ( RET_Value, aUId, (comm_BOOL)sal_False );
                         }
                         break;
                     case M_IsScrollBarEnabled:
@@ -4384,47 +4320,47 @@ BOOL StatementControl::HandleCommonMethods( Window *pControl )
             }
             break;
         default:
-            return FALSE;
+            return sal_False;
     }
-    return TRUE;
+    return sal_True;
 }
 
 
-BOOL StatementControl::Execute()
+sal_Bool StatementControl::Execute()
 {
     Window *pControl;
-    BOOL bStatementDone = TRUE;
+    sal_Bool bStatementDone = sal_True;
 
 
     if ( IsError )
     {
         #if OSL_DEBUG_LEVEL > 1
         m_pDbgWin->AddText( "Skipping Window: " );
-        m_pDbgWin->AddText( aUId.GetText() );
+        m_pDbgWin->AddText( Id2Str( aUId ) );
         m_pDbgWin->AddText( " Method: " );
         m_pDbgWin->AddText( String::CreateFromInt32( nMethodId ) );
         m_pDbgWin->AddText( "\n" );
         #endif
         Advance();
         delete this;
-        return TRUE;
+        return sal_True;
     }
 
     InitProfile();
 #if OSL_DEBUG_LEVEL > 1
     m_pDbgWin->AddText( "Executing Window: " );
-    m_pDbgWin->AddText( aUId.GetText() );
+    m_pDbgWin->AddText( Id2Str( aUId ) );
     m_pDbgWin->AddText( " Method: " );
     m_pDbgWin->AddText( String::CreateFromInt32( nMethodId ) );
     m_pDbgWin->AddText( "\n" );
 #endif
 
 
-    if ( aUId.Matches( UID_ACTIVE ) )
+    if ( aUId.equals( UID_ACTIVE ) )
         pControl = GetAnyActive();
     else
     {
-        BOOL bSearchButtonOnToolbox = (nParams == PARAM_NONE) && ((M_Click == nMethodId) || (M_TearOff == nMethodId) || (M_IsEnabled == nMethodId) || (M_OpenMenu == nMethodId));
+        sal_Bool bSearchButtonOnToolbox = (nParams == PARAM_NONE) && ((M_Click == nMethodId) || (M_TearOff == nMethodId) || (M_IsEnabled == nMethodId) || (M_OpenMenu == nMethodId));
         bSearchButtonOnToolbox |= (nParams == PARAM_USHORT_1) && (M_GetState == nMethodId);
         if ( nMethodId == M_TypeKeys || nMethodId == M_MouseDown
             || nMethodId == M_MouseUp || nMethodId ==  M_MouseMove
@@ -4441,7 +4377,7 @@ BOOL StatementControl::Execute()
 
     if ( pControl && pControl->GetType() == WINDOW_TOOLBOX )
     {
-        if ( !aUId.Matches( pControl->GetSmartUniqueOrHelpId() ) )
+        if ( !aUId.equals( pControl->GetUniqueOrHelpId() ) )
         {   // Also wenn wir irgendwas auf einer Toolbox gefunden haben
             switch ( nMethodId )
             {
@@ -4465,13 +4401,13 @@ BOOL StatementControl::Execute()
         case M_Exists:
         case M_NotExists:
             Time aT;
-            USHORT aSeconds = aT.GetMin()*60+aT.GetSec();
-            if ( !bBool2 )			// wurde im Konstruktor auf FALSE gesetzt
+            sal_uInt16 aSeconds = aT.GetMin()*60+aT.GetSec();
+            if ( !bBool2 )			// wurde im Konstruktor auf sal_False gesetzt
             {
-                bBool2 = TRUE;
+                bBool2 = sal_True;
                 nNr2 = aSeconds;
                 if( !(nParams & PARAM_USHORT_1) )
-                    nNr1 = 0;		// defaultmäßig sofort zurück
+                    nNr1 = 0;		// defaultm��ig sofort zur�ck
             }
             if ( aSeconds < nNr2 )			// Falls die Stunde umgesprungen ist
                 aSeconds += 60*60;
@@ -4480,18 +4416,18 @@ BOOL StatementControl::Execute()
                 pControl = NULL;
             if ( ((nMethodId == M_Exists) && pControl) ||
                  ((nMethodId == M_NotExists) && !pControl) )
-            {	// Wenn Bedingung erfüllt
-                pRet->GenReturn ( RET_Value, aUId, (comm_BOOL)TRUE );
+            {	// Wenn Bedingung erf�llt
+                pRet->GenReturn ( RET_Value, aUId, (comm_BOOL)sal_True );
             }
             else
                 if ( aSeconds <= nNr2 + nNr1 )		// Zeit ist noch nicht abgelaufen
-                    return FALSE;
+                    return sal_False;
                 else
-                    pRet->GenReturn ( RET_Value, aUId, (comm_BOOL)FALSE );
+                    pRet->GenReturn ( RET_Value, aUId, (comm_BOOL)sal_False );
 
             Advance();
             delete this;
-            return TRUE;
+            return sal_True;
     }
 
 
@@ -4499,7 +4435,7 @@ BOOL StatementControl::Execute()
 
     if( pControl )			// Das Fenster Existiert irgendwo, kann aber auch hidden sein!
     {
-        nRT = ImpGetRType( pControl, aUId );   // If not Numeric pControl is used
+        nRT = ImpGetRType( pControl );
 #if OSL_DEBUG_LEVEL > 1
         m_pDbgWin->AddText( "Type is: " );
         m_pDbgWin->AddText( String::CreateFromInt32( nRT ) );
@@ -4533,7 +4469,7 @@ BOOL StatementControl::Execute()
 #if OSL_DEBUG_LEVEL > 1
         m_pDbgWin->AddText( CUniString("Reschedule command (").Append( UniString::CreateFromInt32(nRetryCount) ).AppendAscii(")\n") );
 #endif
-        return FALSE;
+        return sal_False;
     }
 
     if( ControlOK( pControl, "" ) )
@@ -4541,13 +4477,13 @@ BOOL StatementControl::Execute()
         if ( nMethodId == M_OpenContextMenu && !bBool2 )
         {
             pControl->GrabFocus();  // to get asyncron focus on unix
-            bBool2 = TRUE;
-            return FALSE;
+            bBool2 = sal_True;
+            return sal_False;
         }
         // TODO: handle GetFocus for all Methods and Windows like this (remove part below)
         //       See for impact of changed focus for HandleVisibleControls() (taking Snapshots might be different, possible exclude those methods)
         if (( (nRT == C_TreeListBox) && !bBool2 )
-            && nMethodId != M_TypeKeys			// TypeKeys macht das selbst, falls eigenes Focushandling gewünscht
+            && nMethodId != M_TypeKeys			// TypeKeys macht das selbst, falls eigenes Focushandling gew�nscht
             && nMethodId != M_MouseDown
             && nMethodId != M_MouseUp
             && nMethodId != M_MouseMove )
@@ -4560,12 +4496,12 @@ BOOL StatementControl::Execute()
                 {
                     SafeReschedule();
                     if ( !WinPtrValid( pControl ) )
-                        return FALSE;
+                        return sal_False;
                 }
                 if ( !pControl->HasFocus() )  // to get asyncronous focus
                 {
-                    bBool2 = TRUE;
-                    return FALSE;
+                    bBool2 = sal_True;
+                    return sal_False;
                 }
             }
         }
@@ -4576,7 +4512,7 @@ BOOL StatementControl::Execute()
     if ( HandleVisibleControls( pControl ) )
     {
         delete this;
-        return TRUE;
+        return sal_True;
     }
     if( ControlOK( pControl, "Window/Control" ) )
     {
@@ -4588,7 +4524,7 @@ BOOL StatementControl::Execute()
               || nRT == C_TreeListBox
              )
             || nMethodId == M_OpenContextMenu )
-            && nMethodId != M_TypeKeys			// TypeKeys macht das selbst, falls eigenes Focushandling gewünscht
+            && nMethodId != M_TypeKeys			// TypeKeys macht das selbst, falls eigenes Focushandling gew�nscht
             && nMethodId != M_MouseDown
             && nMethodId != M_MouseUp
             && nMethodId != M_MouseMove )
@@ -4629,38 +4565,40 @@ BOOL StatementControl::Execute()
                             }
                             break;
                         case M_GetPage:
-                            pRet->GenReturn ( RET_Value, aUId, ((TabControl*)pControl)->GetTabPage(((TabControl*)pControl)->GetCurPageId())->GetSmartUniqueOrHelpId().GetText());
+                            pRet->GenReturn ( RET_Value, aUId, Id2Str( ((TabControl*)pControl)->GetTabPage(((TabControl*)pControl)->GetCurPageId())->GetUniqueOrHelpId() ) );
                             break;
                         case M_SetPage :
                             {		// Wegen lokaler Variablen
                                 TabControl *pTControl = ((TabControl*)pControl);
-                                USHORT nActive = pTControl->GetCurPageId();
-                                USHORT i,anz;
-                                SmartId aID;
-                                SmartId aWantedID;
+                                sal_uInt16 nActive = pTControl->GetCurPageId();
+                                sal_uInt16 i,anz;
+                                rtl::OString aID;
+                                rtl::OString aWantedID;
+                                //HELPID BACKWARD (No numbers please (remove PARAM_ULONG_1 part)
                                 if ( (nParams & PARAM_ULONG_1) )
                                 {
-                                    aWantedID = SmartId( nLNr1 );
+                                    //aWantedID = rtl::OString( nLNr1 );
+                                    ReportError( aUId, GEN_RES_STR1c( S_INTERNAL_ERROR, "using numeric HelpID from old Testtool" ) );
                                 }
                                 else if ( (nParams & PARAM_STR_1) )
                                 {
-                                    aWantedID = SmartId( aString1 );
+                                    aWantedID = Str2Id( aString1 );
                                 }
                                 else
                                     ReportError( aUId, GEN_RES_STR1( S_INTERNAL_ERROR, MethodString( nMethodId ) ) );
 
                                 i = pTControl->GetPagePos( pTControl->GetCurPageId() );
-                                for ( anz=0 ; anz < pTControl->GetPageCount() && !aID.Matches( aWantedID ) ; anz++ )
+                                for ( anz=0 ; anz < pTControl->GetPageCount() && !aID.equals( aWantedID ) ; anz++ )
                                 {
                                     pTControl->SelectTabPage( pTControl->GetPageId(i) );
-                                    aID = pTControl->GetTabPage(pTControl->GetCurPageId())->GetSmartUniqueOrHelpId();
+                                    aID = pTControl->GetTabPage(pTControl->GetCurPageId())->GetUniqueOrHelpId();
                                     i++;
                                     if ( i >= pTControl->GetPageCount() )
                                         i = 0;
                                     if ( !MaybeDoTypeKeysDelay( pTControl ) || !MaybeDoTypeKeysDelay( pTControl ) || !MaybeDoTypeKeysDelay( pTControl ) )	// 3 Mal aufrufen
                                         break;
                                 }
-                                if ( !aID.Matches( aWantedID ) )
+                                if ( !aID.equals( aWantedID ) )
                                 {
                                     pTControl->SelectTabPage( nActive );
                                     ReportError( aWantedID, GEN_RES_STR1( S_TABPAGE_NOT_FOUND, MethodString( nMethodId ) ) );
@@ -4822,21 +4760,21 @@ BOOL StatementControl::Execute()
                         case M_Select:
                         case M_MultiSelect:
                             {
-                                BOOL bUnselectBeforeSelect = ( nMethodId == M_Select );
-                                BOOL bFehler = FALSE;
+                                sal_Bool bUnselectBeforeSelect = ( nMethodId == M_Select );
+                                sal_Bool bFehler = sal_False;
                                 if ( ! (nParams & PARAM_BOOL_1) )
-                                    bBool1 = TRUE;
+                                    bBool1 = sal_True;
 
                                 if ( nMethodId == M_MultiSelect && nRT == C_ListBox )
                                 {
                                     ReportError( aUId, GEN_RES_STR2c2( S_UNKNOWN_METHOD, MethodString(nMethodId), "ListBox" ) );
-                                    bFehler = TRUE;
+                                    bFehler = sal_True;
                                 }
 
                                 if ( !bBool1 && nMethodId == M_Select )
                                 {
                                     ReportError( aUId, GEN_RES_STR1( S_NO_SELECT_FALSE, MethodString( nMethodId ) ) );
-                                    bFehler = TRUE;
+                                    bFehler = sal_True;
                                 }
 
                                 if ( !bFehler )
@@ -4844,7 +4782,7 @@ BOOL StatementControl::Execute()
                                     if( nParams & PARAM_STR_1 )
                                     {
                                         ListBox *pLB = ((ListBox*)pControl);
-                                        USHORT nPos;
+                                        sal_uInt16 nPos;
                                         if ( (nPos = pLB->GetEntryPos( aString1 )) == LISTBOX_ENTRY_NOTFOUND )
                                             ReportError( aUId, GEN_RES_STR2( S_ENTRY_NOT_FOUND, MethodString( nMethodId ), aString1 ) );
                                         else
@@ -4899,7 +4837,7 @@ BOOL StatementControl::Execute()
                             break;
                         case M_GetSelIndex :
                             {
-                                USHORT nPos = ((ComboBox*)pControl)->GetEntryPos(((ComboBox*)pControl)->GetText());
+                                sal_uInt16 nPos = ((ComboBox*)pControl)->GetEntryPos(((ComboBox*)pControl)->GetText());
                                 if ( nPos == COMBOBOX_ENTRY_NOTFOUND )
                                     nPos = 0;
                                 else
@@ -4984,10 +4922,10 @@ BOOL StatementControl::Execute()
                             ((MoreButton*)pControl)->Click();
                             break;
                         case M_Open :
-                            ((MoreButton*)pControl)->SetState(TRUE);
+                            ((MoreButton*)pControl)->SetState(sal_True);
                             break;
                         case M_Close :
-                            ((MoreButton*)pControl)->SetState(FALSE);
+                            ((MoreButton*)pControl)->SetState(sal_False);
                             break;
                         default:
                             ReportError( aUId, GEN_RES_STR2c2( S_UNKNOWN_METHOD, MethodString(nMethodId), "MoreButton" ) );
@@ -5085,16 +5023,16 @@ BOOL StatementControl::Execute()
                                 aMEvnt = MouseEvent( aPt,1,MOUSE_SIMPLECLICK,MOUSE_LEFT );
                                 ImplMouseButtonDown( pControl, aMEvnt, FORCE_DIRECT_CALL );
 
-                                ULONG nStart = Time::GetSystemTicks();
-                                ULONG nDelay = pControl->GetSettings().GetMouseSettings().GetActionDelay();
+                                sal_uLong nStart = Time::GetSystemTicks();
+                                sal_uLong nDelay = pControl->GetSettings().GetMouseSettings().GetActionDelay();
                                 while ( ( Time::GetSystemTicks() - nStart ) < nDelay + 100 )
                                     SafeReschedule();
 
                                 ImplMouseButtonUp  ( pControl, aMEvnt, FORCE_DIRECT_CALL );
 
-                                aSubMenuId1 = SmartId();
-                                aSubMenuId2 = SmartId();
-                                aSubMenuId3 = SmartId();
+                                aSubMenuId1 = 0;
+                                aSubMenuId2 = 0;
+                                aSubMenuId3 = 0;
                                 pMenuWindow = NULL;
                             }
                             break;
@@ -5106,38 +5044,29 @@ BOOL StatementControl::Execute()
                 case C_ToolBox:
                     {
                         ToolBox *pTB = ((ToolBox*)pControl);
-                        if ( !aUId.Matches( pTB->GetSmartUniqueOrHelpId() ) )	// Also Button auf der ToolBox gefunden
+                        if ( !aUId.equals( pTB->GetUniqueOrHelpId() ) )	// So we found a Button on the ToolBox
                         {
                             if ( (nParams == PARAM_NONE) || (nParams == PARAM_USHORT_1) )
-                            {			// Wir fälschen einen Parameter
-                                if ( aUId.HasNumeric() )
-                                {
-                                    nParams |= PARAM_ULONG_1;
-                                    nLNr1 = USHORT( aUId.GetNum() );
-                                    DBG_ASSERT( nLNr1 <= 0xFFFF, "ID on ToolBox > 0xFFFF" );
-                                }
-                                else
-                                {
-                                    nParams |= PARAM_STR_1;
-                                    aString1 = aUId.GetStr();
-                                }
+                            {			// Wir f�lschen einen Parameter
+                                nParams |= PARAM_STR_1;
+                                aString1 = Id2Str( aUId );
                             }
                             else
                                 ReportError( aUId, GEN_RES_STR1( S_INTERNAL_ERROR, MethodString( nMethodId ) ) );
                         }
 
 #define FIND_ITEM\
-    USHORT nItemPos = 0;\
-    BOOL bItemFound = FALSE;\
+    sal_uInt16 nItemPos = 0;\
+    sal_Bool bItemFound = sal_False;\
     {\
-        SmartId aButtonId;\
+        rtl::OString aButtonId;\
         if( nParams & PARAM_STR_1 )\
-            aButtonId = SmartId( aString1 );\
-        if( nParams & PARAM_ULONG_1 )\
-            aButtonId = SmartId( nLNr1 );\
-        for ( nItemPos = 0; nItemPos < pTB->GetItemCount() && !aButtonId.Matches(pTB->GetItemCommand(pTB->GetItemId(nItemPos))) &&\
-                                                      !aButtonId.Matches(pTB->GetHelpId(pTB->GetItemId(nItemPos))) ; nItemPos++ ) {}\
-        bItemFound = aButtonId.Matches(pTB->GetItemCommand(pTB->GetItemId(nItemPos))) || aButtonId.Matches(pTB->GetHelpId(pTB->GetItemId(nItemPos)));\
+            aButtonId = Str2Id( aString1 );\
+        else\
+            ReportError( aUId, GEN_RES_STR1( S_INTERNAL_ERROR, MethodString( nMethodId ) ) );\
+        for ( nItemPos = 0; nItemPos < pTB->GetItemCount() && !aButtonId.equals(Str2Id( pTB->GetItemCommand(pTB->GetItemId(nItemPos)) )) &&\
+                                                      !aButtonId.equals(pTB->GetHelpId(pTB->GetItemId(nItemPos))) ; nItemPos++ ) {}\
+        bItemFound = aButtonId.equals(Str2Id( pTB->GetItemCommand(pTB->GetItemId(nItemPos)) )) || aButtonId.equals(pTB->GetHelpId(pTB->GetItemId(nItemPos)));\
         if ( !bItemFound )\
             ReportError( aUId, GEN_RES_STR1( S_HELPID_ON_TOOLBOX_NOT_FOUND, MethodString( nMethodId ) ) );\
         else\
@@ -5145,12 +5074,12 @@ BOOL StatementControl::Execute()
             if ( !pTB->IsItemEnabled( pTB->GetItemId(nItemPos) ) && nMethodId != _M_IsEnabled && nMethodId != M_GetState )\
             {\
                 ReportError( aUId, GEN_RES_STR1( S_BUTTON_DISABLED_ON_TOOLBOX, MethodString( nMethodId ) ) );\
-                bItemFound = FALSE;\
+                bItemFound = sal_False;\
             }\
             else if ( !pTB->IsItemVisible( pTB->GetItemId(nItemPos) ) && nMethodId != M_GetState )\
             {\
                 ReportError( aUId, GEN_RES_STR1( S_BUTTON_HIDDEN_ON_TOOLBOX, MethodString( nMethodId ) ) );\
-                bItemFound = FALSE;\
+                bItemFound = sal_False;\
             }\
             else\
             {\
@@ -5161,10 +5090,10 @@ BOOL StatementControl::Execute()
                 {   /* Try the multi line way */\
                     if ( pTB->GetItemRect(pTB->GetItemId(nItemPos)).IsEmpty() )\
                     {\
-                        USHORT nLine = pTB->GetCurLine();\
+                        sal_uInt16 nLine = pTB->GetCurLine();\
                         do\
                         {\
-                            pTB->ShowLine( FALSE );\
+                            pTB->ShowLine( sal_False );\
                             for ( int i = 1 ; i < 30 ; i++ )\
                                 SafeReschedule();\
                         }\
@@ -5174,12 +5103,12 @@ BOOL StatementControl::Execute()
                     if ( pTB->GetItemRect(pTB->GetItemId(nItemPos)).IsEmpty() )\
                     {\
                         ReportError( aUId, GEN_RES_STR1( S_CANNOT_MAKE_BUTTON_VISIBLE_IN_TOOLBOX, MethodString( nMethodId ) ) );\
-                        bItemFound = FALSE;\
+                        bItemFound = sal_False;\
                     }\
                 }\
             }\
         }\
-    }\
+    }
 
                         switch( nMethodId )
                         {
@@ -5196,9 +5125,9 @@ BOOL StatementControl::Execute()
                                         {
                                             pTB->ExecuteCustomMenu();
 
-                                            aSubMenuId1 = SmartId();
-                                            aSubMenuId2 = SmartId();
-                                            aSubMenuId3 = SmartId();
+                                            aSubMenuId1 = 0;
+                                            aSubMenuId2 = 0;
+                                            aSubMenuId3 = 0;
                                             pMenuWindow = NULL;
 
                                             new StatementCommand( this, RC_MenuSelect, PARAM_USHORT_1, pTB->GetItemId(nItemPos) + TOOLBOX_MENUITEM_START );
@@ -5226,13 +5155,13 @@ BOOL StatementControl::Execute()
 
                                         Window *pWin = NULL;
                                         // Wait for the window to open.
-                                        StatementList::bExecuting = TRUE;		// Bah ist das ein ekliger Hack
-                                        {											// Das verhindert, daß schon der nächste Befehl ausgeführt wird.
+                                        StatementList::bExecuting = sal_True;		// Bah ist das ein ekliger Hack
+                                        {											// Das verhindert, da� schon der n�chste Befehl ausgef�hrt wird.
                                             Time aDelay;
                                             while ( !pWin && ( (pWin = GetPopupFloatingWin()) == NULL ) && ( Time() - aDelay ).GetSec() < 15 )
                                                 SafeReschedule();
                                         }
-                                        StatementList::bExecuting = FALSE;	// Bah ist das ein ekliger Hack
+                                        StatementList::bExecuting = sal_False;	// Bah ist das ein ekliger Hack
 
                                         if ( pWin && pWin->GetType() == WINDOW_FLOATINGWINDOW )
                                         {
@@ -5261,9 +5190,9 @@ BOOL StatementControl::Execute()
                                         ImplMouseButtonUp( pTB, aMEvnt);
 
                                         // Das Fenster ist offen.
-                                        aSubMenuId1 = SmartId();
-                                        aSubMenuId2 = SmartId();
-                                        aSubMenuId3 = SmartId();
+                                        aSubMenuId1 = 0;
+                                        aSubMenuId2 = 0;
+                                        aSubMenuId3 = 0;
                                         pMenuWindow = NULL;
                                     }
                                 }
@@ -5282,24 +5211,26 @@ BOOL StatementControl::Execute()
                                     FIND_ITEM;
                                     if ( bItemFound )	// FIND_ITEM Erfolgreich
                                     {
-                                        switch (nNr1)
-                                        {
-                                        case 0:
-                                            pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pTB->GetHelpId(pTB->GetItemId(nItemPos)));
-                                            break;
-                                        case 1:
-                                            pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pTB->GetItemType(nItemPos));
-                                            break;
-                                        case 2:
-                                            pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pTB->GetItemState(pTB->GetItemId(nItemPos)));
-                                            break;
-                                        case 3:
-                                            pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pTB->GetItemId(nItemPos));
-                                            break;
-                                        default:
-                                            pRet->GenReturn ( RET_Value, aUId, comm_ULONG(0));
-                                            break;
-                                        }
+                                        if ( ValueOK( aUId, CUniString("GetState"), nNr1, 4 ) )
+                                            switch (nNr1)
+                                            {
+                                            case 0:
+                                                pRet->GenReturn ( RET_Value, aUId, Id2Str( pTB->GetHelpId(pTB->GetItemId(nItemPos)) ) );
+                                                break;
+                                            case 1:
+                                                pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pTB->GetItemType(nItemPos));
+                                                break;
+                                            case 2:
+                                                pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pTB->GetItemState(pTB->GetItemId(nItemPos)));
+                                                break;
+                                            case 3:
+                                                pRet->GenReturn ( RET_Value, aUId, (comm_ULONG)pTB->GetItemId(nItemPos));
+                                                break;
+                                            default:
+                                                ReportError( aUId, GEN_RES_STR1( S_INTERNAL_ERROR, MethodString( nMethodId ) ) );
+                                                pRet->GenReturn ( RET_Value, aUId, comm_ULONG(0));
+                                                break;
+                                            }
                                     }
                                 }
                                 break;
@@ -5365,9 +5296,9 @@ BOOL StatementControl::Execute()
                                 if ( pThisEntry )
                                 {
                                     SvLBoxString* pItem = NULL;
-                                    USHORT nValidTextItemCount = 0;
+                                    sal_uInt16 nValidTextItemCount = 0;
                                     {
-                                        USHORT nIndex = 0;
+                                        sal_uInt16 nIndex = 0;
                                         SvLBoxItem *pMyItem;
                                         while ( ( nValidTextItemCount < nNr1 ) && nIndex < pThisEntry->ItemCount() )
                                         {
@@ -5405,7 +5336,7 @@ BOOL StatementControl::Execute()
                             break;
                         case M_Select :
                             if ( ! (nParams & PARAM_BOOL_1) )
-                                bBool1 = TRUE;
+                                bBool1 = sal_True;
                             if( nParams & PARAM_STR_1 )
                             {
                                 ReportError( aUId, GEN_RES_STR1( S_SELECT_DESELECT_VIA_STRING_NOT_IMPLEMENTED, MethodString( nMethodId ) ) );
@@ -5608,7 +5539,7 @@ BOOL StatementControl::Execute()
                     break;
                 case C_Control:
                 {
-                    USHORT nRealControlType = 0;
+                    sal_uInt16 nRealControlType = 0;
                     if ( dynamic_cast< EditBrowseBox* >(pControl) )
                         nRealControlType = CONST_CTBrowseBox;
                     else if ( dynamic_cast< ValueSet* >(pControl) )
@@ -5642,9 +5573,9 @@ BOOL StatementControl::Execute()
                                                 break;
                                             case M_GetColumnCount :
                                                 {
-                                                    USHORT nColCount = pEBBox->GetColumnCount();
+                                                    sal_uInt16 nColCount = pEBBox->GetColumnCount();
                                                     comm_USHORT nUnfrozenColCount = 0;
-                                                    USHORT i;
+                                                    sal_uInt16 i;
                                                     for ( i=0 ; i < nColCount ; i++ )
                                                     {
                                                         if ( !pEBBox->IsFrozen( pEBBox->GetColumnId( i ) ) )
@@ -5669,9 +5600,9 @@ BOOL StatementControl::Execute()
                                                 {
                                                     if ( ValueOK(aUId, MethodString( nMethodId ),nNr1,pEBBox->GetRowCount() ) )
                                                     {
-                                                        USHORT nColCount = pEBBox->GetColumnCount();
+                                                        sal_uInt16 nColCount = pEBBox->GetColumnCount();
                                                         comm_USHORT nUnfrozenColCount = 0;
-                                                        USHORT i;
+                                                        sal_uInt16 i;
                                                         for ( i=0 ; i < nColCount ; i++ )
                                                         {
                                                             if ( !pEBBox->IsFrozen( pEBBox->GetColumnId( i ) ) )
@@ -5805,13 +5736,13 @@ BOOL StatementControl::Execute()
                                             else if ( (nParams & PARAM_STR_1) )
                                             {
                                                 pELB->select( aString1 );
-                                                BOOL bSuccess = TRUE;
+                                                sal_Bool bSuccess = sal_True;
                                                 if ( pELB->getSelIndex() == EXTENSION_LISTBOX_ENTRY_NOTFOUND )
-                                                    bSuccess = FALSE;
+                                                    bSuccess = sal_False;
                                                 else
                                                 {
                                                     if ( !aString1.Equals( String( pELB->getItemName( pELB->getSelIndex() ) ) ) )
-                                                        bSuccess = FALSE;
+                                                        bSuccess = sal_False;
                                                 }
                                                 if ( !bSuccess )
                                                     ReportError( aUId, GEN_RES_STR2( S_ENTRY_NOT_FOUND, MethodString( nMethodId ), aString1 ) );
@@ -5847,7 +5778,8 @@ BOOL StatementControl::Execute()
                                                          ValueOK( aUId, MethodString( nMethodId ), nNr2, pTC->GetRowCount() ))
                                                     {
                                                         ::svt::table::PTableModel pModel = pTC->GetModel();
-                                                        Any aCell = pModel->getCellContent()[nNr2-1][nNr1-1];
+                                                        Any aCell;
+                                                        pModel->getCellContent( nNr1-1, nNr2-1, aCell );
                                                         pRet->GenReturn ( RET_Value, aUId, String( aCell.getValueTypeName() ));
                                                     }
                                                 }
@@ -5858,7 +5790,8 @@ BOOL StatementControl::Execute()
                                                          ValueOK( aUId, MethodString( nMethodId ), nNr2, pTC->GetRowCount() ))
                                                     {
                                                         ::svt::table::PTableModel pModel = pTC->GetModel();
-                                                        Any aCell = pModel->getCellContent()[nNr2-1][nNr1-1];
+                                                        Any aCell;
+                                                        pModel->getCellContent( nNr1-1, nNr2-1, aCell );
 
                                                         Type aType = aCell.getValueType();
                                                         TypeClass eTypeClass = aType.getTypeClass();
@@ -5926,7 +5859,7 @@ BOOL StatementControl::Execute()
                                                             Point aPos( aSize.Width() / 2, aSize.Height() / 2 );
                                                             long nStep = aSize.Height() / 4;
                                                             ::svt::table::RowPos nLastPos;
-                                                            while ( ( nLastPos = pTC->GetCurrentRow( aPos ) ) != nNr1-1 && nStep > 0 )
+                                                            while ( ( nLastPos = pTC->getTableControlInterface().hitTest( aPos ).nRow ) != nNr1-1 && nStep > 0 )
                                                             {
                                                                 if ( nLastPos > nNr1-1 || nLastPos == ROW_INVALID )
                                                                     aPos.Y() -= nStep;
@@ -5934,7 +5867,7 @@ BOOL StatementControl::Execute()
                                                                     aPos.Y() += nStep;
                                                                 nStep /= 2;
                                                             }
-                                                            if ( pTC->GetCurrentRow( aPos ) == nNr1-1 )
+                                                            if ( pTC->getTableControlInterface().hitTest( aPos ).nRow == nNr1-1 )
                                                             {
                                                                 MouseEvent aMEvnt(aPos,1,MOUSE_SIMPLECLICK|MOUSE_SELECT,MOUSE_LEFT,KEY_MOD1);
                                                                 pTC->getSelEngine()->SelMouseButtonDown( aMEvnt );
@@ -5951,13 +5884,13 @@ BOOL StatementControl::Execute()
                                                 }
                                                 break;
                                             case M_GetSelCount :
-                                                pRet->GenReturn ( RET_Value, aUId, comm_USHORT( pTC->GetSelectedRows().size() ));
+                                                pRet->GenReturn ( RET_Value, aUId, comm_USHORT( pTC->GetSelectedRowCount() ));
                                                 break;
                                             case M_GetSelIndex :
                                                 if ( ! (nParams & PARAM_USHORT_1) )
                                                     nNr1 = 1;
-                                                if ( ValueOK( aUId, CUniString("GetSelIndex"), nNr1, pTC->GetSelectedRows().size() ) )
-                                                    pRet->GenReturn ( RET_Value, aUId, comm_USHORT( pTC->GetSelectedRows()[nNr1-1] +1 ) );
+                                                if ( ValueOK( aUId, CUniString("GetSelIndex"), nNr1, pTC->GetSelectedRowCount() ) )
+                                                    pRet->GenReturn ( RET_Value, aUId, comm_USHORT( pTC->GetSelectedRowIndex( nNr1-1 ) +1 ) );
                                                 break;
                                         default:
                                             ReportError( aUId, GEN_RES_STR2c2( S_UNKNOWN_METHOD, MethodString(nMethodId), "TableControl" ) );
@@ -5997,13 +5930,13 @@ BOOL StatementControl::Execute()
                             break;
                         case M_Dock :
                             if ( ((DockingWindow*)pControl)->IsFloatingMode() )
-                                ((DockingWindow*)pControl)->SetFloatingMode(FALSE);
+                                ((DockingWindow*)pControl)->SetFloatingMode(sal_False);
                             else
                                 ReportError( aUId, GEN_RES_STR1( S_ALLOWED_ONLY_IN_FLOATING_MODE, MethodString( nMethodId ) ) );
                             break;
                         case M_Undock :
                             if ( !((DockingWindow*)pControl)->IsFloatingMode() )
-                                ((DockingWindow*)pControl)->SetFloatingMode(TRUE);
+                                ((DockingWindow*)pControl)->SetFloatingMode(sal_True);
                             else
                                 ReportError( aUId, GEN_RES_STR1( S_ALLOWED_ONLY_IN_FLOATING_MODE, MethodString( nMethodId ) ) );
                             break;
@@ -6011,7 +5944,7 @@ BOOL StatementControl::Execute()
                             pRet->GenReturn ( RET_Value, aUId, (comm_BOOL) !((DockingWindow*)pControl)->IsFloatingMode());
                             break;
                         case M_Close:
-                            DBG_ASSERT( aUId.Matches( pControl->GetSmartUniqueOrHelpId() ), "aUID != UniqueOrHelpId");
+                            DBG_ASSERT( aUId.equals( pControl->GetUniqueOrHelpId() ), "aUID != UniqueOrHelpId");
                             SET_WINP_CLOSING(pControl);
                             ((DockingWindow*)pControl)->Close();
                             break;
@@ -6087,7 +6020,7 @@ BOOL StatementControl::Execute()
                             break;
                         }
                         case M_Close:
-                            DBG_ASSERT( aUId.Matches( pControl->GetSmartUniqueOrHelpId() ), "aUID != UniqueOrHelpId");
+                            DBG_ASSERT( aUId.equals( pControl->GetUniqueOrHelpId() ), "aUID != UniqueOrHelpId");
                             SET_WINP_CLOSING(pControl);
                             ((FloatingWindow*)pControl)->Close();
                             break;
@@ -6110,7 +6043,7 @@ BOOL StatementControl::Execute()
                             AnimateMouse( pControl, MitteOben);
                             break;
                         case M_Close:
-                            DBG_ASSERT( aUId.Matches( pControl->GetSmartUniqueOrHelpId() ), "aUID != UniqueOrHelpId");
+                            DBG_ASSERT( aUId.equals( pControl->GetUniqueOrHelpId() ), "aUID != UniqueOrHelpId");
                             SET_WINP_CLOSING(pControl);
                             ((SystemWindow*)pControl)->Close();
                             break;
@@ -6119,7 +6052,7 @@ BOOL StatementControl::Execute()
                             Window *pChild = GetWinByRT( pControl, WINDOW_OKBUTTON );
                             if( ControlOK( pChild, "OK Button" ) )
                             {
-                                DBG_ASSERT( aUId.Matches( pControl->GetSmartUniqueOrHelpId() ), "aUID != UniqueOrHelpId");
+                                DBG_ASSERT( aUId.equals( pControl->GetUniqueOrHelpId() ), "aUID != UniqueOrHelpId");
                                 SET_WINP_CLOSING(pControl);
                                 ((Button*)pChild)->Click();
                             }
@@ -6130,7 +6063,7 @@ BOOL StatementControl::Execute()
                             Window *pChild = GetWinByRT( pControl, WINDOW_CANCELBUTTON );
                             if( ControlOK( pChild, "Cancel Button" ) )
                             {
-                                DBG_ASSERT( aUId.Matches( pControl->GetSmartUniqueOrHelpId() ), "aUID != UniqueOrHelpId");
+                                DBG_ASSERT( aUId.equals( pControl->GetUniqueOrHelpId() ), "aUID != UniqueOrHelpId");
                                 SET_WINP_CLOSING(pControl);
                                 ((Button*)pChild)->Click();
                             }
@@ -6167,7 +6100,7 @@ BOOL StatementControl::Execute()
                             AnimateMouse( pControl, MitteOben);
                             break;
                         case M_Close:
-                            DBG_ASSERT( aUId.Matches( pControl->GetSmartUniqueOrHelpId() ), "aUID != UniqueOrHelpId");
+                            DBG_ASSERT( aUId.equals( pControl->GetUniqueOrHelpId() ), "aUID != UniqueOrHelpId");
                             SET_WINP_CLOSING(pControl);
                             ((WorkWindow*)pControl)->Close();
                             break;
@@ -6184,14 +6117,14 @@ BOOL StatementControl::Execute()
                             pRet->GenReturn ( RET_Value, aUId, comm_BOOL (!((WorkWindow*)pControl)->IsMaximized() && !((WorkWindow*)pControl)->IsMinimized()) );
                             break;
                         case M_Minimize :
-                            ((WorkWindow*)pControl)->Maximize( FALSE );
+                            ((WorkWindow*)pControl)->Maximize( sal_False );
                             ((WorkWindow*)pControl)->Minimize();
                             break;
                         case M_Maximize :
                             ((WorkWindow*)pControl)->Maximize();
                             break;
                         case M_Restore :
-                            ((WorkWindow*)pControl)->Maximize( FALSE );
+                            ((WorkWindow*)pControl)->Maximize( sal_False );
                             ((WorkWindow*)pControl)->Restore();
                             break;
                         case M_Help:		// Alles was unten weiterbehandelt werden soll
@@ -6210,7 +6143,7 @@ BOOL StatementControl::Execute()
                 case C_ErrorBox:
                 case C_QueryBox:
                     {
-                        BOOL bDone = TRUE;
+                        sal_Bool bDone = sal_True;
                         MessBox* pMB = (MessBox*)pControl;
                         switch( nMethodId )
                         {
@@ -6221,17 +6154,17 @@ BOOL StatementControl::Execute()
                                 pRet->GenReturn ( RET_Value, aUId, comm_BOOL( pMB->GetCheckBoxState() == STATE_CHECK) );
                                 break;
                             case M_Check :
-                                pMB->SetCheckBoxState( TRUE );
+                                pMB->SetCheckBoxState( sal_True );
                                 break;
                             case M_UnCheck :
-                                pMB->SetCheckBoxState( FALSE );
+                                pMB->SetCheckBoxState( sal_False );
                                 break;
                             case M_GetText :
                                 pRet->GenReturn ( RET_Value, aUId, pMB->GetMessText());
                                 break;
 
                             default:
-                                bDone = FALSE;
+                                bDone = sal_False;
                                 break;
                         }
                         if ( bDone )
@@ -6253,9 +6186,6 @@ BOOL StatementControl::Execute()
                                 AnimateMouse( pControl, Mitte);
                                 break;
                             case M_OK:
-#if ( BUTTONID_OK != RET_OK )
-#error BUTTONID_OK != RET_OK
-#endif
                                 if ( pBD->GetPushButton( BUTTONID_OK ) )
                                 {
                                     SET_WINP_CLOSING(pControl);
@@ -6405,7 +6335,7 @@ BOOL StatementControl::Execute()
         }
         else
         {
-            bStatementDone=TRUE;
+            bStatementDone=sal_True;
         }
     }
     return bStatementDone;
diff --git a/automation/source/server/statemnt.hxx b/automation/source/server/statemnt.hxx
index a57034915..1d0af504b 100644
--- a/automation/source/server/statemnt.hxx
+++ b/automation/source/server/statemnt.hxx
@@ -35,7 +35,7 @@
 #ifndef _STATEMNT_HXX
 #define _STATEMNT_HXX
 
-#include <vcl/wintypes.hxx>
+#include <tools/wintypes.hxx>
 #include <tools/string.hxx>
 #include <tools/debug.hxx>
 #include <tools/time.hxx>
@@ -46,7 +46,6 @@
 #include <basic/sbstar.hxx>
 #include <vcl/event.hxx>
 #include <com/sun/star/beans/PropertyValue.hpp>
-#include <vcl/smartid.hxx>
 #include <automation/commtypes.hxx>
 
 class Window;
@@ -85,9 +84,9 @@ extern "C"
 #define GET_REAL_PARENT() GetWindow( WINDOW_REALPARENT )
 
 // switch behaviour of ImplMouse* and ImplKeyInput
-#define FORCE_DIRECT_CALL   TRUE
+#define FORCE_DIRECT_CALL   sal_True
 
-typedef USHORT SearchFlags;
+typedef sal_uInt16 SearchFlags;
 #define SEARCH_NOOVERLAP			((SearchFlags) 0x0001)
 #define SEARCH_NO_TOPLEVEL_WIN		((SearchFlags) 0x0002)
 #define SEARCH_FOCUS_FIRST      	((SearchFlags) 0x0004)
@@ -100,15 +99,15 @@ public:
     Search( SearchFlags nSearchFlags = 0): nmSearchFlags(nSearchFlags) {}
     virtual ~Search() {}
 
-    virtual BOOL IsWinOK( Window *pWin ) = 0;
+    virtual sal_Bool IsWinOK( Window *pWin ) = 0;
     SearchFlags GetSearchFlags() { return nmSearchFlags; }
     void AddSearchFlags( SearchFlags aNewFlags ) { nmSearchFlags |= aNewFlags; }
     void RemoveSearchFlags( SearchFlags aRemoveFlags ) { nmSearchFlags &= ( ~aRemoveFlags ); }
-    BOOL HasSearchFlag( SearchFlags aQueryFlag ) { return (nmSearchFlags & aQueryFlag) == aQueryFlag; }
+    sal_Bool HasSearchFlag( SearchFlags aQueryFlag ) { return (nmSearchFlags & aQueryFlag) == aQueryFlag; }
 };
 
-BOOL IsDialog(Window *pWin);		// Ist *pWin von SystemWindow abgeleitet (Kann es Active sein)
-BOOL IsAccessable(Window *pWin);	// Ist *pWin Zugreifbar (über IsEnabled und Parents geprüft)
+sal_Bool IsDialog(Window *pWin);		// Ist *pWin von SystemWindow abgeleitet (Kann es Active sein)
+sal_Bool IsAccessable(Window *pWin);	// Ist *pWin Zugreifbar (�ber IsEnabled und Parents gepr�ft)
 
 
 class SafePointer
@@ -136,7 +135,7 @@ struct TTSettings
 
     // Translate
     TranslateWin *pTranslateWin;
-    BOOL bToTop;
+    sal_Bool bToTop;
 };
 
 
@@ -152,37 +151,37 @@ private:
 
 protected:
     StatementList();
-    USHORT nRetryCount;
+    sal_uInt16 nRetryCount;
     void QueStatement(StatementList *pAfterThis);
-    BOOL bStatementInQue;
-    static USHORT nUseBindings;
+    sal_Bool bStatementInQue;
+    static sal_uInt16 nUseBindings;
 
     static TTProfiler *pProfiler;
     void InitProfile();
     void SendProfile( String aText );
     static StatementList *pCurrentProfileStatement;
 
-    static BOOL bIsInReschedule;
-        static USHORT nModalCount;
-    static Window *pLastFocusWindow;		// Wenn dieses sich ändert wird Safe Reschedule abgebrochen
-    static BOOL bWasDragManager;			// Wenn dieses sich ändert wird Safe Reschedule abgebrochen
-    static BOOL bWasPopupMenu;				// Wenn dieses sich ändert wird Safe Reschedule abgebrochen
-       static BOOL bBasicWasRunning;
+    static sal_Bool bIsInReschedule;
+        static sal_uInt16 nModalCount;
+    static Window *pLastFocusWindow;		// Wenn dieses sich �ndert wird Safe Reschedule abgebrochen
+    static sal_Bool bWasDragManager;			// Wenn dieses sich �ndert wird Safe Reschedule abgebrochen
+    static sal_Bool bWasPopupMenu;				// Wenn dieses sich �ndert wird Safe Reschedule abgebrochen
+       static sal_Bool bBasicWasRunning;
 
-    static USHORT nMinTypeKeysDelay;				/// Verzögerung der einzelnen Anschläge für TypeKeys
-    static USHORT nMaxTypeKeysDelay;
-    static BOOL bDoTypeKeysDelay;
+    static sal_uInt16 nMinTypeKeysDelay;				/// Verz�gerung der einzelnen Anschl�ge f�r TypeKeys
+    static sal_uInt16 nMaxTypeKeysDelay;
+    static sal_Bool bDoTypeKeysDelay;
 
     static Window* pFirstDocFrame;
 
-    static BOOL bIsSlotInExecute;
+    static sal_Bool bIsSlotInExecute;
 
 public:
-    static BOOL IsInReschedule() { return bIsInReschedule; }
-    void SafeReschedule( BOOL bYield = FALSE )	// Setzt Flag, so daß nicht schon der nächste Befehl ausgeführt wird
+    static sal_Bool IsInReschedule() { return bIsInReschedule; }
+    void SafeReschedule( sal_Bool bYield = sal_False )	// Setzt Flag, so da� nicht schon der n�chste Befehl ausgef�hrt wird
     {
         nModalCount = Application::GetModalModeCount();
-        bIsInReschedule = TRUE;
+        bIsInReschedule = sal_True;
         pLastFocusWindow = GetpApp()->GetFocusWindow();
         bWasDragManager = false /*!= DragManager::GetDragManager()*/;
         bWasPopupMenu = NULL != PopupMenu::GetActivePopupMenu();
@@ -193,29 +192,29 @@ public:
         else
             GetpApp()->Reschedule();
         bExecuting = bWasExecuting;
-        bBasicWasRunning = FALSE;
-        bWasPopupMenu = FALSE;
-        bWasDragManager = FALSE;
+        bBasicWasRunning = sal_False;
+        bWasPopupMenu = sal_False;
+        bWasDragManager = sal_False;
         pLastFocusWindow = NULL;
-        bIsInReschedule = FALSE;
+        bIsInReschedule = sal_False;
         nModalCount = 0;
     }
-    static BOOL MaybeResetSafeReschedule()
-    {		// Implementierung muß hier zwar nicht sein, ist aber übersichtlicher so
+    static sal_Bool MaybeResetSafeReschedule()
+    {		// Implementierung mu� hier zwar nicht sein, ist aber �bersichtlicher so
         if ( !bIsInReschedule )
-            return FALSE;
+            return sal_False;
 
         if ( pLastFocusWindow != GetpApp()->GetFocusWindow()
             || ( Application::GetModalModeCount() > nModalCount )
             || ( PopupMenu::GetActivePopupMenu() && !bWasPopupMenu )
             || ( StarBASIC::IsRunning() && !bBasicWasRunning ) )
         {
-            bIsInReschedule = FALSE;
+            bIsInReschedule = sal_False;
             pLastFocusWindow = NULL;
-            return TRUE;
+            return sal_True;
         }
         else
-            return FALSE;
+            return sal_False;
     }
     static void NormalReschedule()	// Setzt das flag nicht
     {
@@ -224,82 +223,82 @@ public:
 #define Reschedule RescheduleNichtBenutzen_StattdessenSafeRescheduleAnStatementList
 
     static Window* GetMouseWin();
-    static BOOL WinPtrValid(Window *pTest);
-    static Window* SearchAllWin( Window *pBase, Search &aSearch, BOOL MaybeBase = TRUE );
+    static sal_Bool WinPtrValid(Window *pTest);
+    static Window* SearchAllWin( Window *pBase, Search &aSearch, sal_Bool MaybeBase = sal_True );
 protected:
-    static Window* SearchClientWin( Window *pBase, Search &aSearch, BOOL MaybeBase = TRUE );
-
-    Window* SearchTree( SmartId aUId, BOOL bSearchButtonOnToolbox = FALSE );
-    Window* GetActive( WindowType nRT, BOOL MaybeBase = TRUE );
-    Window* GetFocus( WindowType nRT, BOOL MaybeBase = TRUE );
-    Window* GetAnyActive( BOOL MaybeBase = TRUE );
-    ScrollBar* GetScrollBar( Window *pBase, USHORT nDirection, BOOL MaybeBase = TRUE );
-    Window* GetPopupFloatingWin( BOOL MaybeBase = TRUE );
+    static Window* SearchClientWin( Window *pBase, Search &aSearch, sal_Bool MaybeBase = sal_True );
+
+    Window* SearchTree( rtl::OString aUId, sal_Bool bSearchButtonOnToolbox = sal_False );
+    Window* GetActive( WindowType nRT, sal_Bool MaybeBase = sal_True );
+    Window* GetFocus( WindowType nRT, sal_Bool MaybeBase = sal_True );
+    Window* GetAnyActive( sal_Bool MaybeBase = sal_True );
+    ScrollBar* GetScrollBar( Window *pBase, sal_uInt16 nDirection, sal_Bool MaybeBase = sal_True );
+    Window* GetPopupFloatingWin( sal_Bool MaybeBase = sal_True );
     Menu* GetMatchingMenu( Window* pWin, Menu* pBaseMenu = NULL );
-    Window* GetWinByRT( Window *pBase, WindowType nRT, BOOL MaybeBase = TRUE, USHORT nSkip = 0, BOOL bSearchAll = FALSE );
-    USHORT CountWinByRT( Window *pBase, WindowType nRT, BOOL MaybeBase = TRUE );
-    Window* GetDocWin( USHORT nNr );
-    USHORT GetDocWinCount();
-    Window* GetFadeSplitWin( Window *pBase, WindowAlign nAlign, BOOL MaybeBase = TRUE );
-    BOOL ValueOK(SmartId nId, String aBezeichnung, ULONG nValue, ULONG nMax);
+    Window* GetWinByRT( Window *pBase, WindowType nRT, sal_Bool MaybeBase = sal_True, sal_uInt16 nSkip = 0, sal_Bool bSearchAll = sal_False );
+    sal_uInt16 CountWinByRT( Window *pBase, WindowType nRT, sal_Bool MaybeBase = sal_True );
+    Window* GetDocWin( sal_uInt16 nNr );
+    sal_uInt16 GetDocWinCount();
+    Window* GetFadeSplitWin( Window *pBase, WindowAlign nAlign, sal_Bool MaybeBase = sal_True );
+    sal_Bool ValueOK(rtl::OString nId, String aBezeichnung, sal_uLong nValue, sal_uLong nMax);
 
-    USHORT GetCurrentMenues( PopupMenu *&pPopup, MenuBar *&pMenuBar, Menu *&pMenu );
+    sal_uInt16 GetCurrentMenues( PopupMenu *&pPopup, MenuBar *&pMenuBar, Menu *&pMenu );
 
 public:
     virtual ~StatementList();
     void Advance();
-    virtual BOOL Execute() = 0;
+    virtual sal_Bool Execute() = 0;
 /***************************************************************************
-** Bestimmt erst den nächsten Befehl, setzt Current
-** und führt dann aus.
-** Returnwert gibt an, ob Befehl nochmal ausgeführt
-** werden soll. Dann muß auch der UserEvent verlassen werden, um der Applikation
-** normales Arbeiten zu ermöglichen (Dialog schliessen)
-** TRUE bedeutet, dass alles klar gegangen ist
-** FALSE bedeutet nochmal Bitte
+** Bestimmt erst den n�chsten Befehl, setzt Current
+** und f�hrt dann aus.
+** Returnwert gibt an, ob Befehl nochmal ausgef�hrt
+** werden soll. Dann mu� auch der UserEvent verlassen werden, um der Applikation
+** normales Arbeiten zu erm�glichen (Dialog schliessen)
+** sal_True bedeutet, dass alles klar gegangen ist
+** sal_False bedeutet nochmal Bitte
 ***************************************************************************/
 
     void ReportError(String aMessage);
-    void ReportError(SmartId aUId, String aMessage);
-    void ReportError(String aMessage, ULONG nWhatever);
+    void ReportError(rtl::OString aUId, String aMessage);
+    void ReportError(String aMessage, sal_uLong nWhatever);
 
-    static void DirectLog( ULONG nType, String aString );
+    static void DirectLog( sal_uLong nType, String aString );
 
     String Tree(Window *pBase, int Indent);
     String ClientTree(Window *pBase, int Indent);
 
     StatementList *pNext;
     static StatementList /**pCurrent,*/ *pFirst;
-    static BOOL bReadingCommands;
-    static SmartId aWindowWaitUId;
+    static sal_Bool bReadingCommands;
+    static rtl::OString aWindowWaitUId;
     static Window *pWindowWaitPointer;
-    static SmartId aWindowWaitOldHelpId;
-    static SmartId aWindowWaitOldUniqueId;
+    static rtl::OString aWindowWaitOldHelpId;
+    static rtl::OString aWindowWaitOldUniqueId;
     static RetStream *pRet;
-    static BOOL IsError;
-    static BOOL bDying;
-    static BOOL bExecuting;				// Gesetzt, wenn ein Befehl rescheduled ohne einen neuen Befehl zu erlauben
-    BOOL bWasExecuting;	        		// Wurde bei einem MaybeResetSafeReschedule resettet, so wird der Zustand danach wiederhergestellt
-    static SmartId aSubMenuId1;			// Untermenüs bei PopupMenus
-    static SmartId aSubMenuId2;			// erstmal 2-Stufig
-    static SmartId aSubMenuId3;			// and now even 3 levels #i31512#
+    static sal_Bool IsError;
+    static sal_Bool bDying;
+    static sal_Bool bExecuting;				// Gesetzt, wenn ein Befehl rescheduled ohne einen neuen Befehl zu erlauben
+    sal_Bool bWasExecuting;	        		// Wurde bei einem MaybeResetSafeReschedule resettet, so wird der Zustand danach wiederhergestellt
+    static sal_uInt16 aSubMenuId1;			// Untermen�s bei PopupMenus
+    static sal_uInt16 aSubMenuId2;			// erstmal 2-Stufig
+    static sal_uInt16 aSubMenuId3;			// and now even 3 levels #i31512#
     static SystemWindow *pMenuWindow;   // when using MenuBar as base for MenuCommands
     static TTProperties *pTTProperties;	// Hier stehen die SlotIDs aus dem SFX drin
 
-    BOOL CheckWindowWait();			//True heisst, dass Window noch existiert
+    sal_Bool CheckWindowWait();			//True heisst, dass Window noch existiert
                                     //False -> Window weg;
     static void SetFirstDocFrame( Window* pWin );
     static Window* GetFirstDocFrame();
-    static BOOL IsFirstDocFrame( Window* pWin );
-    static BOOL IsDocWin( Window* pWin );
-    static BOOL IsIMEWin( Window* pWin );    // Input Window for CJK under Solaris
-    static BOOL IsDocFrame( Window* pWin );
+    static sal_Bool IsFirstDocFrame( Window* pWin );
+    static sal_Bool IsDocWin( Window* pWin );
+    static sal_Bool IsIMEWin( Window* pWin );    // Input Window for CJK under Solaris
+    static sal_Bool IsDocFrame( Window* pWin );
     static MenuBar* GetDocFrameMenuBar( Window* pWin );
-    static USHORT GetDocFrameCount();
+    static sal_uInt16 GetDocFrameCount();
 
-    static BOOL bCatchGPF;
+    static sal_Bool bCatchGPF;
 
-    static BOOL bUsePostEvents;         // use Application::Post*Event or own impl to handle key and mouseevents
+    static sal_Bool bUsePostEvents;         // use Application::Post*Event or own impl to handle key and mouseevents
 
 #if OSL_DEBUG_LEVEL > 1
     static EditWindow *m_pDbgWin;
@@ -309,20 +308,20 @@ public:
 class StatementSlot : public StatementList	//Slots aufrufen
 {
 protected:
-    USHORT nAnzahl;
+    sal_uInt16 nAnzahl;
     SfxPoolItem **pItemArr;
     ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> aArgs;
-    USHORT nFunctionId;     // can get removed when the old (numeric) slothandling is removed
+    sal_uInt16 nFunctionId;     // can get removed when the old (numeric) slothandling is removed
     String aUnoUrl;
-    BOOL bMenuClosed;
+    sal_Bool bMenuClosed;
 
     StatementSlot();
     void AddReferer();
 public:
     StatementSlot( SCmdStream *pIn );
-    StatementSlot( ULONG nSlot, SfxPoolItem* pItem = NULL );
+    StatementSlot( sal_uLong nSlot, SfxPoolItem* pItem = NULL );
     virtual ~StatementSlot();
-    virtual BOOL Execute();
+    virtual sal_Bool Execute();
 };
 
 class StatementUnoSlot : public StatementSlot	//Uno Slots aufrufen
@@ -331,37 +330,36 @@ public:
     StatementUnoSlot(SCmdStream *pIn);
 };
 
-class StatementCommand : public StatementList	// Befehl ausführen (wintree, resetaplication ...)
+class StatementCommand : public StatementList	// Befehl ausf�hren (wintree, resetaplication ...)
 {
     friend class ImplRemoteControl;
 protected:
-    USHORT nMethodId;
-    SmartId aSmartMethodId;
-    USHORT nParams;
+    sal_uInt16 nMethodId;
+    sal_uInt16 nParams;
     comm_USHORT nNr1,nNr2,nNr3,nNr4;
     comm_ULONG nLNr1;
     String aString1,aString2;
-    BOOL bBool1,bBool2;
+    sal_Bool bBool1,bBool2;
 
     Window* GetNextOverlap( Window* pBase );
     Window* GetNextRecoverWin();
 
-    static USHORT nDirPos;
+    static sal_uInt16 nDirPos;
     static Dir *pDir;
     static pfunc_osl_printDebugMessage pOriginal_osl_DebugMessageFunc;
 
 
-    BOOL UnpackStorage( SotStorageRef xStorage, DirEntry &aBaseDir );
+    sal_Bool UnpackStorage( SotStorageRef xStorage, DirEntry &aBaseDir );
 
     void HandleSAXParser();
 
 public:
     StatementCommand( SCmdStream *pIn );
-    StatementCommand( StatementList *pAfterThis, USHORT MethodId, USHORT Params, USHORT Nr1 );
-    virtual BOOL Execute();
-    BOOL DisplayHID();
+    StatementCommand( StatementList *pAfterThis, sal_uInt16 MethodId, sal_uInt16 Params, sal_uInt16 Nr1 );
+    virtual sal_Bool Execute();
+    sal_Bool DisplayHID();
     void Translate();
-    void WriteControlData( Window *pBase, ULONG nConf, BOOL bFirst = TRUE );
+    void WriteControlData( Window *pBase, sal_uLong nConf, sal_Bool bFirst = sal_True );
 
 };
 
@@ -371,48 +369,48 @@ enum TTHotSpots  { MitteLinks, Mitte, MitteOben };
 class StatementControl : public StatementList
 {
 protected:
-    SmartId aUId;
-    USHORT nMethodId;
-    USHORT nParams;
+    rtl::OString aUId;
+    sal_uInt16 nMethodId;
+    sal_uInt16 nParams;
     comm_USHORT nNr1,nNr2,nNr3,nNr4;
     comm_ULONG nLNr1;
     String aString1,aString2;
-    BOOL bBool1,bBool2;
-    BOOL ControlOK( Window *pControl, const sal_Char* aBezeichnung );
+    sal_Bool bBool1,bBool2;
+    sal_Bool ControlOK( Window *pControl, const sal_Char* aBezeichnung );
     void AnimateMouse( Window *pControl, TTHotSpots aWohin );
     void AnimateMouse( Window *pControl, Point aWohin );
 
-    BOOL MaybeDoTypeKeysDelay( Window *pTestWindow );
+    sal_Bool MaybeDoTypeKeysDelay( Window *pTestWindow );
 
-    BOOL HandleVisibleControls( Window *pControl );
-    BOOL HandleCommonMethods( Window *pControl );
+    sal_Bool HandleVisibleControls( Window *pControl );
+    sal_Bool HandleCommonMethods( Window *pControl );
 
 public:
-    StatementControl( SCmdStream *pIn, USHORT nControlType );
-    virtual BOOL Execute();
+    StatementControl( SCmdStream *pIn, sal_uInt16 nControlType );
+    virtual sal_Bool Execute();
 
 };
 
 class StatementFlow : public StatementList		// Kommunikation mit Sequence
 {
-    USHORT nArt;
+    sal_uInt16 nArt;
 
-    USHORT nParams;
+    sal_uInt16 nParams;
     comm_USHORT nSNr1;
     comm_ULONG nLNr1;
     String aString1;
-    BOOL bBool1;
+    sal_Bool bBool1;
 
 
 public:
-    StatementFlow (ULONG nServiceId, SCmdStream *pIn, ImplRemoteControl *pRC );
-    StatementFlow( StatementList *pAfterThis, USHORT nArtP );
-    virtual BOOL Execute();
+    StatementFlow (sal_uLong nServiceId, SCmdStream *pIn, ImplRemoteControl *pRC );
+    StatementFlow( StatementList *pAfterThis, sal_uInt16 nArtP );
+    virtual sal_Bool Execute();
     static CommunicationLink *pCommLink;
-    static BOOL bSending;
+    static sal_Bool bSending;
 
-    static BOOL bUseIPC;	// Soll zur rückmeldung IPC verwendet werden?
-    static ImplRemoteControl *pRemoteControl;	// Static für 2. Constructor
+    static sal_Bool bUseIPC;	// Soll zur r�ckmeldung IPC verwendet werden?
+    static ImplRemoteControl *pRemoteControl;	// Static f�r 2. Constructor
 
 private:
     void SendViaSocket();
@@ -422,11 +420,11 @@ class SearchUID : public Search
 {
     Window *pMaybeResult;
     Window *pAlternateResult;
-    SmartId aUId;
-    BOOL bSearchButtonOnToolbox;
+    rtl::OString aUId;
+    sal_Bool bSearchButtonOnToolbox;
 public:
-    SearchUID( SmartId aUIdP, BOOL bSearchButtonOnToolboxP ): Search( SEARCH_FOCUS_FIRST ), pMaybeResult(NULL), pAlternateResult(NULL), aUId(aUIdP), bSearchButtonOnToolbox(bSearchButtonOnToolboxP) {}
-    virtual BOOL IsWinOK( Window *pWin );
+    SearchUID( rtl::OString aUIdP, sal_Bool bSearchButtonOnToolboxP ): Search( SEARCH_FOCUS_FIRST ), pMaybeResult(NULL), pAlternateResult(NULL), aUId(aUIdP), bSearchButtonOnToolbox(bSearchButtonOnToolboxP) {}
+    virtual sal_Bool IsWinOK( Window *pWin );
     Window* GetMaybeWin() { return pMaybeResult; }
     Window* GetAlternateResultWin() { return pAlternateResult; }
 };
@@ -435,53 +433,53 @@ class SearchActive : public Search
     WindowType nRT;
 public:
     SearchActive( WindowType nRTP ): nRT(nRTP) {}
-    virtual BOOL IsWinOK( Window *pWin );
+    virtual sal_Bool IsWinOK( Window *pWin );
 };
 class SearchPopupFloatingWin : public Search
 {
 public:
     SearchPopupFloatingWin(): Search( SEARCH_FOCUS_FIRST ) {}
-    virtual BOOL IsWinOK( Window *pWin );
+    virtual sal_Bool IsWinOK( Window *pWin );
 };
 class SearchRT : public Search
 {
     WindowType mnRT;
-    USHORT mnSkip;
-    USHORT mnCount;
+    sal_uInt16 mnSkip;
+    sal_uInt16 mnCount;
 public:
-    SearchRT( WindowType nRTP, SearchFlags nSearchFlags, USHORT nSkip = 0 ): Search(nSearchFlags), mnRT(nRTP), mnSkip( nSkip ), mnCount( 0 ) {}
-    virtual BOOL IsWinOK( Window *pWin );
-    USHORT GetCount(){ return mnCount; }
+    SearchRT( WindowType nRTP, SearchFlags nSearchFlags, sal_uInt16 nSkip = 0 ): Search(nSearchFlags), mnRT(nRTP), mnSkip( nSkip ), mnCount( 0 ) {}
+    virtual sal_Bool IsWinOK( Window *pWin );
+    sal_uInt16 GetCount(){ return mnCount; }
 };
 class SearchScroll : public SearchRT
 {
-    USHORT nDirection;
+    sal_uInt16 nDirection;
 public:
-    SearchScroll( USHORT nDir, SearchFlags nSearchFlags ): SearchRT(WINDOW_SCROLLBAR, nSearchFlags), nDirection(nDir) {}
-    virtual BOOL IsWinOK( Window *pWin );
+    SearchScroll( sal_uInt16 nDir, SearchFlags nSearchFlags ): SearchRT(WINDOW_SCROLLBAR, nSearchFlags), nDirection(nDir) {}
+    virtual sal_Bool IsWinOK( Window *pWin );
 };
 class SearchWinPtr : public Search
 {
     Window *pTest;
 public:
     SearchWinPtr( Window *pTestP ): pTest(pTestP) {}
-    virtual BOOL IsWinOK( Window *pWin );
+    virtual sal_Bool IsWinOK( Window *pWin );
 };
 class SearchFadeSplitWin : public Search
 {
     WindowAlign nAlign;
 public:
     SearchFadeSplitWin( WindowAlign nAlignP ): nAlign(nAlignP) {}
-    virtual BOOL IsWinOK( Window *pWin );
+    virtual sal_Bool IsWinOK( Window *pWin );
 };
 
 
-void ImplKeyInput( Window* pWin, KeyEvent &aKEvnt, BOOL bForceDirect=FALSE );
-void ImplMouseMove( Window* pWin, MouseEvent &aMEvnt, BOOL bForceDirect=FALSE );
-void ImplMouseButtonDown( Window* pWin, MouseEvent &aMEvnt, BOOL bForceDirect=FALSE );
-void ImplMouseButtonUp( Window* pWin, MouseEvent &aMEvnt, BOOL bForceDirect=FALSE );
+void ImplKeyInput( Window* pWin, KeyEvent &aKEvnt, sal_Bool bForceDirect=sal_False );
+void ImplMouseMove( Window* pWin, MouseEvent &aMEvnt, sal_Bool bForceDirect=sal_False );
+void ImplMouseButtonDown( Window* pWin, MouseEvent &aMEvnt, sal_Bool bForceDirect=sal_False );
+void ImplMouseButtonUp( Window* pWin, MouseEvent &aMEvnt, sal_Bool bForceDirect=sal_False );
 void ImplCommand( Window* pWin, CommandEvent &aCmdEvnt );
-void ImplEventWait( ULONG nID );
+void ImplEventWait( sal_uLong nID );
 
 #endif