1 files changed, 31 insertions, 28 deletions

diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index 0b4abd3a03f9..4088f56ec7a4 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -96,7 +96,7 @@ SvxFramesComboBox::~SvxFramesComboBox ()
 |*
 |************************************************************************/
 
-SvxHyperURLBox::SvxHyperURLBox( Window* pParent, INetProtocol eSmart, BOOL bAddresses )
+SvxHyperURLBox::SvxHyperURLBox( Window* pParent, INetProtocol eSmart, sal_Bool bAddresses )
 : SvtURLBox         ( pParent, eSmart ),
   DropTargetHelper  ( this ),
   mbAccessAddress   (bAddresses)
@@ -168,7 +168,7 @@ SvxHyperlinkTabPageBase::SvxHyperlinkTabPageBase ( Window *pParent,
     mpBtScript              ( NULL ),
     mbIsCloseDisabled       ( sal_False ),
     mpDialog                ( pParent ),
-    mbStdControlsInit       ( FALSE ),
+    mbStdControlsInit       ( sal_False ),
     aEmptyStr()
 {
     // create bookmark-window
@@ -227,10 +227,13 @@ void SvxHyperlinkTabPageBase::InitStdControls ()
         mpBtScript    = new ImageButton         ( this, ResId (BTN_SCRIPT, *m_pResMgr) );
 
         mpBtScript->SetClickHdl ( LINK ( this, SvxHyperlinkTabPageBase, ClickScriptHdl_Impl ) );
-        mpBtScript->EnableTextDisplay (FALSE);
+        mpBtScript->EnableTextDisplay (sal_False);
+
+        mpBtScript->SetAccessibleRelationMemberOf( mpGrpMore );
+        mpBtScript->SetAccessibleRelationLabeledBy( mpFtForm );
     }
 
-    mbStdControlsInit = TRUE;
+    mbStdControlsInit = sal_True;
 }
 
 /*************************************************************************
@@ -239,12 +242,12 @@ void SvxHyperlinkTabPageBase::InitStdControls ()
 |*
 \************************************************************************/
 
-BOOL SvxHyperlinkTabPageBase::MoveToExtraWnd( Point aNewPos, BOOL bDisConnectDlg )
+sal_Bool SvxHyperlinkTabPageBase::MoveToExtraWnd( Point aNewPos, sal_Bool bDisConnectDlg )
 {
-    BOOL bReturn =  mpMarkWnd->MoveTo ( aNewPos );
+    sal_Bool bReturn =  mpMarkWnd->MoveTo ( aNewPos );
 
     if( bDisConnectDlg )
-        mpMarkWnd->ConnectToDialog( FALSE );
+        mpMarkWnd->ConnectToDialog( sal_False );
 
     return ( !bReturn && IsMarkWndVisible() );
 }
@@ -277,7 +280,7 @@ void SvxHyperlinkTabPageBase::ShowMarkWnd ()
         {
             // Pos Extrawindow anywhere
             MoveToExtraWnd( Point(10,10) );  // very unlikely
-            mpMarkWnd->ConnectToDialog( FALSE );
+            mpMarkWnd->ConnectToDialog( sal_False );
         }
         else
         {
@@ -304,7 +307,7 @@ void SvxHyperlinkTabPageBase::ShowMarkWnd ()
 void SvxHyperlinkTabPageBase::FillStandardDlgFields ( SvxHyperlinkItem* pHyperlinkItem )
 {
     // Frame
-    USHORT nPos = mpCbbFrame->GetEntryPos ( pHyperlinkItem->GetTargetFrame() );
+    sal_uInt16 nPos = mpCbbFrame->GetEntryPos ( pHyperlinkItem->GetTargetFrame() );
     if ( nPos != LISTBOX_ENTRY_NOTFOUND)
         mpCbbFrame->SetText ( pHyperlinkItem->GetTargetFrame() );
 
@@ -356,10 +359,10 @@ void SvxHyperlinkTabPageBase::DoApply ()
 |*
 \************************************************************************/
 
-BOOL SvxHyperlinkTabPageBase::AskApply ()
+sal_Bool SvxHyperlinkTabPageBase::AskApply ()
 {
     // default-implementation
-    return TRUE;
+    return sal_True;
 }
 
 /*************************************************************************
@@ -380,7 +383,7 @@ void SvxHyperlinkTabPageBase::SetMarkStr ( String& /*aStrMark*/ )
 |*
 \************************************************************************/
 
-void SvxHyperlinkTabPageBase::SetOnlineMode( BOOL /*bEnable*/ )
+void SvxHyperlinkTabPageBase::SetOnlineMode( sal_Bool /*bEnable*/ )
 {
     // default-implemtation : do nothing
 }
@@ -402,7 +405,7 @@ void SvxHyperlinkTabPageBase::SetInitFocus()
 |*
 |************************************************************************/
 
-BOOL SvxHyperlinkTabPageBase::IsHTMLDoc() const
+sal_Bool SvxHyperlinkTabPageBase::IsHTMLDoc() const
 {
     return ((SvxHpLinkDlg*)mpDialog)->IsHTMLDoc();
 }
@@ -447,9 +450,9 @@ IMPL_LINK ( SvxHyperlinkTabPageBase, ClickScriptHdl_Impl, void *, EMPTYARG )
             because if no JAVA is installed an error box occurs and then it is possible
             to close the HyperLinkDlg before its child (MacroAssignDlg) -> GPF
          */
-        BOOL bIsInputEnabled = GetParent()->IsInputEnabled();
+        sal_Bool bIsInputEnabled = GetParent()->IsInputEnabled();
         if ( bIsInputEnabled )
-            GetParent()->EnableInput( FALSE );
+            GetParent()->EnableInput( sal_False );
         // <--
         SfxMacroAssignDlg aDlg( this, mxDocumentFrame, *pItemSet );
 
@@ -467,7 +470,7 @@ IMPL_LINK ( SvxHyperlinkTabPageBase, ClickScriptHdl_Impl, void *, EMPTYARG )
                                   SFX_EVENT_MOUSEOUT_OBJECT);
 
         if ( bIsInputEnabled )
