accfixes: added more accessibility information and fixed tab orders in multiple dialogs (cui module)

19 files changed, 119 insertions, 45 deletions

diff --git a/cui/source/dialogs/commonlingui.cxx b/cui/source/dialogs/commonlingui.cxx
index 327ffd4cbc17..115630b86b68 100644
--- a/cui/source/dialogs/commonlingui.cxx
+++ b/cui/source/dialogs/commonlingui.cxx
@@ -109,6 +109,7 @@ SvxCommonLinguisticControl::SvxCommonLinguisticControl( ModalDialog* _pParent )
     SetType( WINDOW_TABPAGE );
 #endif
 
+    aAktWord.SetAccessibleName(aWordText.GetText());
     SetPosSizePixel( Point( 0, 0 ), _pParent->GetOutputSizePixel() );
     Show();
 }
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 4acfe2b8eec7..fa95cfeaa1d1 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -662,6 +662,10 @@ TPGalleryThemeGeneral::TPGalleryThemeGeneral( Window* pParent, const SfxItemSet&
             aFtMSShowChangeDate     ( this, CUI_RES( FT_MS_SHOW_CHANGEDATE ) )
 {
     FreeResource();
+
+    aEdtMSName.SetAccessibleName(GAL_RESID(RID_SVXSTR_GALLERY_THEMENAME));
+    aFiMSImage.SetAccessibleName(GAL_RESID(RID_SVXSTR_GALLERY_THEMENAME));
+    aEdtMSName.SetAccessibleRelationLabeledBy( &aFiMSImage );
 }
 
 // ------------------------------------------------------------------------
@@ -748,13 +752,13 @@ SfxTabPage* TPGalleryThemeGeneral::Create( Window* pParent, const SfxItemSet& rS
 
 TPGalleryThemeProperties::TPGalleryThemeProperties( Window* pWindow, const SfxItemSet& rSet ) :
         SfxTabPage          ( pWindow, CUI_RES( RID_SVXTABPAGE_GALLERYTHEME_FILES ), rSet ),
+        aFtFileType         ( this, CUI_RES(FT_FILETYPE ) ),
+        aCbbFileType        ( this, CUI_RES(CBB_FILETYPE ) ),
+        aLbxFound           ( this, CUI_RES(LBX_FOUND ) ),
         aBtnSearch          ( this, CUI_RES(BTN_SEARCH ) ),
         aBtnTake            ( this, CUI_RES(BTN_TAKE ) ),
         aBtnTakeAll         ( this, CUI_RES(BTN_TAKEALL ) ),
         aCbxPreview         ( this, CUI_RES(CBX_PREVIEW ) ),
-        aCbbFileType        ( this, CUI_RES(CBB_FILETYPE ) ),
-        aLbxFound           ( this, CUI_RES(LBX_FOUND ) ),
-        aFtFileType         ( this, CUI_RES(FT_FILETYPE ) ),
         aWndPreview         ( this, CUI_RES( WND_BRSPRV ) ),
         nCurFilterPos       (0),
         nFirstExtFilterPos  (0),
@@ -766,6 +770,9 @@ TPGalleryThemeProperties::TPGalleryThemeProperties( Window* pWindow, const SfxIt
     FreeResource();
 
     xDialogListener->SetDialogClosedLink( LINK( this, TPGalleryThemeProperties, DialogClosedHdl ) );
+    aLbxFound.SetAccessibleName(GAL_RESID(RID_SVXSTR_GALLERY_FILESFOUND));
+    aWndPreview.SetAccessibleName(aCbxPreview.GetText());
+    aLbxFound.SetAccessibleRelationLabeledBy(&aLbxFound);
 }
 
 // ------------------------------------------------------------------------
diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index 8bbbfb5f8df2..27c4ec085f6b 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -369,10 +369,10 @@ GraphicFilterDialog::GraphicFilterDialog( Window* pParent, const ResId& rResId,
     mfScaleY        ( 0.0 ),
     maSizePixel     ( LogicToPixel( rGraphic.GetPrefSize(), rGraphic.GetPrefMapMode() ) ),
     maPreview       ( this, CUI_RES( CTL_PREVIEW ) ),
-    maFlParameter   ( this, CUI_RES( FL_PARAMETER ) ),
     maBtnOK         ( this, CUI_RES( BTN_OK ) ),
     maBtnCancel     ( this, CUI_RES( BTN_CANCEL ) ),
-    maBtnHelp       ( this, CUI_RES( BTN_HELP ) )
+    maBtnHelp       ( this, CUI_RES( BTN_HELP ) ),
+    maFlParameter   ( this, CUI_RES( FL_PARAMETER ) )
 {
     const Size  aPreviewSize( maPreview.GetOutputSizePixel() );
     Size        aGrfSize( maSizePixel );
@@ -468,6 +468,12 @@ GraphicFilterMosaic::GraphicFilterMosaic( Window* pParent, const Graphic& rGraph
     maCbxEdges.SetToggleHdl( GetModifyHdl() );
 
     maMtrWidth.GrabFocus();
+
+    maFtWidth.SetAccessibleRelationMemberOf(&maFlParameter);
+    maMtrWidth.SetAccessibleRelationMemberOf(&maFlParameter);
+    maFtHeight.SetAccessibleRelationMemberOf(&maFlParameter);
+    maMtrHeight.SetAccessibleRelationMemberOf(&maFlParameter);
+    maCbxEdges.SetAccessibleRelationMemberOf(&maFlParameter);
 }
 
 // -----------------------------------------------------------------------------
diff --git a/cui/source/dialogs/gallery.src b/cui/source/dialogs/gallery.src
index f8d035528c71..b40edf359d32 100644
--- a/cui/source/dialogs/gallery.src
+++ b/cui/source/dialogs/gallery.src
@@ -464,6 +464,23 @@ String RID_SVXSTR_GALLERY_ID_EXISTS
 {
     Text [ en-US ] = "This ID already exists..." ;
 };
+String RID_SVXSTR_GALLERY_THEMEITEMS
+{
+    Text [ en-US ] = "Theme Items";
+};
+String RID_SVXSTR_GALLERY_THEMENAME
+{
+    Text [ en-US ] = "Theme Name";
+};
+String RID_SVXSTR_GALLERY_FILESFOUND
+{
+    Text [ en-US ] = "Files Found";
+};
+String RID_SVXSTR_GALLERY_PREVIEW
+{
+    Text [ en-US ] = "Preview";
+};
+
 
 /******************************************************************************/
 
diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index 1015063b05e3..e58ee6847e59 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -142,6 +142,9 @@ SvxHyperlinkNewDocTp::SvxHyperlinkNewDocTp ( Window *pParent, const SfxItemSet&
 
     maBtCreate.SetClickHdl        ( LINK ( this, SvxHyperlinkNewDocTp, ClickNewHdl_Impl ) );
 
+    maBtCreate.SetAccessibleRelationMemberOf( &maGrpNewDoc );
+    maBtCreate.SetAccessibleRelationLabeledBy( &maFtPath );
+
     FillDocumentList ();
 }
 
diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx
index a87d7710f484..de980ea2879d 100644
--- a/cui/source/dialogs/hldoctp.cxx
+++ b/cui/source/dialogs/hldoctp.cxx
@@ -90,6 +90,10 @@ SvxHyperlinkDocTp::SvxHyperlinkDocTp ( Window *pParent, const SfxItemSet& rItemS
 
     maCbbPath.SetLoseFocusHdl( LINK ( this, SvxHyperlinkDocTp, LostFocusPathHdl_Impl ) );
 
+    maBtBrowse.SetAccessibleRelationMemberOf( &maGrpTarget );
+    maBtBrowse.SetAccessibleRelationLabeledBy( &maFtTarget );
+    maBtFileopen.SetAccessibleRelationMemberOf( &maGrpDocument );
+    maBtFileopen.SetAccessibleRelationLabeledBy( &maFtPath );
     maTimer.SetTimeoutHdl ( LINK ( this, SvxHyperlinkDocTp, TimeoutHdl_Impl ) );
 }
 
diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index 79fde6c7a64c..f1ebbeffc9d7 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -61,13 +61,13 @@ 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 )
 {
     // Set HC bitmaps and display display of bitmap names.
@@ -124,6 +124,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 ()
diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx
index 5ea43e165883..0f435ec1c659 100644
--- a/cui/source/dialogs/hlmailtp.cxx
+++ b/cui/source/dialogs/hlmailtp.cxx
@@ -89,6 +89,9 @@ SvxHyperlinkMailTp::SvxHyperlinkMailTp ( Window *pParent, const SfxItemSet& rIte
 
     if ( !SvtModuleOptions().IsModuleInstalled( SvtModuleOptions::E_SDATABASE ) )
         maBtAdrBook.Hide();
+
+    maBtAdrBook.SetAccessibleRelationMemberOf( &maGrpMailNews );
+    maBtAdrBook.SetAccessibleRelationLabeledBy( &maFtReceiver );
 }
 
 SvxHyperlinkMailTp::~SvxHyperlinkMailTp ()
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index 5d29e652a7d2..1931fb68ef22 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -148,6 +148,9 @@ SvxHlinkDlgMarkWnd::SvxHlinkDlgMarkWnd( SvxHyperlinkTabPageBase *pParent )
     maLbTree.SetStyle( maLbTree.GetStyle() | WB_TABSTOP | WB_BORDER | WB_HASLINES |
                             WB_HASBUTTONS |  //WB_HASLINESATROOT |
                             WB_HSCROLL | WB_HASBUTTONSATROOT );
+
+    maLbTree.SetAccessibleName(String(CUI_RES(STR_MARK_TREE)));
+
 }
 
 SvxHlinkDlgMarkWnd::~SvxHlinkDlgMarkWnd()
diff --git a/cui/source/dialogs/hlmarkwn.hrc b/cui/source/dialogs/hlmarkwn.hrc
index 1ac36dafa099..5fba2376eaf2 100644
--- a/cui/source/dialogs/hlmarkwn.hrc
+++ b/cui/source/dialogs/hlmarkwn.hrc
@@ -28,6 +28,9 @@
 #define BT_APPLY    1
 #define BT_CLOSE    2
 #define TLB_MARK    3
+// IAccessibility2 implementation 2009. ------
+#define STR_MARK_TREE   5000
+// ------ IAccessibility2 implementation 2009.
 
 //#define HYPERLINK_BMP_EXPAND      301
 //#define HYPERLINK_BMP_COLLAPSE    302
diff --git a/cui/source/dialogs/hlmarkwn.src b/cui/source/dialogs/hlmarkwn.src
index 396e8cd573e0..450afc36758f 100644
--- a/cui/source/dialogs/hlmarkwn.src
+++ b/cui/source/dialogs/hlmarkwn.src
@@ -77,19 +77,8 @@ String RID_SVXSTR_HYPDLG_ERR_LERR_DOCNOTOPEN
     Text [ en-US ] = "Couldn't open the document." ;
 };
 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+String STR_MARK_TREE
+{
+    Text [ en-US ] = "Mark Tree" ;
+};
 
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index f9e2c3814552..7787016ff123 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -356,6 +356,9 @@ void SvxHyperlinkTabPageBase::InitStdControls ()
 
         mpBtScript->SetModeImage( Image( ResId( IMG_SCRIPT_HC, *m_pResMgr ) ), BMP_COLOR_HIGHCONTRAST );
         mpBtScript->EnableTextDisplay (FALSE);
+
+        mpBtScript->SetAccessibleRelationMemberOf( mpGrpMore );
+        mpBtScript->SetAccessibleRelationLabeledBy( mpFtForm );
     }
 
     mbStdControlsInit = TRUE;
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index 8cf21129f52c..6b544836ec58 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -206,11 +206,11 @@ SvInsertOleDlg::SvInsertOleDlg
     : InsertObjectDialog_Impl( pParent, CUI_RES( MD_INSERT_OLEOBJECT ), xStorage ),
     aRbNewObject( this, CUI_RES( RB_NEW_OBJECT ) ),
     aRbObjectFromfile( this, CUI_RES( RB_OBJECT_FROMFILE ) ),
+    aGbObject( this, CUI_RES( GB_OBJECT ) ),
     aLbObjecttype( this, CUI_RES( LB_OBJECTTYPE ) ),
     aEdFilepath( this, CUI_RES( ED_FILEPATH ) ),
     aBtnFilepath( this, CUI_RES( BTN_FILEPATH ) ),
     aCbFilelink( this, CUI_RES( CB_FILELINK ) ),
-    aGbObject( this, CUI_RES( GB_OBJECT ) ),
     aOKButton1( this, CUI_RES( 1 ) ),
     aCancelButton1( this, CUI_RES( 1 ) ),
     aHelpButton1( this, CUI_RES( 1 ) ),
@@ -226,6 +226,7 @@ SvInsertOleDlg::SvInsertOleDlg
     aRbObjectFromfile.SetClickHdl( aLink );
     aRbNewObject.Check( TRUE );
     RadioHdl( NULL );
+    aBtnFilepath.SetAccessibleRelationMemberOf(&aGbObject);
 }
 
 short SvInsertOleDlg::Execute()
