1 files changed, 29 insertions, 22 deletions

diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index 4109846bff4c..77e4cc1d2531 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -59,18 +59,18 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( Window *pParent,
     maRbtLinktypTelnet      ( this, CUI_RES (RB_LINKTYP_TELNET) ),
     maFtTarget              ( this, CUI_RES (FT_TARGET_HTML) ),
     maCbbTarget             ( this, INET_PROT_HTTP ),
+    maBtBrowse              ( this, CUI_RES (BTN_BROWSE) ),
     maFtLogin               ( this, CUI_RES (FT_LOGIN) ),
     maEdLogin               ( this, CUI_RES (ED_LOGIN) ),
+    maBtTarget              ( this, CUI_RES (BTN_TARGET) ),
     maFtPassword            ( this, CUI_RES (FT_PASSWD) ),
     maEdPassword            ( this, CUI_RES (ED_PASSWD) ),
     maCbAnonymous           ( this, CUI_RES (CBX_ANONYMOUS) ),
-    maBtBrowse              ( this, CUI_RES (BTN_BROWSE) ),
-    maBtTarget              ( this, CUI_RES (BTN_TARGET) ),
-    mbMarkWndOpen           ( FALSE )
+    mbMarkWndOpen           ( sal_False )
 {
     // Disable display of bitmap names.
-    maBtBrowse.EnableTextDisplay (FALSE);
-    maBtTarget.EnableTextDisplay (FALSE);
+    maBtBrowse.EnableTextDisplay (sal_False);
+    maBtTarget.EnableTextDisplay (sal_False);
 
     InitStdControls();
     FreeResource();
@@ -99,12 +99,12 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( Window *pParent,
     ///////////////////////////////////////
     // set defaults
     maRbtLinktypInternet.Check ();
-    maFtLogin.Show( FALSE );
-    maFtPassword.Show( FALSE );
-    maEdLogin.Show( FALSE );
-    maEdPassword.Show( FALSE );
-    maCbAnonymous.Show( FALSE );
-    maBtTarget.Enable( FALSE );
+    maFtLogin.Show( sal_False );
+    maFtPassword.Show( sal_False );
+    maEdLogin.Show( sal_False );
+    maEdPassword.Show( sal_False );
+    maCbAnonymous.Show( sal_False );
+    maBtTarget.Enable( sal_False );
     maBtBrowse.Enable( maStrStdDocURL != aEmptyStr );
 
     ///////////////////////////////////////
@@ -120,6 +120,13 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( Window *pParent,
     maCbbTarget.SetLoseFocusHdl     ( LINK ( this, SvxHyperlinkInternetTp, LostFocusTargetHdl_Impl ) );
     maCbbTarget.SetModifyHdl        ( LINK ( this, SvxHyperlinkInternetTp, ModifiedTargetHdl_Impl ) );
     maTimer.SetTimeoutHdl           ( LINK ( this, SvxHyperlinkInternetTp, TimeoutHdl_Impl ) );
+
+    maFtTarget.SetAccessibleRelationMemberOf( &maGrpLinkTyp );
+    maCbbTarget.SetAccessibleRelationMemberOf( &maGrpLinkTyp );
+    maBtTarget.SetAccessibleRelationMemberOf( &maGrpLinkTyp );
+    maBtTarget.SetAccessibleRelationLabeledBy( &maFtTarget );
+    maBtBrowse.SetAccessibleRelationMemberOf( &maGrpLinkTyp );
+    maBtBrowse.SetAccessibleRelationLabeledBy( &maFtTarget );
 }
 
 SvxHyperlinkInternetTp::~SvxHyperlinkInternetTp ()
@@ -182,7 +189,7 @@ void SvxHyperlinkInternetTp::setFTPUser(const String& rUser, const String& rPass
     maFtPassword.Enable ();
     maEdLogin.Enable ();
     maEdPassword.Enable ();
-    maCbAnonymous.Check(FALSE);
+    maCbAnonymous.Check(sal_False);
 }
 
 /*************************************************************************
@@ -300,11 +307,11 @@ void SvxHyperlinkInternetTp::SetScheme( const String& aScheme )
 {
     //if  aScheme is empty or unknown the default beaviour is like it where HTTP
 
-    BOOL bFTP = aScheme.SearchAscii( sFTPScheme ) == 0;
-    BOOL bTelnet = FALSE;
+    sal_Bool bFTP = aScheme.SearchAscii( sFTPScheme ) == 0;
+    sal_Bool bTelnet = sal_False;
     if( !bFTP )
         bTelnet = aScheme.SearchAscii( sTelnetScheme ) == 0;
-    BOOL bInternet = !(bFTP || bTelnet);
+    sal_Bool bInternet = !(bFTP || bTelnet);
 
     //update protocol button selection:
     maRbtLinktypFTP.Check(bFTP);
@@ -453,11 +460,11 @@ IMPL_LINK ( SvxHyperlinkInternetTp, ClickBrowseHdl_Impl, void *, EMPTYARG )
     SfxStringItem aName( SID_FILE_NAME, maStrStdDocURL );
     SfxStringItem aRefererItem( SID_REFERER, UniString::CreateFromAscii(
                                 RTL_CONSTASCII_STRINGPARAM( "private:user" ) ) );
-    SfxBoolItem aNewView( SID_OPEN_NEW_VIEW, TRUE );
-    SfxBoolItem aSilent( SID_SILENT, TRUE );
-    SfxBoolItem aReadOnly( SID_DOC_READONLY, TRUE );
+    SfxBoolItem aNewView( SID_OPEN_NEW_VIEW, sal_True );
+    SfxBoolItem aSilent( SID_SILENT, sal_True );
+    SfxBoolItem aReadOnly( SID_DOC_READONLY, sal_True );
 
-    SfxBoolItem aBrowse( SID_BROWSE, TRUE );
+    SfxBoolItem aBrowse( SID_BROWSE, sal_True );
 
     const SfxPoolItem *ppItems[] = { &aName, &aNewView, &aSilent, &aReadOnly, &aRefererItem, &aBrowse, NULL };
     (((SvxHpLinkDlg*)mpDialog)->GetBindings())->Execute( SID_OPENDOC, ppItems, 0, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD );
@@ -523,7 +530,7 @@ void SvxHyperlinkInternetTp::SetMarkStr ( String& aStrMark )
 |*
 |************************************************************************/
 
-void SvxHyperlinkInternetTp::SetOnlineMode( BOOL /*bEnable*/ )
+void SvxHyperlinkInternetTp::SetOnlineMode( sal_Bool /*bEnable*/ )
 {
     // State of target-button in subject to the current url-string
     // ( Can't display any targets in an document, if there is no
@@ -534,9 +541,9 @@ void SvxHyperlinkInternetTp::SetOnlineMode( BOOL /*bEnable*/ )
     if( aStrCurrentTarget == aEmptyStr                ||
         aStrCurrentTarget.EqualsIgnoreCaseAscii( sHTTPScheme )  ||
         aStrCurrentTarget.EqualsIgnoreCaseAscii( sHTTPSScheme ) )
-        maBtTarget.Enable( FALSE );
+        maBtTarget.Enable( sal_False );
     else
-        maBtTarget.Enable( TRUE );
+        maBtTarget.Enable( sal_True );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */