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, 65 insertions, 59 deletions

diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index eb1fe3432895..9d9b2cece04d 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -72,27 +72,28 @@ static long nTabs[] =
     };
 
 
-SvBaseLinksDlg::SvBaseLinksDlg( Window * pParent, LinkManager* pMgr, BOOL bHtml )
+SvBaseLinksDlg::SvBaseLinksDlg( Window * pParent, LinkManager* pMgr, sal_Bool bHtml )
     : ModalDialog( pParent, CUI_RES( MD_UPDATE_BASELINKS ) ),
     aFtFiles( this, CUI_RES( FT_FILES ) ),
     aFtLinks( this, CUI_RES( FT_LINKS ) ),
     aFtType( this, CUI_RES( FT_TYPE ) ),
     aFtStatus( this, CUI_RES( FT_STATUS ) ),
-    aCancelButton1( this, CUI_RES( 1 ) ),
-    aHelpButton1( this, CUI_RES( 1 ) ),
-    aPbUpdateNow( this, CUI_RES( PB_UPDATE_NOW ) ),
-    aPbOpenSource( this, CUI_RES( PB_OPEN_SOURCE ) ),
-    aPbChangeSource( this, CUI_RES( PB_CHANGE_SOURCE ) ),
-    aPbBreakLink( this, CUI_RES( PB_BREAK_LINK ) ),
+    aTbLinks( this, CUI_RES(TB_LINKS ) ),
     aFtFiles2( this, CUI_RES( FT_FILES2 ) ),
+    aFtFullFileName( this, CUI_RES( FT_FULL_FILE_NAME ) ),
     aFtSource2( this, CUI_RES( FT_SOURCE2 ) ),
+    aFtFullSourceName( this, CUI_RES( FT_FULL_SOURCE_NAME ) ),
     aFtType2( this, CUI_RES( FT_TYPE2 ) ),
+    aFtFullTypeName( this, CUI_RES( FT_FULL_TYPE_NAME ) ),
     aFtUpdate( this, CUI_RES( FT_UPDATE ) ),
     aRbAutomatic( this, CUI_RES( RB_AUTOMATIC ) ),
     aRbManual( this, CUI_RES( RB_MANUAL ) ),
-    aFtFullFileName( this, CUI_RES( FT_FULL_FILE_NAME ) ),
-    aFtFullSourceName( this, CUI_RES( FT_FULL_SOURCE_NAME ) ),
-    aFtFullTypeName( this, CUI_RES( FT_FULL_TYPE_NAME ) ),
+    aCancelButton1( this, CUI_RES( 1 ) ),
+    aHelpButton1( this, CUI_RES( 1 ) ),
+    aPbUpdateNow( this, CUI_RES( PB_UPDATE_NOW ) ),
+    aPbOpenSource( this, CUI_RES( PB_OPEN_SOURCE ) ),
+    aPbChangeSource( this, CUI_RES( PB_CHANGE_SOURCE ) ),
+    aPbBreakLink( this, CUI_RES( PB_BREAK_LINK ) ),
     aStrAutolink( CUI_RES( STR_AUTOLINK ) ),
     aStrManuallink( CUI_RES( STR_MANUALLINK ) ),
     aStrBrokenlink( CUI_RES( STR_BROKENLINK ) ),