@@ -449,11 +450,11 @@ IMPL_LINK( SvInsertPlugInDialog, BrowseHdl, PushButton *, EMPTYARG )
 
 SvInsertPlugInDialog::SvInsertPlugInDialog( Window* pParent, const uno::Reference < embed::XStorage >& xStorage )
     : InsertObjectDialog_Impl( pParent, CUI_RES( MD_INSERT_OBJECT_PLUGIN ), xStorage ),
+    aGbFileurl( this, CUI_RES( GB_FILEURL ) ),
     aEdFileurl( this, CUI_RES( ED_FILEURL ) ),
     aBtnFileurl( this, CUI_RES( BTN_FILEURL ) ),
-    aGbFileurl( this, CUI_RES( GB_FILEURL ) ),
-    aEdPluginsOptions( this, CUI_RES( ED_PLUGINS_OPTIONS ) ),
     aGbPluginsOptions( this, CUI_RES( GB_PLUGINS_OPTIONS ) ),
+    aEdPluginsOptions( this, CUI_RES( ED_PLUGINS_OPTIONS ) ),
     aOKButton1( this, CUI_RES( 1 ) ),
     aCancelButton1( this, CUI_RES( 1 ) ),
     aHelpButton1( this, CUI_RES( 1 ) ),
@@ -739,22 +740,23 @@ SfxInsertFloatingFrameDialog::SfxInsertFloatingFrameDialog( Window *pParent,
     , aFTURL ( this, CUI_RES( FT_URL ) )
     , aEDURL ( this, CUI_RES( ED_URL ) )
     , aBTOpen ( this, CUI_RES(BT_FILEOPEN ) )
+
+    , aFLScrolling ( this, CUI_RES( GB_SCROLLING ) )
     , aRBScrollingOn ( this, CUI_RES( RB_SCROLLINGON ) )
     , aRBScrollingOff ( this, CUI_RES( RB_SCROLLINGOFF ) )
     , aRBScrollingAuto ( this, CUI_RES( RB_SCROLLINGAUTO ) )
-    , aFLScrolling ( this, CUI_RES( GB_SCROLLING ) )
     , aFLSepLeft( this, CUI_RES( FL_SEP_LEFT ) )
+    , aFLFrameBorder( this, CUI_RES( GB_BORDER ) )
     , aRBFrameBorderOn ( this, CUI_RES( RB_FRMBORDER_ON ) )
     , aRBFrameBorderOff ( this, CUI_RES( RB_FRMBORDER_OFF ) )
-    , aFLFrameBorder( this, CUI_RES( GB_BORDER ) )
     , aFLSepRight( this, CUI_RES( FL_SEP_RIGHT ) )
+    , aFLMargin( this, CUI_RES( GB_MARGIN ) )
     , aFTMarginWidth ( this, CUI_RES( FT_MARGINWIDTH ) )
     , aNMMarginWidth ( this, CUI_RES( NM_MARGINWIDTH ) )
     , aCBMarginWidthDefault( this, CUI_RES( CB_MARGINHEIGHTDEFAULT ) )
     , aFTMarginHeight ( this, CUI_RES( FT_MARGINHEIGHT ) )
     , aNMMarginHeight ( this, CUI_RES( NM_MARGINHEIGHT ) )
     , aCBMarginHeightDefault( this, CUI_RES( CB_MARGINHEIGHTDEFAULT ) )
-    , aFLMargin( this, CUI_RES( GB_MARGIN ) )
     , aOKButton1( this, CUI_RES( 1 ) )
     , aCancelButton1( this, CUI_RES( 1 ) )
     , aHelpButton1( this, CUI_RES( 1 ) )
@@ -783,22 +785,25 @@ SfxInsertFloatingFrameDialog::SfxInsertFloatingFrameDialog( Window *pParent, con
     , aFTURL ( this, CUI_RES( FT_URL ) )
     , aEDURL ( this, CUI_RES( ED_URL ) )
     , aBTOpen ( this, CUI_RES(BT_FILEOPEN ) )
+
+    , aFLScrolling ( this, CUI_RES( GB_SCROLLING ) )
     , aRBScrollingOn ( this, CUI_RES( RB_SCROLLINGON ) )
     , aRBScrollingOff ( this, CUI_RES( RB_SCROLLINGOFF ) )
     , aRBScrollingAuto ( this, CUI_RES( RB_SCROLLINGAUTO ) )
-    , aFLScrolling ( this, CUI_RES( GB_SCROLLING ) )
+
     , aFLSepLeft( this, CUI_RES( FL_SEP_LEFT ) )
+    , aFLFrameBorder( this, CUI_RES( GB_BORDER ) )
     , aRBFrameBorderOn ( this, CUI_RES( RB_FRMBORDER_ON ) )
     , aRBFrameBorderOff ( this, CUI_RES( RB_FRMBORDER_OFF ) )
-    , aFLFrameBorder( this, CUI_RES( GB_BORDER ) )
+
     , aFLSepRight( this, CUI_RES( FL_SEP_RIGHT ) )
+    , aFLMargin( this, CUI_RES( GB_MARGIN ) )
     , aFTMarginWidth ( this, CUI_RES( FT_MARGINWIDTH ) )
     , aNMMarginWidth ( this, CUI_RES( NM_MARGINWIDTH ) )
     , aCBMarginWidthDefault( this, CUI_RES( CB_MARGINHEIGHTDEFAULT ) )
     , aFTMarginHeight ( this, CUI_RES( FT_MARGINHEIGHT ) )
     , aNMMarginHeight ( this, CUI_RES( NM_MARGINHEIGHT ) )
     , aCBMarginHeightDefault( this, CUI_RES( CB_MARGINHEIGHTDEFAULT ) )
-    , aFLMargin( this, CUI_RES( GB_MARGIN ) )
     , aOKButton1( this, CUI_RES( 1 ) )
     , aCancelButton1( this, CUI_RES( 1 ) )
     , aHelpButton1( this, CUI_RES( 1 ) )
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index 0193cefa2964..cf92f4185b0d 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -80,21 +80,22 @@ SvBaseLinksDlg::SvBaseLinksDlg( Window * pParent, LinkManager* pMgr, BOOL bHtml
     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 ) ),
@@ -104,8 +105,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();
 
@@ -117,6 +117,12 @@ SvBaseLinksDlg::SvBaseLinksDlg( Window * pParent, LinkManager* pMgr, BOOL bHtml
     //JP 24.02.99: 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();
 
diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx
index 1d3af44facf6..a2b9b67b756f 100644
--- a/cui/source/dialogs/multipat.cxx
+++ b/cui/source/dialogs/multipat.cxx
@@ -220,6 +220,9 @@ SvxMultiPathDialog::SvxMultiPathDialog( Window* pParent, BOOL bEmptyAllowed ) :
     aDelBtn.SetClickHdl( LINK( this, SvxMultiPathDialog, DelHdl_Impl ) );
 
     SelectHdl_Impl( NULL );
+
+    aAddBtn.SetAccessibleRelationMemberOf(&aPathLB);
+    aDelBtn.SetAccessibleRelationMemberOf(&aPathLB);
 }
 
 // -----------------------------------------------------------------------
diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx
index 2fe952b9197a..4b0dec5ebaeb 100644
--- a/cui/source/dialogs/pastedlg.cxx
+++ b/cui/source/dialogs/pastedlg.cxx
@@ -53,10 +53,10 @@ SvPasteObjectDialog::SvPasteObjectDialog( Window* pParent )
     aFtObjectSource( this, CUI_RES( FT_OBJECT_SOURCE ) ),
     aRbPaste( this, CUI_RES( RB_PASTE ) ),
     aRbPasteLink( this, CUI_RES( RB_PASTE_LINK ) ),
-    aLbInsertList( this, CUI_RES( LB_INSERT_LIST ) ),
     aCbDisplayAsIcon( this, CUI_RES( CB_DISPLAY_AS_ICON ) ),
     aPbChangeIcon( this, CUI_RES( PB_CHANGE_ICON ) ),
     aFlChoice( this, CUI_RES( FL_CHOICE ) ),
+    aLbInsertList( this, CUI_RES( LB_INSERT_LIST ) ),
     aOKButton1( this, CUI_RES( 1 ) ),
     aCancelButton1( this, CUI_RES( 1 ) ),
     aHelpButton1( this, CUI_RES( 1 ) ),
@@ -74,6 +74,8 @@ SvPasteObjectDialog::SvPasteObjectDialog( Window* pParent )
     ObjectLB().SetSelectHdl( LINK( this, SvPasteObjectDialog, SelectHdl ) );
     ObjectLB().SetDoubleClickHdl( LINK( this, SvPasteObjectDialog, DoubleClickHdl ) );
     SetDefault();
+
+    aLbInsertList.SetAccessibleName(aFlChoice.GetText());
 }
 
 void SvPasteObjectDialog::SelectObject()
diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx
index 8ff20084f591..4177b39edc8d 100644
--- a/cui/source/dialogs/postdlg.cxx
+++ b/cui/source/dialogs/postdlg.cxx
@@ -159,6 +159,10 @@ SvxPostItDialog::SvxPostItDialog( Window* pParent,
         SetText( CUI_RESSTR( STR_NOTIZ_INSERT ) );
 
     FreeResource();
+
+    aEditED.SetAccessibleRelationLabeledBy(&aEditFT);
+    aEditED.SetAccessibleRelationMemberOf(&aPostItFL);
+    aAuthorBtn.SetAccessibleRelationMemberOf(&aPostItFL);
 }
 
 // -----------------------------------------------------------------------
diff --git a/cui/source/dialogs/splitcelldlg.cxx b/cui/source/dialogs/splitcelldlg.cxx
index 1025d53c5b1f..b92be7d35be1 100644
--- a/cui/source/dialogs/splitcelldlg.cxx
+++ b/cui/source/dialogs/splitcelldlg.cxx
@@ -38,13 +38,13 @@
 
 SvxSplitTableDlg::SvxSplitTableDlg( Window *pParent, bool bIsTableVertical, long nMaxVertical, long nMaxHorizontal )
 : SvxStandardDialog(pParent, CUI_RES(RID_SVX_SPLITCELLDLG))
