Merge commit 'ooo/DEV300_m101' into integration/dev300_m101

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

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

1 files changed, 133 insertions, 131 deletions

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();