-            GetParent()->EnableInput( TRUE );
+            GetParent()->EnableInput( sal_True );
         // <--
         // execute dlg
         DisableClose( sal_True );
@@ -477,7 +480,7 @@ IMPL_LINK ( SvxHyperlinkTabPageBase, ClickScriptHdl_Impl, void *, EMPTYARG )
         {
             const SfxItemSet* pOutSet = aDlg.GetOutputItemSet();
             const SfxPoolItem* pItem;
-            if( SFX_ITEM_SET == pOutSet->GetItemState( SID_ATTR_MACROITEM, FALSE, &pItem ))
+            if( SFX_ITEM_SET == pOutSet->GetItemState( SID_ATTR_MACROITEM, sal_False, &pItem ))
             {
                 pHyperlinkItem->SetMacroTable( ((SvxMacroItem*)pItem)->GetMacroTable() );
             }
@@ -494,7 +497,7 @@ IMPL_LINK ( SvxHyperlinkTabPageBase, ClickScriptHdl_Impl, void *, EMPTYARG )
 |*
 |************************************************************************/
 
-USHORT SvxHyperlinkTabPageBase::GetMacroEvents()
+sal_uInt16 SvxHyperlinkTabPageBase::GetMacroEvents()
 {
     SvxHyperlinkItem *pHyperlinkItem = (SvxHyperlinkItem *)
                                        GetItemSet().GetItem (SID_HYPERLINK_GETLINK);
@@ -516,9 +519,9 @@ SvxMacroTableDtor* SvxHyperlinkTabPageBase::GetMacroTable()
 |*
 |************************************************************************/
 
-BOOL SvxHyperlinkTabPageBase::FileExists( const INetURLObject& rURL )
+sal_Bool SvxHyperlinkTabPageBase::FileExists( const INetURLObject& rURL )
 {
-    BOOL bRet = FALSE;
+    sal_Bool bRet = sal_False;
 
     if( rURL.GetFull().getLength() > 0 )
     {
@@ -597,7 +600,7 @@ void SvxHyperlinkTabPageBase::GetDataFromCommonFields( String& aStrName,
     aStrFrame   = mpCbbFrame->GetText();
     eMode       = (SvxLinkInsertMode) (mpLbForm->GetSelectEntryPos()+1);
     if( IsHTMLDoc() )
-        eMode = (SvxLinkInsertMode) ( UINT16(eMode) | HLINK_HTMLMODE );
+        eMode = (SvxLinkInsertMode) ( sal_uInt16(eMode) | HLINK_HTMLMODE );
 }
 
 /*************************************************************************
@@ -634,7 +637,7 @@ void SvxHyperlinkTabPageBase::Reset( const SfxItemSet& rItemSet)
 |*
 |************************************************************************/
 
-BOOL SvxHyperlinkTabPageBase::FillItemSet( SfxItemSet& rOut)
+sal_Bool SvxHyperlinkTabPageBase::FillItemSet( SfxItemSet& rOut)
 {
     String aStrURL, aStrName, aStrIntName, aStrFrame;
     SvxLinkInsertMode eMode;
@@ -643,14 +646,14 @@ BOOL SvxHyperlinkTabPageBase::FillItemSet( SfxItemSet& rOut)
     if ( !aStrName.Len() ) //automatically create a visible name if the link is created without name
         aStrName = CreateUiNameFromURL(aStrURL);
 
-    USHORT nEvents = GetMacroEvents();
+    sal_uInt16 nEvents = GetMacroEvents();
     SvxMacroTableDtor* pTable = GetMacroTable();
 
     SvxHyperlinkItem aItem( SID_HYPERLINK_SETLINK, aStrName, aStrURL, aStrFrame,
                             aStrIntName, eMode, nEvents, pTable );
     rOut.Put (aItem);
 
-    return TRUE;
+    return sal_True;
 }
 
 String SvxHyperlinkTabPageBase::CreateUiNameFromURL( const String& aStrURL )
@@ -717,7 +720,7 @@ int SvxHyperlinkTabPageBase::DeactivatePage( SfxItemSet* _pSet)
 
     GetCurentItemData ( aStrURL, aStrName, aStrIntName, aStrFrame, eMode);
 
-    USHORT nEvents = GetMacroEvents();
+    sal_uInt16 nEvents = GetMacroEvents();
     SvxMacroTableDtor* pTable = GetMacroTable();
 
     if( _pSet )
@@ -730,12 +733,12 @@ int SvxHyperlinkTabPageBase::DeactivatePage( SfxItemSet* _pSet)
     return( LEAVE_PAGE );
 }
 
-BOOL SvxHyperlinkTabPageBase::ShouldOpenMarkWnd()
+sal_Bool SvxHyperlinkTabPageBase::ShouldOpenMarkWnd()
 {
-    return FALSE;
+    return sal_False;
 }
 
-void SvxHyperlinkTabPageBase::SetMarkWndShouldOpen(BOOL)
+void SvxHyperlinkTabPageBase::SetMarkWndShouldOpen(sal_Bool)
 {
 }