+, maCountFL(this, CUI_RES(FL_COUNT))
 , maCountLbl(this, CUI_RES(FT_COUNT))
 , maCountEdit(this, CUI_RES(ED_COUNT))
-, maCountFL(this, CUI_RES(FL_COUNT))
+, maDirFL(this, CUI_RES(FL_DIR))
 , maHorzBox(this, CUI_RES(RB_HORZ))
 , maVertBox(this, CUI_RES(RB_VERT))
 , maPropCB(this, CUI_RES(CB_PROP))
-, maDirFL(this, CUI_RES(FL_DIR))
 , maOKBtn(this, CUI_RES(BT_OK))
 , maCancelBtn(this, CUI_RES(BT_CANCEL))
 , maHelpBtn( this, CUI_RES( BT_HELP ) )
diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx
index e838e94c0db6..d4c93e3dca62 100644
--- a/cui/source/dialogs/zoom.cxx
+++ b/cui/source/dialogs/zoom.cxx
@@ -230,6 +230,14 @@ SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ) :
     aUserEdit.SetLast( nMax );
     aUserEdit.SetValue( nValue );
 
+    aUserEdit.SetAccessibleRelationLabeledBy( &aUserBtn );
+    aUserEdit.SetAccessibleName(aUserBtn.GetText());
+    aColumnsEdit.SetAccessibleRelationLabeledBy(&aColumnsBtn);
+    aColumnsEdit.SetAccessibleName(aColumnsBtn.GetText());
+    aColumnsEdit.SetAccessibleRelationMemberOf(&aColumnsBtn);
+    aBookModeChk.SetAccessibleRelationLabeledBy(&aColumnsBtn);
+    aBookModeChk.SetAccessibleRelationMemberOf(&aColumnsBtn);
+
     const SfxPoolItem& rItem = rSet.Get( rSet.GetPool()->GetWhich( SID_ATTR_ZOOM ) );
 
     if ( rItem.ISA(SvxZoomItem) )