@@ -102,8 +103,7 @@ SvBaseLinksDlg::SvBaseLinksDlg( Window * pParent, LinkManager* pMgr, BOOL bHtml
     aStrCloselinkmsgMulti( CUI_RES( STR_CLOSELINKMSG_MULTI ) ),
     aStrWaitinglink( CUI_RES( STR_WAITINGLINK ) ),
     pLinkMgr( NULL ),
-    bHtmlMode(bHtml),
-    aTbLinks( this, CUI_RES(TB_LINKS ) )
+    bHtmlMode(bHtml)
 {
     FreeResource();
 
@@ -115,6 +115,12 @@ SvBaseLinksDlg::SvBaseLinksDlg( Window * pParent, LinkManager* pMgr, BOOL bHtml
     // UpdateTimer fuer DDE-/Grf-Links, auf die gewarted wird
     aUpdateTimer.SetTimeoutHdl( LINK( this, SvBaseLinksDlg, UpdateWaitingHdl ) );
     aUpdateTimer.SetTimeout( 1000 );
+    //IAccessibility2 Implementation 2009-----
+    // Set the ZOrder, and accessible name to the dialog's title
+    aTbLinks.SetZOrder(0, WINDOW_ZORDER_FIRST);
+    aTbLinks.SetAccessibleName(this->GetText());
+    aTbLinks.SetAccessibleRelationLabeledBy(&aFtFiles);
+    //-----IAccessibility2 Implementation 2009
 
     OpenSource().Hide();
 
@@ -141,8 +147,8 @@ SvBaseLinksDlg::~SvBaseLinksDlg()
 *************************************************************************/
 IMPL_LINK( SvBaseLinksDlg, LinksSelectHdl, SvTabListBox *, pSvTabListBox )
 {
-    USHORT nSelectionCount = pSvTabListBox ?
-        (USHORT)pSvTabListBox->GetSelectionCount() : 0;
+    sal_uInt16 nSelectionCount = pSvTabListBox ?
+        (sal_uInt16)pSvTabListBox->GetSelectionCount() : 0;
     if(nSelectionCount > 1)
     {
         //bei Mehrfachselektion ggf. alte Eintraege deselektieren
@@ -150,16 +156,16 @@ IMPL_LINK( SvBaseLinksDlg, LinksSelectHdl, SvTabListBox *, pSvTabListBox )
         SvBaseLink* pLink = 0;
         pEntry = pSvTabListBox->GetHdlEntry();
         pLink = (SvBaseLink*)pEntry->GetUserData();
-        USHORT nObjectType = pLink->GetObjType();
+        sal_uInt16 nObjectType = pLink->GetObjType();
         if((OBJECT_CLIENT_FILE & nObjectType) != OBJECT_CLIENT_FILE)
         {
-            pSvTabListBox->SelectAll(FALSE);
+            pSvTabListBox->SelectAll(sal_False);
             pSvTabListBox->Select(pEntry);
             nSelectionCount = 1;
         }
         else
         {
-            for( USHORT i = 0; i < nSelectionCount; i++)
+            for( sal_uInt16 i = 0; i < nSelectionCount; i++)
             {
                 pEntry = i == 0 ? pSvTabListBox->FirstSelected() :
                                     pSvTabListBox->NextSelected(pEntry);
@@ -167,7 +173,7 @@ IMPL_LINK( SvBaseLinksDlg, LinksSelectHdl, SvTabListBox *, pSvTabListBox )
                 pLink = (SvBaseLink*)pEntry->GetUserData();
                 DBG_ASSERT(pLink, "Wo ist der Link?");
                 if( (OBJECT_CLIENT_FILE & pLink->GetObjType()) != OBJECT_CLIENT_FILE )
-                    pSvTabListBox->Select( pEntry, FALSE );
+                    pSvTabListBox->Select( pEntry, sal_False );
 
             }
         }
@@ -180,7 +186,7 @@ IMPL_LINK( SvBaseLinksDlg, LinksSelectHdl, SvTabListBox *, pSvTabListBox )
     }
     else
     {
-        USHORT nPos;
+        sal_uInt16 nPos;
         SvBaseLink* pLink = GetSelEntry( &nPos );
         if( !pLink )
             return 0;
@@ -232,7 +238,7 @@ IMPL_LINK_INLINE_START( SvBaseLinksDlg, AutomaticClickHdl, RadioButton *, pRadio
 {
     (void)pRadioButton;
 
-    USHORT nPos;
+    sal_uInt16 nPos;
     SvBaseLink* pLink = GetSelEntry( &nPos );
     if( pLink && !( FILEOBJECT & pLink->GetObjType() ) &&
         LINKUPDATE_ALWAYS != pLink->GetUpdateMode() )
@@ -245,7 +251,7 @@ IMPL_LINK_INLINE_START( SvBaseLinksDlg, ManualClickHdl, RadioButton *, pRadioBut
 {
     (void)pRadioButton;
 
-    USHORT nPos;
+    sal_uInt16 nPos;
     SvBaseLink* pLink = GetSelEntry( &nPos );
     if( pLink && !( FILEOBJECT & pLink->GetObjType() ) &&
         LINKUPDATE_ONCALL != pLink->GetUpdateMode())
@@ -257,17 +263,17 @@ IMPL_LINK_INLINE_END( SvBaseLinksDlg, ManualClickHdl, RadioButton *, pRadioButto
 IMPL_LINK( SvBaseLinksDlg, UpdateNowClickHdl, PushButton *, EMPTYARG )
 {
     SvTabListBox& rListBox = Links();
-    USHORT nSelCnt = (USHORT)rListBox.GetSelectionCount();
+    sal_uInt16 nSelCnt = (sal_uInt16)rListBox.GetSelectionCount();
     if( 255 < nSelCnt )
         nSelCnt = 255;
 
     std::vector< SvBaseLink* > aLnkArr;
-    std::vector< USHORT > aPosArr;
+    std::vector< sal_uInt16 > aPosArr;
 
     SvLBoxEntry* pE = rListBox.FirstSelected();
     while( pE )
     {
-        USHORT nFndPos = (USHORT)rListBox.GetModel()->GetAbsPos( pE );
+        sal_uInt16 nFndPos = (sal_uInt16)rListBox.GetModel()->GetAbsPos( pE );
         if( LISTBOX_ENTRY_NOTFOUND != nFndPos )
         {
             aLnkArr.push_back( static_cast< SvBaseLink* >( pE->GetUserData() ) );
@@ -278,17 +284,17 @@ IMPL_LINK( SvBaseLinksDlg, UpdateNowClickHdl, PushButton *, EMPTYARG )
 
     if( !aLnkArr.empty() )
     {
-        for( USHORT n = 0; n < aLnkArr.size(); ++n )
+        for( sal_uInt16 n = 0; n < aLnkArr.size(); ++n )
         {
             SvBaseLinkRef xLink = aLnkArr[ n ];
 
             // suche erstmal im Array nach dem Eintrag
-            for( USHORT i = 0; i < pLinkMgr->GetLinks().Count(); ++i )
+            for( sal_uInt16 i = 0; i < pLinkMgr->GetLinks().Count(); ++i )
                 if( &xLink == *pLinkMgr->GetLinks()[ i ] )
                 {
-                    xLink->SetUseCache( FALSE );
+                    xLink->SetUseCache( sal_False );
                     SetType( *xLink, aPosArr[ n ], xLink->GetUpdateMode() );
-                    xLink->SetUseCache( TRUE );
+                    xLink->SetUseCache( sal_True );
                     break;
                 }
         }
@@ -319,7 +325,7 @@ IMPL_LINK( SvBaseLinksDlg, UpdateNowClickHdl, PushButton *, EMPTYARG )
         {
             SvLBoxEntry* pSelEntry = rListBox.FirstSelected();
             if( pE != pSelEntry )
-                rListBox.Select( pSelEntry, FALSE );
+                rListBox.Select( pSelEntry, sal_False );
             rListBox.Select( pE );
             rListBox.MakeVisible( pE );
         }
@@ -333,7 +339,7 @@ IMPL_LINK( SvBaseLinksDlg, ChangeSourceClickHdl, PushButton *, pPushButton )
 {
     (void)pPushButton;
 
-    USHORT nSelectionCount = (USHORT)Links().GetSelectionCount();
+    sal_uInt16 nSelectionCount = (sal_uInt16)Links().GetSelectionCount();
     if(nSelectionCount > 1)
     {
         PathDialog aPathDlg( this );
@@ -354,7 +360,7 @@ IMPL_LINK( SvBaseLinksDlg, ChangeSourceClickHdl, PushButton *, pPushButton )
         {
             String aPath = aPathDlg.GetPath();
 
-            for( USHORT i = 0; i < nSelectionCount; i++)
+            for( sal_uInt16 i = 0; i < nSelectionCount; i++)
             {
                 pEntry = i==0 ?
                         Links().FirstSelected() :
@@ -381,7 +387,7 @@ IMPL_LINK( SvBaseLinksDlg, ChangeSourceClickHdl, PushButton *, pPushButton )
     }
     else
     {
-        USHORT nPos;
+        sal_uInt16 nPos;
         SvBaseLink* pLink = GetSelEntry( &nPos );
         if ( pLink && (pLink->GetLinkSourceName().Len() != 0) )
             pLink->Edit( this, LINK( this, SvBaseLinksDlg, EndEditHdl ) );
@@ -393,10 +399,10 @@ IMPL_LINK( SvBaseLinksDlg, BreakLinkClickHdl, PushButton *, pPushButton )
 {
     (void)pPushButton;
 
-    BOOL bModified = FALSE;
+    sal_Bool bModified = sal_False;
     if(Links().GetSelectionCount() <= 1)
     {
-        USHORT nPos;
+        sal_uInt16 nPos;
         SvBaseLinkRef xLink = GetSelEntry( &nPos );
         if( !xLink.Is() )
             return 0;
@@ -408,7 +414,7 @@ IMPL_LINK( SvBaseLinksDlg, BreakLinkClickHdl, PushButton *, pPushButton )
             Links().GetModel()->Remove( Links().GetEntry( nPos ) );
 
             // falls Object noch vorhanden, dann das schliessen
-            BOOL bNewLnkMgr = OBJECT_CLIENT_FILE == xLink->GetObjType();
+            sal_Bool bNewLnkMgr = OBJECT_CLIENT_FILE == xLink->GetObjType();
 
             // dem Link sagen, das er aufgeloest wird!
             xLink->Closed();
@@ -427,7 +433,7 @@ IMPL_LINK( SvBaseLinksDlg, BreakLinkClickHdl, PushButton *, pPushButton )
                 if( pEntry )
                     Links().SetCurEntry( pEntry );
             }
-            bModified = TRUE;
+            bModified = sal_True;
         }
     }
     else
@@ -447,7 +453,7 @@ IMPL_LINK( SvBaseLinksDlg, BreakLinkClickHdl, PushButton *, pPushButton )
                 pEntry = Links().NextSelected(pEntry);
             }
             Links().RemoveSelection();
-            for( ULONG i = 0; i < aLinkList.Count(); i++ )
+            for( sal_uLong i = 0; i < aLinkList.Count(); i++ )
             {
                 SvBaseLinkRef xLink = aLinkList.GetObject( i );
                 // dem Link sagen, das er aufgeloest wird!
@@ -455,7 +461,7 @@ IMPL_LINK( SvBaseLinksDlg, BreakLinkClickHdl, PushButton *, pPushButton )
 
                 // falls einer vergessen hat sich auszutragen
                 pLinkMgr->Remove( &xLink );
-                bModified = TRUE;
+                bModified = sal_True;
             }
             //Danach alle selektierten Eintraege entfernen
         }
@@ -485,8 +491,8 @@ IMPL_LINK( SvBaseLinksDlg, UpdateWaitingHdl, Timer*, pTimer )
 {
     (void)pTimer;
 
-    Links().SetUpdateMode(FALSE);
-    for( ULONG nPos = Links().GetEntryCount(); nPos; )
+    Links().SetUpdateMode(sal_False);
+    for( sal_uLong nPos = Links().GetEntryCount(); nPos; )
     {
         SvLBoxEntry* pBox = Links().GetEntry( --nPos );
         SvBaseLinkRef xLink( (SvBaseLink*)pBox->GetUserData() );
@@ -498,13 +504,13 @@ IMPL_LINK( SvBaseLinksDlg, UpdateWaitingHdl, Timer*, pTimer )
                 Links().SetEntryText( sCur, pBox, 3 );
         }
     }
-    Links().SetUpdateMode(TRUE);
+    Links().SetUpdateMode(sal_True);
     return 0;
 }
 
 IMPL_LINK( SvBaseLinksDlg, EndEditHdl, sfx2::SvBaseLink*, _pLink )
 {
-    USHORT nPos;
+    sal_uInt16 nPos;
     GetSelEntry( &nPos );
 
     if( _pLink && _pLink->WasLastEditOK() )
@@ -513,23 +519,23 @@ IMPL_LINK( SvBaseLinksDlg, EndEditHdl, sfx2::SvBaseLink*, _pLink )
         // also suche den Link im Manager, wenn der nicht mehr existiert,
         // dann setze fuelle die Liste komplett neu. Ansonsten braucht
         // nur der editierte Linkt aktualisiert werden.
-        BOOL bLinkFnd = FALSE;
-        for( USHORT n = pLinkMgr->GetLinks().Count(); n;  )
+        sal_Bool bLinkFnd = sal_False;
+        for( sal_uInt16 n = pLinkMgr->GetLinks().Count(); n;  )
             if( _pLink == &(*pLinkMgr->GetLinks()[ --n ]) )
             {
-                bLinkFnd = TRUE;
+                bLinkFnd = sal_True;
                 break;
             }
 
         if( bLinkFnd )
         {
-            Links().SetUpdateMode(FALSE);
+            Links().SetUpdateMode(sal_False);
             Links().GetModel()->Remove( Links().GetEntry( nPos ) );
             SvLBoxEntry* pToUnselect = Links().FirstSelected();
             InsertEntry( *_pLink, nPos, sal_True );
             if(pToUnselect)
-                Links().Select(pToUnselect, FALSE);
-            Links().SetUpdateMode(TRUE);
+                Links().Select(pToUnselect, sal_False);
+            Links().SetUpdateMode(sal_True);
         }
         else
         {
@@ -568,7 +574,7 @@ void SvBaseLinksDlg::SetManager( LinkManager* pNewMgr )
 
     if( pNewMgr )
         // Update muss vor Clear gestoppt werden
-        Links().SetUpdateMode( FALSE );
+        Links().SetUpdateMode( sal_False );
 
     Links().Clear();
     pLinkMgr = pNewMgr;
@@ -576,7 +582,7 @@ void SvBaseLinksDlg::SetManager( LinkManager* pNewMgr )
     if( pLinkMgr )
     {
         SvBaseLinks& rLnks = (SvBaseLinks&)pLinkMgr->GetLinks();
-        for( USHORT n = 0; n < rLnks.Count(); ++n )
+        for( sal_uInt16 n = 0; n < rLnks.Count(); ++n )
         {
             SvBaseLinkRef* pLinkRef = rLnks[ n ];
             if( !pLinkRef->Is() )
@@ -596,13 +602,13 @@ void SvBaseLinksDlg::SetManager( LinkManager* pNewMgr )
             Links().Select( pEntry );
             LinksSelectHdl( 0 );
         }
-        Links().SetUpdateMode( TRUE );
+        Links().SetUpdateMode( sal_True );
         Links().Invalidate();
     }
 }
 
 
-void SvBaseLinksDlg::InsertEntry( const SvBaseLink& rLink, USHORT nPos, sal_Bool bSelect )
+void SvBaseLinksDlg::InsertEntry( const SvBaseLink& rLink, sal_uInt16 nPos, sal_Bool bSelect )
 {
     String aEntry, sFileNm, sLinkNm, sTypeNm, sFilter;
 
@@ -640,12 +646,12 @@ void SvBaseLinksDlg::InsertEntry( const SvBaseLink& rLink, USHORT nPos, sal_Bool
         Links().Select(pE);
 }
 
-SvBaseLink* SvBaseLinksDlg::GetSelEntry( USHORT* pPos )
+SvBaseLink* SvBaseLinksDlg::GetSelEntry( sal_uInt16* pPos )
 {
     SvLBoxEntry* pE = Links().FirstSelected();
-    USHORT nPos;
+    sal_uInt16 nPos;
     if( pE && LISTBOX_ENTRY_NOTFOUND !=
-        ( nPos = (USHORT)Links().GetModel()->GetAbsPos( pE ) ) )
+        ( nPos = (sal_uInt16)Links().GetModel()->GetAbsPos( pE ) ) )
     {
         DBG_ASSERT( pE, "wo kommt der leere Eintrag her?" );
 
@@ -657,8 +663,8 @@ SvBaseLink* SvBaseLinksDlg::GetSelEntry( USHORT* pPos )
 }
 
 void SvBaseLinksDlg::SetType( SvBaseLink& rLink,
-                                    USHORT nSelPos,
-                                    USHORT nType )
+                                    sal_uInt16 nSelPos,
+                                    sal_uInt16 nType )
 {
     rLink.SetUpdateMode( nType );
     rLink.Update();
@@ -673,8 +679,8 @@ void SvBaseLinksDlg::SetActLink( SvBaseLink * pLink )
     if( pLinkMgr )
     {
         const SvBaseLinks& rLnks = pLinkMgr->GetLinks();
-        USHORT nSelect = 0;
-        for( USHORT n = 0; n < rLnks.Count(); ++n )
+        sal_uInt16 nSelect = 0;
+        for( sal_uInt16 n = 0; n < rLnks.Count(); ++n )
         {
             SvBaseLinkRef* pLinkRef = rLnks[ n ];
             // #109573# only visible links have been inserted into the TreeListBox,