dba34d: pulled and merged latest changes from CWS dba34c

107 files changed, 738 insertions, 482 deletions

diff --git a/accessibility/inc/accessibility/standard/vclxaccessiblelistboxlist.hxx b/accessibility/inc/accessibility/standard/vclxaccessiblelistboxlist.hxx
deleted file mode 100644
index 829a4337e878..000000000000
--- a/accessibility/inc/accessibility/standard/vclxaccessiblelistboxlist.hxx
+++ /dev/null
@@ -1,112 +0,0 @@
-/*************************************************************************
- *
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
- * Copyright 2000, 2010 Oracle and/or its affiliates.
- *
- * OpenOffice.org - a multi-platform office productivity suite
- *
- * This file is part of OpenOffice.org.
- *
- * OpenOffice.org is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Lesser General Public License version 3
- * only, as published by the Free Software Foundation.
- *
- * OpenOffice.org is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Lesser General Public License version 3 for more details
- * (a copy is included in the LICENSE file that accompanied this code).
- *
- * You should have received a copy of the GNU Lesser General Public License
- * version 3 along with OpenOffice.org.  If not, see
- * <http://www.openoffice.org/license.html>
- * for a copy of the LGPLv3 License.
- *
- ************************************************************************/
-
-#ifndef ACCESSIBILITY_STANDARD_VCLXACCESSIBLELISTBOXLIST_HXX
-#define ACCESSIBILITY_STANDARD_VCLXACCESSIBLELISTBOXLIST_HXX
-
-#include <accessibility/standard/vclxaccessiblelist.hxx>
-#include <com/sun/star/accessibility/XAccessibleAction.hpp>
-#include <com/sun/star/accessibility/XAccessibleEventBroadcaster.hpp>
-#ifndef _COMPHELPER_BROADCASTHELPER_HXX
-#include <comphelper/broadcasthelper.hxx>
-#endif
-#ifndef _COMPHELPER_UNO3_HXX
-#include <comphelper/uno3.hxx>
-#endif
-#ifndef _CPPUHELPER_IMPLBASE1_HXX
-#include <cppuhelper/implbase1.hxx>
-#endif
-
-typedef ::cppu::ImplHelper1 <   ::com::sun::star::accessibility::XAccessibleSelection
-                            >   VCLXAccessibleListBoxList_BASE;
-
-
-class ListBox;
-/** This class extends the list of the <type>VCLXAccessibleList</type> class
-    about selection.
-*/
-class VCLXAccessibleListBoxList :
-    public VCLXAccessibleList,
-    public VCLXAccessibleListBoxList_BASE
-{
-public:
-    VCLXAccessibleListBoxList (VCLXWindow* pVCLXindow, BoxType aBoxType,
-                               const ::com::sun::star::uno::Reference<
-                                   ::com::sun::star::accessibility::XAccessible >& _xParent);
-
-    // XInterface
-    DECLARE_XINTERFACE( )
-
-    // XTypeProvider
-    DECLARE_XTYPEPROVIDER( )
-
-    // XServiceInfo
-    virtual ::rtl::OUString SAL_CALL getImplementationName (void)
-        throw (::com::sun::star::uno::RuntimeException);
-    // Return list box list specific services.
-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
-        getSupportedServiceNames (void)
-        throw (::com::sun::star::uno::RuntimeException);
-
-    // XAccessibleSelection
-    void        SAL_CALL selectAccessibleChild( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
-    sal_Bool    SAL_CALL isAccessibleChildSelected( sal_Int32 nChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
-    void        SAL_CALL clearAccessibleSelection(  ) throw (::com::sun::star::uno::RuntimeException);
-    void        SAL_CALL selectAllAccessibleChildren(  ) throw (::com::sun::star::uno::RuntimeException);
-    sal_Int32   SAL_CALL getSelectedAccessibleChildCount(  ) throw (::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > SAL_CALL getSelectedAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
-    void        SAL_CALL deselectAccessibleChild( sal_Int32 nSelectedChildIndex ) throw (::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::uno::RuntimeException);
-
-    /** Create the specified child and insert it into the list of children.
-        Sets the child's states.
-    */
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >
-        CreateChild (sal_Int32 i);
-
-
-protected:
-    virtual ~VCLXAccessibleListBoxList (void);
-
-    virtual void ProcessWindowEvent (const VclWindowEvent& rVclWindowEvent);
-
-private:
-    sal_Int32   m_nLastTopEntry;
-    sal_uInt16      m_nLastSelectedPos;
-    bool        m_bDisableProcessEvent;
-
-    void UpdateEntryRange_Impl (void);
-    using VCLXAccessibleList::UpdateSelection_Impl;
-    void UpdateSelection_Impl (void);
-    using VCLXAccessibleList::checkEntrySelected;
-    sal_Bool checkEntrySelected(ListBox* _pListBox,
-                            sal_uInt16 _nPos,
-                            ::com::sun::star::uno::Any& _rNewValue,
-                            ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible >& _rxNewAcc);
-};
-
-#endif // ACCESSIBILITY_STANDARD_VCLXACCESSIBLELISTBOX_HXX
-
diff --git a/accessibility/prj/build.lst b/accessibility/prj/build.lst
index 4fbfe135137f..c9a8c345e056 100755
--- a/accessibility/prj/build.lst
+++ b/accessibility/prj/build.lst
@@ -1,4 +1,4 @@
-ac  accessibility	:    l10n tools jurt offuh unoil vcl javaunohelper jvmaccess cppu sal toolkit svtools LIBXSLT:libxslt NULL
+ac  accessibility	:    L10N:l10n tools jurt offuh unoil vcl javaunohelper jvmaccess cppu sal toolkit svtools LIBXSLT:libxslt NULL
 ac	accessibility                                         	usr1	-	all	ac_mkout NULL
 ac	accessibility\inc                                      	nmake	-	all	ac_inc NULL
 ac	accessibility\bridge\org\openoffice\java\accessibility	nmake	-	w	ac_ooja ac_inc NULL
diff --git a/accessibility/source/extended/AccessibleGridControlTable.cxx b/accessibility/source/extended/AccessibleGridControlTable.cxx
index 461e776f1392..406baeb2973c 100755
--- a/accessibility/source/extended/AccessibleGridControlTable.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTable.cxx
@@ -245,8 +245,7 @@ void SAL_CALL AccessibleGridControlTable::selectAccessibleChild( sal_Int32 nChil
     ensureIsValidIndex( nChildIndex );
     sal_Int32 nColumns = m_aTable.GetColumnCount();
     sal_Int32 nRow = (nChildIndex / nColumns);
-    std::vector< sal_Int32 > selectedRows = m_aTable.GetSelectedRows();
-    selectedRows.push_back(nRow);
+    m_aTable.SelectRow( nRow, sal_True );
 }
 sal_Bool SAL_CALL AccessibleGridControlTable::isAccessibleChildSelected( sal_Int32 nChildIndex )
     throw ( lang::IndexOutOfBoundsException, uno::RuntimeException )
@@ -265,8 +264,7 @@ void SAL_CALL AccessibleGridControlTable::clearAccessibleSelection()
     TCSolarGuard aSolarGuard;
     ::osl::MutexGuard aGuard( getOslMutex() );
     ensureIsAlive();
-    for(unsigned int i=0;i<m_aTable.GetSelectedRows().size();i++)
-        m_aTable.RemoveSelectedRow((sal_Int32)i);
+    m_aTable.SelectAllRows( false );
 }
 void SAL_CALL AccessibleGridControlTable::selectAllAccessibleChildren()
     throw ( uno::RuntimeException )
diff --git a/accessibility/source/extended/AccessibleGridControlTableBase.cxx b/accessibility/source/extended/AccessibleGridControlTableBase.cxx
index f6d1147ad309..d97feb1277ec 100755..100644
--- a/accessibility/source/extended/AccessibleGridControlTableBase.cxx
+++ b/accessibility/source/extended/AccessibleGridControlTableBase.cxx
@@ -245,7 +245,10 @@ sal_Int32 AccessibleGridControlTableBase::implGetChildIndex(
 
 void AccessibleGridControlTableBase::implGetSelectedRows( Sequence< sal_Int32 >& rSeq )
 {
-    rSeq = comphelper::containerToSequence(m_aTable.GetSelectedRows());
+    sal_Int32 const selectionCount( m_aTable.GetSelectedRowCount() );
+    rSeq.realloc( selectionCount );
+    for ( sal_Int32 i=0; i<selectionCount; ++i )
+        rSeq[i] = m_aTable.GetSelectedRowIndex(i);
 }
 
 void AccessibleGridControlTableBase::ensureIsValidRow( sal_Int32 nRow )
diff --git a/accessibility/source/standard/vclxaccessiblebox.cxx b/accessibility/source/standard/vclxaccessiblebox.cxx
index 784588938bb8..86b98768736a 100644
--- a/accessibility/source/standard/vclxaccessiblebox.cxx
+++ b/accessibility/source/standard/vclxaccessiblebox.cxx
@@ -31,7 +31,6 @@
 #include <accessibility/standard/vclxaccessibletextfield.hxx>
 #include <accessibility/standard/vclxaccessibleedit.hxx>
 #include <accessibility/standard/vclxaccessiblelist.hxx>
-#include <accessibility/standard/vclxaccessiblelistboxlist.hxx>
 #include <accessibility/helper/listboxhelper.hxx>
 
 #include <unotools/accessiblestatesethelper.hxx>
diff --git a/automation/source/server/statemnt.cxx b/automation/source/server/statemnt.cxx
index 4b40f39a1d77..8b7a57bb4a47 100644
--- a/automation/source/server/statemnt.cxx
+++ b/automation/source/server/statemnt.cxx
@@ -82,6 +82,7 @@
 #include <svtools/valueset.hxx>
 #include <svtools/roadmap.hxx>
 #include <svtools/table/tablecontrol.hxx>
+#include <svtools/table/tablecontrolinterface.hxx>
 #include <svl/poolitem.hxx>
 #include <svtools/extensionlistbox.hxx>
 // Hat keinen Includeschutz
@@ -6111,7 +6112,8 @@ protected:
                                                          ValueOK( aUId, MethodString( nMethodId ), nNr2, pTC->GetRowCount() ))
                                                     {
                                                         ::svt::table::PTableModel pModel = pTC->GetModel();
-                                                        Any aCell = pModel->getCellContent()[nNr2-1][nNr1-1];
+                                                        Any aCell;
+                                                        pModel->getCellContent( nNr1-1, nNr2-1, aCell );
                                                         pRet->GenReturn ( RET_Value, aUId, String( aCell.getValueTypeName() ));
                                                     }
                                                 }
@@ -6122,7 +6124,8 @@ protected:
                                                          ValueOK( aUId, MethodString( nMethodId ), nNr2, pTC->GetRowCount() ))
                                                     {
                                                         ::svt::table::PTableModel pModel = pTC->GetModel();
-                                                        Any aCell = pModel->getCellContent()[nNr2-1][nNr1-1];
+                                                        Any aCell;
+                                                        pModel->getCellContent( nNr1-1, nNr2-1, aCell );
                                                         /* doesn't work ATM since it gets casted to SbxDATE in VCLTestTool unfortunately
                                                         SbxVariableRef xRes = new SbxVariable( SbxVARIANT );
                                                         unoToSbxValue( xRes, aCell );
@@ -6206,7 +6209,7 @@ protected:
                                                             Point aPos( aSize.Width() / 2, aSize.Height() / 2 );
                                                             long nStep = aSize.Height() / 4;
                                                             ::svt::table::RowPos nLastPos;
-                                                            while ( ( nLastPos = pTC->GetCurrentRow( aPos ) ) != nNr1-1 && nStep > 0 )
+                                                            while ( ( nLastPos = pTC->getTableControlInterface().hitTest( aPos ).nRow ) != nNr1-1 && nStep > 0 )
                                                             {
                                                                 if ( nLastPos > nNr1-1 || nLastPos == ROW_INVALID )
                                                                     aPos.Y() -= nStep;
@@ -6214,7 +6217,7 @@ protected:
                                                                     aPos.Y() += nStep;
                                                                 nStep /= 2;
                                                             }
-                                                            if ( pTC->GetCurrentRow( aPos ) == nNr1-1 )
+                                                            if ( pTC->getTableControlInterface().hitTest( aPos ).nRow == nNr1-1 )
                                                             {
                                                                 MouseEvent aMEvnt(aPos,1,MOUSE_SIMPLECLICK|MOUSE_SELECT,MOUSE_LEFT,KEY_MOD1);
                                                                 pTC->getSelEngine()->SelMouseButtonDown( aMEvnt );
@@ -6231,13 +6234,13 @@ protected:
                                                 }
                                                 break;
                                             case M_GetSelCount :
-                                                pRet->GenReturn ( RET_Value, aUId, comm_USHORT( pTC->GetSelectedRows().size() ));
+                                                pRet->GenReturn ( RET_Value, aUId, comm_USHORT( pTC->GetSelectedRowCount() ));
                                                 break;
                                             case M_GetSelIndex :
                                                 if ( ! (nParams & PARAM_USHORT_1) )
                                                     nNr1 = 1;
-                                                if ( ValueOK( aUId, CUniString("GetSelIndex"), nNr1, pTC->GetSelectedRows().size() ) )
-                                                    pRet->GenReturn ( RET_Value, aUId, comm_USHORT( pTC->GetSelectedRows()[nNr1-1] +1 ) );
+                                                if ( ValueOK( aUId, CUniString("GetSelIndex"), nNr1, pTC->GetSelectedRowCount() ) )
+                                                    pRet->GenReturn ( RET_Value, aUId, comm_USHORT( pTC->GetSelectedRowIndex( nNr1-1 ) +1 ) );
                                                 break;
 /*                                          case M_GetSelText :
                                                 if ( ! (nParams & PARAM_USHORT_1) )
diff --git a/basctl/prj/build.lst b/basctl/prj/build.lst
index 0c5283ff0aec..1f92577d2eae 100644
--- a/basctl/prj/build.lst
+++ b/basctl/prj/build.lst
@@ -1,4 +1,4 @@
-bc	basctl	: LIBXSLT:libxslt l10n svx NULL
+bc	basctl	: LIBXSLT:libxslt L10N:l10n svx NULL
 bc	basctl									usr1	-	all	bc_mkout NULL
 bc	basctl\inc								nmake	-	all	bc_inc NULL
 bc	basctl\source\inc						get		-	all	bc_sinc NULL
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 8dcad1f5608b..25aa457cfcc2 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1183,6 +1183,9 @@ WatchWindow::WatchWindow( Window* pParent ) :
                                   | WB_HASLINESATROOT | WB_HASBUTTONSATROOT ),
     aHeaderBar( this, WB_BUTTONSTYLE | WB_BORDER )
 {
+    aXEdit.SetAccessibleName(String(IDEResId( RID_STR_WATCHNAME)));
+    aTreeListBox.SetAccessibleName(String(IDEResId(RID_STR_WATCHNAME)));
+
     nVirtToolBoxHeight = aXEdit.GetSizePixel().Height() + 7;
     nHeaderBarHeight = 16;
 
@@ -1521,7 +1524,8 @@ StackWindow::StackWindow( Window* pParent ) :
     aGotoCallButton( this, IDEResId( RID_IMGBTN_GOTOCALL ) ),
     aStackStr( IDEResId( RID_STR_STACK ) )
 {
-    aTreeListBox.SetHelpId(HID_BASICIDE_STACKWINDOW_LIST);
+       aTreeListBox.SetHelpId(HID_BASICIDE_STACKWINDOW_LIST);
+    aTreeListBox.SetAccessibleName(String( IDEResId(RID_STR_STACKNAME)));
     aTreeListBox.SetPosPixel( Point( DWBORDER, nVirtToolBoxHeight ) );
     aTreeListBox.SetHighlightRange();
     aTreeListBox.SetSelectionMode( NO_SELECTION );
diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx
index 4d6bfa923f37..b6fef1100e4e 100644
--- a/basctl/source/basicide/moduldl2.cxx
+++ b/basctl/source/basicide/moduldl2.cxx
@@ -498,9 +498,9 @@ LibPage::LibPage( Window * pParent )
     ,aEditButton( this, IDEResId( RID_PB_EDIT ) )
     ,aCloseButton( this, IDEResId( RID_PB_CLOSE ) )
     ,aPasswordButton( this, IDEResId( RID_PB_PASSWORD ) )
-    ,aExportButton( this, IDEResId( RID_PB_EXPORT ) )
     ,aNewLibButton( this, IDEResId( RID_PB_NEWLIB ) )
     ,aInsertLibButton( this, IDEResId( RID_PB_APPEND ) )
+    ,aExportButton( this, IDEResId( RID_PB_EXPORT ) )
     ,aDelButton( this, IDEResId( RID_PB_DELETE ) )
     ,m_aCurDocument( ScriptDocument::getApplicationScriptDocument() )
     ,m_eCurLocation( LIBRARY_LOCATION_UNKNOWN )
diff --git a/basctl/source/basicide/moduldlg.hxx b/basctl/source/basicide/moduldlg.hxx
index 93263b020453..7152e699da3b 100644
--- a/basctl/source/basicide/moduldlg.hxx
+++ b/basctl/source/basicide/moduldlg.hxx
@@ -229,9 +229,9 @@ protected:
     PushButton          aEditButton;
     CancelButton        aCloseButton;
     PushButton          aPasswordButton;
-    PushButton          aExportButton;
     PushButton          aNewLibButton;
     PushButton          aInsertLibButton;
+    PushButton          aExportButton;
     PushButton          aDelButton;
 
     ScriptDocument      m_aCurDocument;
diff --git a/basctl/source/basicide/objdlg.cxx b/basctl/source/basicide/objdlg.cxx
index 9b9006953411..fbd1c8262669 100644
--- a/basctl/source/basicide/objdlg.cxx
+++ b/basctl/source/basicide/objdlg.cxx
@@ -108,8 +108,10 @@ ObjectCatalog::ObjectCatalog( Window * pParent )
                              WB_HSCROLL );
 
     aMacroTreeList.SetSelectHdl( LINK( this, ObjectCatalog, TreeListHighlightHdl ) );
-
+    aMacroTreeList.SetAccessibleName(String(IDEResId(RID_STR_TLB_MACROS)));
     aMacroTreeList.ScanAllEntries();
+    aMacroTreeList.GrabFocus();
+
     CheckButtons();
 
     Point aPos = IDE_DLL()->GetExtraData()->GetObjectCatalogPos();
diff --git a/basctl/source/basicide/objdlg.hrc b/basctl/source/basicide/objdlg.hrc
index 930ab31a4ae8..a090d45fc6e9 100644
--- a/basctl/source/basicide/objdlg.hrc
+++ b/basctl/source/basicide/objdlg.hrc
@@ -37,4 +37,6 @@
 
 #define TBITEM_SHOW     1
 
+#define RID_STR_TLB_MACROS      ( RID_BASICIDE_START + 71 )
+
 #endif // _OBJDLG_HXX
diff --git a/basctl/source/basicide/objdlg.src b/basctl/source/basicide/objdlg.src
index 2d7981dd1c28..1331be5a992c 100644
--- a/basctl/source/basicide/objdlg.src
+++ b/basctl/source/basicide/objdlg.src
@@ -92,3 +92,9 @@ FloatingWindow RID_BASICIDE_OBJCAT
         Size = MAP_APPFONT ( 185 , 18 ) ;
     };
 };
+
+String RID_STR_TLB_MACROS
+{
+    Text [ en-US ] = "Objects Tree";
+};
+
diff --git a/crashrep/prj/build.lst b/crashrep/prj/build.lst
index ef1c85cc1c62..6e4b552c6585 100755
--- a/crashrep/prj/build.lst
+++ b/crashrep/prj/build.lst
@@ -1,4 +1,4 @@
-cr	crashrep	:    l10n sal sysui SO:tools shell NULL
+cr	crashrep	:    L10N:l10n sal sysui SO:tools shell NULL
 cr	crashrep				usr1	-	all	cr_mkout NULL
 cr	crashrep\source\all		nmake	-	all	cr_sresource NULL
 cr	crashrep\source\unx		nmake	-	u	cr_sunx NULL
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 359d4417fae1..1da522170ab2 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -1666,6 +1666,15 @@ SvxConfigPage::SvxConfigPage(
     aDescriptionField.SetControlBackground( GetSettings().GetStyleSettings().GetDialogColor() );
     aDescriptionField.SetAutoScroll( sal_True );
     aDescriptionField.EnableCursor( sal_False );
+
+    aMoveUpButton.SetAccessibleName(String(CUI_RES(BUTTON_STR_UP)));
+    aMoveDownButton.SetAccessibleName(String(CUI_RES(BUTTON_STR_DOWN)));
+    aMoveUpButton.SetAccessibleRelationMemberOf(&aContentsSeparator);
+    aMoveDownButton.SetAccessibleRelationMemberOf(&aContentsSeparator);
+    aNewTopLevelButton.SetAccessibleRelationMemberOf(&aTopLevelSeparator);
+    aModifyTopLevelButton.SetAccessibleRelationMemberOf(&aTopLevelSeparator);
+    aAddCommandsButton.SetAccessibleRelationMemberOf(&aContentsSeparator);
+    aModifyCommandButton.SetAccessibleRelationMemberOf(&aContentsSeparator);
 }
 
 SvxConfigPage::~SvxConfigPage()
@@ -2924,6 +2933,9 @@ SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog(
         LINK( this, SvxMainMenuOrganizerDialog, MoveHdl) );
     aMoveDownButton.SetClickHdl (
         LINK( this, SvxMainMenuOrganizerDialog, MoveHdl) );
+
+    aMoveUpButton.SetAccessibleName(String(CUI_RES(BUTTON_STR_UP)));
+    aMoveDownButton.SetAccessibleName(String(CUI_RES(BUTTON_STR_DOWN)));
 }
 
 IMPL_LINK(SvxMainMenuOrganizerDialog, ModifyHdl, Edit*, pEdit)
diff --git a/cui/source/customize/cfg.hrc b/cui/source/customize/cfg.hrc
index 74d7804dce8e..302f226623a3 100644
--- a/cui/source/customize/cfg.hrc
+++ b/cui/source/customize/cfg.hrc
@@ -103,3 +103,8 @@
 #define EDT_ADDR (121 + CFG_OFFSET)
 #define MD_BTN_OK (122 + CFG_OFFSET)
 #define FI_INFO (123 + CFG_OFFSET)
+
+//IAccessibility2 Implementation 2009-----
+#define BUTTON_STR_UP   (130 + CFG_OFFSET)
+#define BUTTON_STR_DOWN (131 + CFG_OFFSET)
+//-----IAccessibility2 Implementation 2009
diff --git a/cui/source/customize/cfg.src b/cui/source/customize/cfg.src
index 743aa7009fbc..66ac237a523b 100644
--- a/cui/source/customize/cfg.src
+++ b/cui/source/customize/cfg.src
@@ -888,4 +888,12 @@ String RID_SVXSTR_RENAME_TOOLBAR
     Text [ en-US ] = "Rename Toolbar";
 };
 
+String BUTTON_STR_UP
+{
+    Text [ en-US ] = "Up";
+};
+String BUTTON_STR_DOWN
+{
+    Text [ en-US ] = "Down";
+};
 
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 fcc4f002703d..98600eb765ff 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -54,6 +54,9 @@
 #include <sfx2/sfxuno.hxx>
 #include "dialmgr.hxx"
 #include "gallery.hrc"
+#include <svx/dialogs.hrc>
+#include <svx/dialmgr.hxx>
+
 
 // --------------
 // - Namespaces -
@@ -662,6 +665,11 @@ TPGalleryThemeGeneral::TPGalleryThemeGeneral( Window* pParent, const SfxItemSet&
             aFtMSShowChangeDate     ( this, CUI_RES( FT_MS_SHOW_CHANGEDATE ) )
 {
     FreeResource();
+
+    String aAccName(SVX_RES(RID_SVXSTR_GALLERY_THEMENAME));
+    aEdtMSName.SetAccessibleName(aAccName);
+    aFiMSImage.SetAccessibleName(aAccName);
+    aEdtMSName.SetAccessibleRelationLabeledBy( &aFiMSImage );
 }
 
 // ------------------------------------------------------------------------
@@ -674,8 +682,8 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData )
     String              aOutStr( String::CreateFromInt32( pThm->GetObjectCount() ) );
     String              aObjStr( CUI_RES( RID_SVXSTR_GALLERYPROPS_OBJECT ) );
     String              aAccess;
-    String              aType( CUI_RES( RID_SVXSTR_GALLERYPROPS_GALTHEME ) );
-    sal_Bool                bReadOnly = pThm->IsReadOnly() && !pThm->IsImported();
+    String              aType( SVX_RES( RID_SVXSTR_GALLERYPROPS_GALTHEME ) );
+    sal_Bool            bReadOnly = pThm->IsReadOnly() && !pThm->IsImported();
 
     aEdtMSName.SetHelpId( HID_GALLERY_EDIT_MSNAME );
     aEdtMSName.SetText( pThm->GetName() );
@@ -748,13 +756,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 +774,9 @@ TPGalleryThemeProperties::TPGalleryThemeProperties( Window* pWindow, const SfxIt
     FreeResource();
 
     xDialogListener->SetDialogClosedLink( LINK( this, TPGalleryThemeProperties, DialogClosedHdl ) );
+    aLbxFound.SetAccessibleName(String(SVX_RES(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 572cb56c4512..eea084548b2b 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..b1c53e65c706 100644
--- a/cui/source/dialogs/gallery.src
+++ b/cui/source/dialogs/gallery.src
@@ -448,10 +448,6 @@ String RID_SVXSTR_GALLERYPROPS_OBJECT
 {
     Text [ en-US ] = "Object;Objects" ;
 };
-String RID_SVXSTR_GALLERYPROPS_GALTHEME
-{
-    Text [ en-US ] = "Gallery Theme" ;
-};
 String RID_SVXSTR_GALLERY_READONLY
 {
     Text [ en-US ] = " (read-only)" ;
diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index 483f36a9e199..cc0bfdd4522f 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 526a44277e06..ab87245f293a 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 9aefda6b44bb..9ce0de2ea801 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           ( sal_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 a7d34283face..bb856f596566 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 9898eff9f36b..fc8e94e52885 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 28bf46ce241e..cd8f1a3c123f 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 (sal_False);
+
+        mpBtScript->SetAccessibleRelationMemberOf( mpGrpMore );
+        mpBtScript->SetAccessibleRelationLabeledBy( mpFtForm );
     }
 
     mbStdControlsInit = sal_True;
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index 0173eb22d75d..0923f322e154 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( sal_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 202e50134c9a..a991974bd914 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -80,21 +80,22 @@ SvBaseLinksDlg::SvBaseLinksDlg( Window * pParent, LinkManager* pMgr, sal_Bool bH
     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, sal_Bool bH
     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, sal_Bool bH
     //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 c378cc40e1ad..4585e7350c6d 100644
--- a/cui/source/dialogs/multipat.cxx
+++ b/cui/source/dialogs/multipat.cxx
@@ -220,6 +220,9 @@ SvxMultiPathDialog::SvxMultiPathDialog( Window* pParent, sal_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 be2a7b4cfdbb..2ae45c319e87 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 b446be7118fc..67bcf17f68be 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 e10abfa475d7..8d3f034068f5 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 f537e6b152b3..15640292d951 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) )
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index 01172af4a435..921e104110ec 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -84,6 +84,13 @@ private:
     SvxBackgroundTabPage( Window* pParent, const SfxItemSet& rCoreSet );
     ~SvxBackgroundTabPage();
 
+    FixedText               aSelectTxt;
+    ListBox                 aLbSelect;
+    const String            aStrBrowse;
+    const String            aStrUnlinked;
+     FixedText               aTblDesc;
+     ListBox                 aTblLBox;
+     ListBox                 aParaLBox;
     // Hintergrundfarbe ------------------------------------
     Control                 aBorderWin;
     ValueSet                aBackgroundColorSet;
@@ -92,34 +99,24 @@ private:
     //color transparency
     FixedText               aColTransFT;
     MetricField             aColTransMF;
+    CheckBox                aBtnPreview;
     // Hintergrund-Bitmap ----------------------------------
+     FixedLine               aGbFile;
     PushButton              aBtnBrowse;
     CheckBox                aBtnLink;
-    CheckBox                aBtnPreview;
-    FixedInfo               aFtFile;
-    FixedLine               aGbFile;
+      FixedLine               aGbPosition;
     RadioButton             aBtnPosition;
     RadioButton             aBtnArea;
     RadioButton             aBtnTile;
     SvxRectCtl              aWndPosition;
-    FixedLine               aGbPosition;
+    FixedInfo               aFtFile;
     //transparency of graphics
     FixedLine               aGraphTransFL;
     MetricField             aGraphTransMF;
 
     BackgroundPreviewImpl*  pPreviewWin2;
-    // Selektor --------------------------------------------
-    FixedText               aSelectTxt;
-    ListBox                 aLbSelect;
-    const String            aStrBrowse;
-    const String            aStrUnlinked;
 
     // DDListBox fuer Writer -------------------------------
-
-    FixedText               aTblDesc;
-    ListBox                 aTblLBox;
-    ListBox                 aParaLBox;
-
     //------------------------------------------------------
     Color       aBgdColor;
     sal_uInt16      nHtmlMode;
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index 459e927eff3e..b3d426df7173 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -309,13 +309,13 @@ class TPGalleryThemeProperties : public SfxTabPage
     friend class TakeProgress;
     friend class TakeThread;
 
+    FixedText           aFtFileType;
+    ComboBox            aCbbFileType;
+    MultiListBox        aLbxFound;
     PushButton          aBtnSearch;
     PushButton          aBtnTake;
     PushButton          aBtnTakeAll;
     CheckBox            aCbxPreview;
-    ComboBox            aCbbFileType;
-    MultiListBox        aLbxFound;
-    FixedText           aFtFileType;
     GalleryPreview      aWndPreview;
 
     ExchangeData*       pData;
diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx
index 455ebd021f4c..ea34511cb298 100644
--- a/cui/source/inc/cuigrfflt.hxx
+++ b/cui/source/inc/cuigrfflt.hxx
@@ -97,16 +97,16 @@ private:
     double          mfScaleX;
     double          mfScaleY;
     Size            maSizePixel;
-    PreviewWindow   maPreview;
-    FixedLine       maFlParameter;
-    OKButton        maBtnOK;
-    CancelButton    maBtnCancel;
-    HelpButton      maBtnHelp;
 
                     DECL_LINK( ImplPreviewTimeoutHdl, Timer* pTimer );
                     DECL_LINK( ImplModifyHdl, void* p );
 
 protected:
+    PreviewWindow   maPreview;
+    OKButton        maBtnOK;
+    CancelButton    maBtnCancel;
+    HelpButton      maBtnHelp;
+    FixedLine       maFlParameter;
 
     const Link&     GetModifyHdl() const { return maModifyHdl; }
     const Size&     GetGraphicSizePixel() const { return maSizePixel; }
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index 360c2bc99750..d80239da302c 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -104,6 +104,7 @@ class SvxLineTabPage : public SvxTabPage
     using TabPage::ActivatePage;
     using TabPage::DeactivatePage;
 private:
+    FixedLine           aFlLine;
     FixedText           aFtLineStyle;
     LineLB              aLbLineStyle;
     FixedText           aFtColor;
@@ -112,19 +113,18 @@ private:
     MetricField         aMtrLineWidth;
     FixedText           aFtTransparent;
     MetricField         aMtrTransparent;
-    FixedLine           aFlLine;
-    FixedText           aFtLineEndsStyle;
+    FixedLine           aFlLineEnds;
     LineEndLB           aLbStartStyle;
-    FixedText           aFtLineEndsWidth;
     MetricField         aMtrStartWidth;
     TriStateBox         aTsbCenterStart;
+    FixedText           aFtLineEndsStyle;
     LineEndLB           aLbEndStyle;
+    FixedText           aFtLineEndsWidth;
     MetricField         aMtrEndWidth;
     TriStateBox         aTsbCenterEnd;
     CheckBox            aCbxSynchronize;
-    FixedLine           aFlLineEnds;
-    SvxXLinePreview     aCtlPreview;
     FixedLine           aFLSeparator;
+    SvxXLinePreview     aCtlPreview;
 
     // #116827#
     FixedLine           maFLEdgeStyle;
diff --git a/cui/source/inc/gallery.hrc b/cui/source/inc/gallery.hrc
index c9d6729be447..d813fa7c7f56 100644
--- a/cui/source/inc/gallery.hrc
+++ b/cui/source/inc/gallery.hrc
@@ -44,7 +44,6 @@
 #define RID_SVXSTR_GALLERY_NOFILES              (RID_CUI_GALLERY_START + 12)
 #define RID_SVXSTR_GALLERY_SEARCH               (RID_CUI_GALLERY_START + 30)
 #define RID_SVXSTR_GALLERYPROPS_OBJECT          (RID_CUI_GALLERY_START + 39)
-#define RID_SVXSTR_GALLERYPROPS_GALTHEME        (RID_CUI_GALLERY_START + 40)
 #define RID_SVXSTR_GALLERY_READONLY             (RID_CUI_GALLERY_START + 43)
 #define RID_SVXSTR_GALLERY_ALLFILES             (RID_CUI_GALLERY_START + 44)
 #define RID_SVXSTR_GALLERY_ID_EXISTS            (RID_CUI_GALLERY_START + 81)
diff --git a/cui/source/inc/hlinettp.hxx b/cui/source/inc/hlinettp.hxx
index 36f5919c02e7..c69e6021d215 100644
--- a/cui/source/inc/hlinettp.hxx
+++ b/cui/source/inc/hlinettp.hxx
@@ -46,13 +46,13 @@ private:
     RadioButton         maRbtLinktypTelnet;
     FixedText           maFtTarget;
     SvxHyperURLBox      maCbbTarget;
+    ImageButton         maBtBrowse;
     FixedText           maFtLogin;
     Edit                maEdLogin;
+    ImageButton         maBtTarget;
     FixedText           maFtPassword;
     Edit                maEdPassword;
     CheckBox            maCbAnonymous;
-    ImageButton         maBtBrowse;
-    ImageButton         maBtTarget;
 
     String              maStrOldUser;
     String              maStrOldPassword;
diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx
index aeab4d94dbf8..b6d8dbafd6d5 100644
--- a/cui/source/inc/insdlg.hxx
+++ b/cui/source/inc/insdlg.hxx
@@ -63,11 +63,11 @@ class SvInsertOleDlg : public InsertObjectDialog_Impl
 {
     RadioButton aRbNewObject;
     RadioButton aRbObjectFromfile;
+    FixedLine aGbObject;
     ListBox aLbObjecttype;
     Edit aEdFilepath;
     PushButton aBtnFilepath;
     CheckBox aCbFilelink;
-    FixedLine aGbObject;
     OKButton aOKButton1;
     CancelButton aCancelButton1;
     HelpButton aHelpButton1;
@@ -103,11 +103,11 @@ public:
 class SvInsertPlugInDialog : public InsertObjectDialog_Impl
 {
 private:
+    FixedLine aGbFileurl;
     Edit aEdFileurl;
     PushButton aBtnFileurl;
-    FixedLine aGbFileurl;
-    MultiLineEdit aEdPluginsOptions;
     FixedLine aGbPluginsOptions;
+    MultiLineEdit aEdPluginsOptions;
     OKButton aOKButton1;
     CancelButton aCancelButton1;
     HelpButton aHelpButton1;
@@ -174,24 +174,25 @@ private:
     Edit                    aEDURL;
     PushButton              aBTOpen;
 
+    FixedLine               aFLScrolling;
     RadioButton             aRBScrollingOn;
     RadioButton             aRBScrollingOff;
     RadioButton             aRBScrollingAuto;
-    FixedLine               aFLScrolling;
+
 
     FixedLine               aFLSepLeft;
+    FixedLine               aFLFrameBorder;
     RadioButton             aRBFrameBorderOn;
     RadioButton             aRBFrameBorderOff;
-    FixedLine               aFLFrameBorder;
 
     FixedLine               aFLSepRight;
+    FixedLine               aFLMargin;
     FixedText               aFTMarginWidth;
     NumericField            aNMMarginWidth;
     CheckBox                aCBMarginWidthDefault;
     FixedText               aFTMarginHeight;
     NumericField            aNMMarginHeight;
     CheckBox                aCBMarginHeightDefault;
-    FixedLine               aFLMargin;
 
     OKButton aOKButton1;
     CancelButton aCancelButton1;
diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx
index 114e62679844..57cf02ec982d 100644
--- a/cui/source/inc/linkdlg.hxx
+++ b/cui/source/inc/linkdlg.hxx
@@ -57,21 +57,22 @@ class SvBaseLinksDlg : public ModalDialog
     FixedText aFtLinks;
     FixedText aFtType;
     FixedText aFtStatus;
-    CancelButton aCancelButton1;
-    HelpButton aHelpButton1;
-    PushButton aPbUpdateNow;
-    PushButton aPbOpenSource;
-    PushButton aPbChangeSource;
-    PushButton aPbBreakLink;
+    SvTabListBox aTbLinks;
     FixedText aFtFiles2;
+    FixedText aFtFullFileName;
     FixedText aFtSource2;
+    FixedText aFtFullSourceName;
     FixedText aFtType2;
+    FixedText aFtFullTypeName;
     FixedText aFtUpdate;
     RadioButton aRbAutomatic;
     RadioButton aRbManual;
-    FixedText aFtFullFileName;
-    FixedText aFtFullSourceName;
-    FixedText aFtFullTypeName;
+    CancelButton aCancelButton1;
+    HelpButton aHelpButton1;
+    PushButton aPbUpdateNow;
+    PushButton aPbOpenSource;
+    PushButton aPbChangeSource;
+    PushButton aPbBreakLink;
     String aStrAutolink;
     String aStrManuallink;
     String aStrBrokenlink;
@@ -82,7 +83,6 @@ class SvBaseLinksDlg : public ModalDialog
     String aStrWaitinglink;
     sfx2::LinkManager*  pLinkMgr;
     sal_Bool            bHtmlMode;
-    SvTabListBox aTbLinks;
     Timer aUpdateTimer;
 
 #if _SOLAR__PRIVATE
diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx
index b6f092788116..bc9fe65eaf48 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -116,14 +116,14 @@ private:
     FixedText               aFtLanguage;
     SvxLanguageBox          aLbLanguage;
     CheckBox                aCbSourceFormat;
-
+    SvxNumberPreviewImpl    aWndPreview;
+    FixedLine               aFlOptions;
     FixedText               aFtDecimals;
     NumericField            aEdDecimals;
+    CheckBox                aBtnNegRed;
     FixedText               aFtLeadZeroes;
     NumericField            aEdLeadZeroes;
-    CheckBox                aBtnNegRed;
     CheckBox                aBtnThousand;
-    FixedLine               aFlOptions;
 
     FixedText               aFtEdFormat;
     Edit                    aEdFormat;
@@ -135,7 +135,6 @@ private:
     Edit                    aEdComment;
     Timer                   aResetWinTimer;
 
-    SvxNumberPreviewImpl    aWndPreview;
 
     SvxNumberInfoItem*      pNumItem;
     SvxNumberFormatShell*   pNumFmtShell;
diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx
index 27627b96c9f3..295483f042e0 100644
--- a/cui/source/inc/optdict.hxx
+++ b/cui/source/inc/optdict.hxx
@@ -63,12 +63,12 @@ namespace linguistic2{
 class SvxNewDictionaryDialog : public ModalDialog
 {
 private:
+    FixedLine            aNewDictBox;
     FixedText           aNameText;
     Edit                aNameEdit;
     FixedText           aLanguageText;
     SvxLanguageBox      aLanguageLB;
     CheckBox            aExceptBtn;
-    FixedLine            aNewDictBox;
     OKButton            aOKBtn;
     CancelButton        aCancelBtn;
     HelpButton          aHelpBtn;
@@ -132,8 +132,8 @@ private:
     PushButton              aDeletePB;
     FixedLine                aEditDictsBox;
 
-    CancelButton            aCloseBtn;
     HelpButton              aHelpBtn;
+    CancelButton            aCloseBtn;
     String                  sModify;
     String                  sNew;
     DecorationView          aDecoView;
diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx
index 053cbdcad8dc..87d02d36f860 100644
--- a/cui/source/inc/page.hxx
+++ b/cui/source/inc/page.hxx
@@ -125,6 +125,7 @@ class SvxPageDescPage : public SfxTabPage
     FixedText           aBottomMarginLbl;
     MetricField         aBottomMarginEdit;
 
+    FixedLine           aBottomSeparatorFl;
     // layout settings
     FixedLine           aLayoutFL;
     FixedText           aPageText;
@@ -132,7 +133,6 @@ class SvxPageDescPage : public SfxTabPage
     FixedText           aNumberFormatText;
     ListBox             aNumberFormatBox;
 
-    FixedLine           aBottomSeparatorFl;
 
     //Extras Calc
     FixedText           aTblAlignFT;
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index 49778aec5e81..7f7eae0c2641 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -71,6 +71,7 @@ class SvxStdParagraphTabPage: public SfxTabPage
 private:
     SvxStdParagraphTabPage( Window* pParent, const SfxItemSet& rSet );
 
+    FixedLine               aIndentFrm;
     // Einzug
     FixedText               aLeftLabel;
     SvxRelativeField        aLeftIndent;
@@ -82,27 +83,26 @@ private:
     SvxRelativeField        aFLineIndent;
     CheckBox                aAutoCB;
 
-    FixedLine               aIndentFrm;
+    FixedLine               aDistFrm;
 
     // Abstaende
     FixedText               aTopLabel;
     SvxRelativeField        aTopDist;
     FixedText               aBottomLabel;
     SvxRelativeField        aBottomDist;
-    FixedLine               aDistFrm;
 
     // Zeilenabstand
+    FixedLine               aLineDistFrm;
     ListBox                 aLineDist;
     FixedText               aLineDistAtLabel;
     MetricField             aLineDistAtPercentBox;
     MetricField             aLineDistAtMetricBox;
-    FixedLine               aLineDistFrm;
     String                  sAbsDist;
     SvxParaPrevWindow       aExampleWin;
 
     //Registerhaltigkeit - nur Writer
-    CheckBox                aRegisterCB;
     FixedLine               aRegisterFL;
+    CheckBox                aRegisterCB;
 
     Edit*                   pActLineDistFld;
     long                    nAbst;
@@ -237,6 +237,7 @@ private:
                         SvxExtParagraphTabPage( Window* pParent, const SfxItemSet& rSet );
 
     // Silbentrennung
+    FixedLine           aExtFL;
     TriStateBox         aHyphenBox;
     FixedText           aBeforeText;
     NumericField        aExtHyphenBeforeBox;
@@ -246,7 +247,6 @@ private:
 //  FixedText           aHyphenAfterLabel;
     FixedText           aMaxHyphenLabel;
     NumericField        aMaxHyphenEdit;
-    FixedLine           aExtFL;
 
     // Seitenumbruch
     FixedLine           aBreaksFL;
diff --git a/cui/source/inc/pastedlg.hxx b/cui/source/inc/pastedlg.hxx
index f59c3612dc91..2568ab9b2b5e 100644
--- a/cui/source/inc/pastedlg.hxx
+++ b/cui/source/inc/pastedlg.hxx
@@ -54,10 +54,10 @@ class SvPasteObjectDialog : public ModalDialog
     FixedText aFtObjectSource;
     RadioButton aRbPaste;
     RadioButton aRbPasteLink;
-    ListBox aLbInsertList;
     CheckBox aCbDisplayAsIcon;
     PushButton aPbChangeIcon;
     FixedLine aFlChoice;
+    ListBox aLbInsertList;
     OKButton aOKButton1;
     CancelButton aCancelButton1;
     HelpButton aHelpButton1;
diff --git a/cui/source/inc/splitcelldlg.hxx b/cui/source/inc/splitcelldlg.hxx
index 4e08cebf2866..b9aa0a030d20 100644
--- a/cui/source/inc/splitcelldlg.hxx
+++ b/cui/source/inc/splitcelldlg.hxx
@@ -37,13 +37,13 @@
 
 class SvxSplitTableDlg : public SvxAbstractSplittTableDialog, public SvxStandardDialog
 {
+    FixedLine           maCountFL;
     FixedText           maCountLbl;
     NumericField        maCountEdit;
-    FixedLine           maCountFL;
+    FixedLine           maDirFL;
     ImageRadioButton    maHorzBox;
     ImageRadioButton    maVertBox;
     CheckBox            maPropCB;
-    FixedLine           maDirFL;
     OKButton            maOKBtn;
     CancelButton        maCancelBtn;
     HelpButton          maHelpBtn;
diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx
index 5aa7703862b2..f195ccdc9ea6 100644
--- a/cui/source/inc/tabstpge.hxx
+++ b/cui/source/inc/tabstpge.hxx
@@ -94,10 +94,11 @@ private:
     SvxTabulatorTabPage( Window* pParent, const SfxItemSet& rSet );
 
     // Tabulatoren und Positionen
-    MetricBox       aTabBox;
     FixedLine       aTabLabel;
+    MetricBox       aTabBox;
     FixedLine       aTabLabelVert;
 
+    FixedLine       aTabTypeLabel;
     // TabType
     RadioButton     aLeftTab;
     RadioButton     aRightTab;
@@ -111,8 +112,8 @@ private:
 
     FixedText       aDezCharLabel;
     Edit            aDezChar;
-    FixedLine       aTabTypeLabel;
 
+    FixedLine       aFillLabel;
     // Fuellzeichen
     RadioButton     aNoFillChar;
     RadioButton     aFillPoints;
@@ -120,8 +121,6 @@ private:
     RadioButton     aFillSolidLine;
     RadioButton     aFillSpecial;
     Edit            aFillChar;
-    FixedLine       aFillLabel;
-
     // Buttons
     PushButton      aNewBtn;
     PushButton      aDelAllBtn;
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index be5750400b69..06906bc38b49 100755
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -101,12 +101,12 @@ SvxNewDictionaryDialog::SvxNewDictionaryDialog( Window* pParent,
 
     ModalDialog( pParent, CUI_RES( RID_SFXDLG_NEWDICT ) ),
 
+    aNewDictBox     ( this, CUI_RES( GB_NEWDICT ) ),
     aNameText       ( this, CUI_RES( FT_DICTNAME ) ),
     aNameEdit       ( this, CUI_RES( ED_DICTNAME ) ),
     aLanguageText   ( this, CUI_RES( FT_DICTLANG ) ),
     aLanguageLB     ( this, CUI_RES( LB_DICTLANG ) ),
     aExceptBtn      ( this, CUI_RES( BTN_EXCEPT ) ),
-    aNewDictBox     ( this, CUI_RES( GB_NEWDICT ) ),
     aOKBtn          ( this, CUI_RES( BTN_NEWDICT_OK ) ),
     aCancelBtn      ( this, CUI_RES( BTN_NEWDICT_ESC ) ),
     aHelpBtn        ( this, CUI_RES( BTN_NEWDICT_HLP ) ),
@@ -121,6 +121,11 @@ SvxNewDictionaryDialog::SvxNewDictionaryDialog( Window* pParent,
     aLanguageLB.SetLanguageList( LANG_LIST_ALL, sal_True, sal_True );
     aLanguageLB.SelectEntryPos(0);
 
+    aNameText.SetAccessibleRelationMemberOf( &aNewDictBox );
+    aNameEdit.SetAccessibleRelationMemberOf( &aNewDictBox );
+    aLanguageText.SetAccessibleRelationMemberOf( &aNewDictBox );
+    aLanguageLB.SetAccessibleRelationMemberOf( &aNewDictBox );
+
     FreeResource();
 }
 
@@ -230,6 +235,7 @@ SvxEditDictionaryDialog::SvxEditDictionaryDialog(
     aAllDictsLB     ( this, CUI_RES( LB_ALLDICTS ) ),
     aLangFT         ( this, CUI_RES( FT_DICTLANG ) ),
     aLangLB         ( this, CUI_RES( LB_DICTLANG ) ),
+
     aWordFT         ( this, CUI_RES( FT_WORD ) ),
     aWordED         ( this, CUI_RES( ED_WORD ) ),
     aReplaceFT      ( this, CUI_RES( FT_REPLACE ) ),
@@ -238,8 +244,8 @@ SvxEditDictionaryDialog::SvxEditDictionaryDialog(
     aNewReplacePB   ( this, CUI_RES( PB_NEW_REPLACE ) ),
     aDeletePB       ( this, CUI_RES( PB_DELETE_REPLACE ) ),
     aEditDictsBox   ( this, CUI_RES( GB_EDITDICTS ) ),
-    aCloseBtn       ( this, CUI_RES( BTN_EDITCLOSE ) ),
     aHelpBtn        ( this, CUI_RES( BTN_EDITHELP ) ),
+    aCloseBtn       ( this, CUI_RES( BTN_EDITCLOSE ) ),
     sModify         (CUI_RES(STR_MODIFY)),
     sNew            (aNewReplacePB.GetText()),
     aDecoView       ( this),
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index f5fb40e917f6..c20db45248c9 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1176,6 +1176,13 @@ SvxLinguTabPage::SvxLinguTabPage( Window* pParent,
     else
         aMoreDictsLink.Hide();
 
+    String sAccessibleNameModuleEdit( CUI_RES( STR_LINGU_MODULES_EDIT ) );
+    String sAccessibleNameDicsEdit  ( CUI_RES( STR_LINGU_DICS_EDIT_DIC ) );
+    String sAccessibleNameOptionEdit( CUI_RES( STR_LINGU_OPTIONS_EDIT ) );
+
+    aLinguModulesEditPB.SetAccessibleName(sAccessibleNameModuleEdit);
+    aLinguDicsEditPB.SetAccessibleName(sAccessibleNameDicsEdit);
+    aLinguOptionsEditPB.SetAccessibleName(sAccessibleNameOptionEdit);
 
     // force recalculation of hash value used for checking the need of updating
     // because new dictionaries might be installed / downloaded.
diff --git a/cui/source/options/optlingu.hrc b/cui/source/options/optlingu.hrc
index 6a73b7321235..824e2236e9c6 100644
--- a/cui/source/options/optlingu.hrc
+++ b/cui/source/options/optlingu.hrc
@@ -85,4 +85,8 @@
 #define CLB_EDIT_MODULES_MODULES            320
 #define FT_EDIT_MODULES_NEWDICTSLINK        321
 #define FL_EDIT_MODULES_BUTTONS             322
-
+// IAccessibility2 implementation 2009. ------
+#define STR_LINGU_MODULES_EDIT          323
+#define STR_LINGU_DICS_EDIT_DIC         324
+#define STR_LINGU_OPTIONS_EDIT          325
+// ------ IAccessibility2 implementation 2009.
diff --git a/cui/source/options/optlingu.src b/cui/source/options/optlingu.src
index 12192ad8ac4b..1187295b2ac3 100755
--- a/cui/source/options/optlingu.src
+++ b/cui/source/options/optlingu.src
@@ -344,6 +344,19 @@ TabPage RID_SFXPAGE_LINGU
     {
         Text [ en-US ] = "Hyphenate special regions";
     };
+    String STR_LINGU_MODULES_EDIT
+    {
+        Text [ en-US ] = "Edit Available language modules";
+    };
+    String STR_LINGU_DICS_EDIT_DIC
+    {
+        Text [ en-US ] = "Edit User-defined dictionaries";
+    };
+    String STR_LINGU_OPTIONS_EDIT
+    {
+        Text [ en-US ] = "Edit Options";
+    };
+    // ------ IAccessibility2 implementation 2009.
 };
 // end: TabPage RID_SFXPAGE_LINGU
 
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 49228356ef17..de26a157e21b 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -598,6 +598,8 @@ OfaTreeOptionsDialog::OfaTreeOptionsDialog(
     ResizeTreeLB();
     if (bActivateLastSelection)
         ActivateLastSelection();
+
+    aTreeLB.SetAccessibleName(GetDisplayText());
 }
 
 // Ctor() with ExtensionId -----------------------------------------------
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index bcf8dca6b7d1..d50ee7b5752d 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -197,6 +197,10 @@ AlignmentTabPage::AlignmentTabPage( Window* pParent, const SfxItemSet& rCoreAttr
     AddItemConnection( new sfx::CheckBoxConnection( SID_ATTR_ALIGN_SHRINKTOFIT, maBtnShrink, sfx::ITEMCONN_HIDE_UNKNOWN ) );
     AddItemConnection( new sfx::DummyItemConnection( SID_ATTR_FRAMEDIRECTION, maFtFrameDir, sfx::ITEMCONN_HIDE_UNKNOWN ) );
     AddItemConnection( new FrameDirListBoxConnection( SID_ATTR_FRAMEDIRECTION, maLbFrameDir, sfx::ITEMCONN_HIDE_UNKNOWN ) );
+
+    maLbHorAlign.SetAccessibleRelationMemberOf( &maFlAlignment );
+    maEdIndent.SetAccessibleRelationMemberOf( &maFlAlignment );
+    maLbVerAlign.SetAccessibleRelationMemberOf( &maFlAlignment );
 }
 
 AlignmentTabPage::~AlignmentTabPage()
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 420786ce52a2..afc38b00adb4 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -1607,6 +1607,11 @@ OfaAutocorrExceptPage::OfaAutocorrExceptPage( Window* pParent,
     aAutoCapsCB     (this, CUI_RES(CB_AUTOCAPS   )),
     eLang(eLastDialogLanguage)
 {
+    aNewAbbrevPB.SetAccessibleName(String(CUI_RES(STR_PB_NEWABBREV) ) );
+    aDelAbbrevPB.SetAccessibleName(String(CUI_RES(STR_PB_DELABBREV) ) );
+    aNewDoublePB.SetAccessibleName(String(CUI_RES(STR_PB_NEWDOUBLECAPS) ) );
+    aDelDoublePB.SetAccessibleName(String(CUI_RES(STR_PB_DELDOUBLECAPS) ) );
+
     FreeResource();
 
     ::com::sun::star::lang::Locale aLcl( SvxCreateLocale(eLastDialogLanguage ));
@@ -1627,6 +1632,10 @@ OfaAutocorrExceptPage::OfaAutocorrExceptPage( Window* pParent,
     aAbbrevED.SetActionHdl(LINK(this, OfaAutocorrExceptPage, NewDelHdl));
     aDoubleCapsED.SetActionHdl(LINK(this, OfaAutocorrExceptPage, NewDelHdl));
 
+    aNewAbbrevPB.SetAccessibleRelationMemberOf(&aAbbrevFL);
+    aDelAbbrevPB.SetAccessibleRelationMemberOf(&aAbbrevFL);
+    aNewDoublePB.SetAccessibleRelationMemberOf(&aDoubleCapsFL);
+    aDelDoublePB.SetAccessibleRelationMemberOf(&aDoubleCapsFL);
 }
 
 /*-----------------14.10.96 15.58-------------------
@@ -2058,6 +2067,13 @@ OfaQuoteTabPage::OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet ) :
 
     sStandard(CUI_RES(ST_STANDARD))
 {
+    aSglStandardPB.SetAccessibleName(String(CUI_RES(STR_PB_SGL_STD) ) );
+    aDblStandardPB.SetAccessibleName(String(CUI_RES(STR_PB_DBL_STD) ) );
+    aStartQuotePB.SetAccessibleName( String(CUI_RES(STR_PB_DBL_START) ));
+    aEndQuotePB.SetAccessibleName(String(CUI_RES(STR_PB_DBL_END) ));
+    aSglStartQuotePB.SetAccessibleName(String(CUI_RES(STR_PB_SGL_START) ));
+    aSglEndQuotePB.SetAccessibleName(String(CUI_RES(STR_PB_SGL_END) ) );
+
     FreeResource();
 
     sal_Bool bShowSWOptions = sal_False;
@@ -2099,6 +2115,16 @@ OfaQuoteTabPage::OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet ) :
     aDblStandardPB.SetClickHdl(LINK(this,   OfaQuoteTabPage, StdQuoteHdl));
     aSglStandardPB.SetClickHdl(LINK(this,   OfaQuoteTabPage, StdQuoteHdl));
 
+    aSglStartQuotePB.SetAccessibleRelationLabeledBy( &aSglStartQuoteFT );
+    aSglEndQuotePB.SetAccessibleRelationLabeledBy( &aSglEndQuoteFT );
+    aSglStartQuotePB.SetAccessibleRelationMemberOf( &aSingleFL );
+    aSglEndQuotePB.SetAccessibleRelationMemberOf( &aSingleFL );
+    aStartQuotePB.SetAccessibleRelationLabeledBy( &aStartQuoteFT );
+    aEndQuotePB.SetAccessibleRelationLabeledBy( &aEndQuoteFT );
+    aStartQuotePB.SetAccessibleRelationMemberOf( &aDoubleFL );
+    aEndQuotePB.SetAccessibleRelationMemberOf( &aDoubleFL );
+    aSglStandardPB.SetAccessibleRelationMemberOf(&aSingleFL);
+    aDblStandardPB.SetAccessibleRelationMemberOf(&aDoubleFL);
 }
 /*-----------------03.07.97 13:17-------------------
 
@@ -2431,6 +2457,7 @@ OfaAutoCompleteTabPage::OfaAutoCompleteTabPage( Window* pParent,
     aPBEntries.SetClickHdl(LINK(this, OfaAutoCompleteTabPage, DeleteHdl));
     aCBActiv.SetToggleHdl(LINK(this, OfaAutoCompleteTabPage, CheckHdl));
     aCBCollect.SetToggleHdl(LINK(this, OfaAutoCompleteTabPage, CheckHdl));
+    aLBEntries.SetAccessibleRelationLabeledBy(&aLBEntries);
 }
 
 OfaAutoCompleteTabPage::~OfaAutoCompleteTabPage()
diff --git a/cui/source/tabpages/autocdlg.hrc b/cui/source/tabpages/autocdlg.hrc
index 1e77c22b4fa9..8920dadd35a0 100644
--- a/cui/source/tabpages/autocdlg.hrc
+++ b/cui/source/tabpages/autocdlg.hrc
@@ -154,6 +154,18 @@
 #define FT_SMARTTAGS                    221
 #define LB_SMARTTAGS                    222
 #define PB_SMARTTAGS                    223
+//IAccessibility2 Implementation 2009-----
+#define  STR_PB_NEWABBREV               224
+#define  STR_PB_DELABBREV               225
+#define  STR_PB_NEWDOUBLECAPS           226
+#define  STR_PB_DELDOUBLECAPS           227
+#define  STR_PB_SGL_STD                 228
+#define  STR_PB_DBL_STD                 229
+#define  STR_PB_SGL_START               230
+#define  STR_PB_DBL_START               231
+#define  STR_PB_SGL_END                 232
+#define  STR_PB_DBL_END                 233
+//-----IAccessibility2 Implementation 2009
 
 #endif
 
diff --git a/cui/source/tabpages/autocdlg.src b/cui/source/tabpages/autocdlg.src
index d698a8f8aa47..8a906cf54e45 100644
--- a/cui/source/tabpages/autocdlg.src
+++ b/cui/source/tabpages/autocdlg.src
@@ -483,6 +483,46 @@ TabPage RID_OFAPAGE_AUTOCORR_EXCEPT
         Text [ en-US ] = "A~utoInclude";
         Text [ en-US ] = "A~utoInclude" ;
     };
+    String STR_PB_NEWABBREV
+    {
+        Text [ en-US ] = "New abbreviations" ;
+    };
+    String STR_PB_DELABBREV
+    {
+        Text [ en-US ] = "Delete abbreviations" ;
+    };
+    String STR_PB_NEWDOUBLECAPS
+    {
+        Text [ en-US ] = "New words with two initial capitals" ;
+    };
+    String STR_PB_DELDOUBLECAPS
+    {
+        Text [ en-US ] = "Delete words with two initial capitals" ;
+    };
+    String STR_PB_SGL_STD
+    {
+        Text [ en-US ] = "Single quotes default" ;
+    };
+    String STR_PB_DBL_STD
+    {
+        Text [ en-US ] = "Double quotes default" ;
+    };
+    String STR_PB_SGL_START
+    {
+        Text [ en-US ] = "Start quote of single quotes" ;
+    };
+    String STR_PB_DBL_START
+    {
+        Text [ en-US ] = "Start quote of double quotes" ;
+    };
+    String STR_PB_SGL_END
+    {
+        Text [ en-US ] = "End quote of single quotes" ;
+    };
+    String STR_PB_DBL_END
+    {
+        Text [ en-US ] = "End quote of double quotes" ;
+    };
 };
 /**************************************************************************/
 /*                                                                        */
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index e7639e34fe7d..2c7dcd315f3f 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -343,34 +343,36 @@ SvxBackgroundTabPage::SvxBackgroundTabPage( Window* pParent,
 
     SvxTabPage( pParent, CUI_RES( RID_SVXPAGE_BACKGROUND ), rCoreSet ),
 
+    aSelectTxt          ( this, CUI_RES( FT_SELECTOR ) ),
+    aLbSelect           ( this, CUI_RES( LB_SELECTOR ) ),
+    aStrBrowse          ( CUI_RES( STR_BROWSE ) ),
+    aStrUnlinked        ( CUI_RES( STR_UNLINKED ) ),
+    aTblDesc            ( this, CUI_RES( FT_TBL_DESC ) ),
+    aTblLBox            ( this, CUI_RES( LB_TBL_BOX ) ),
+    aParaLBox           ( this, CUI_RES( LB_PARA_BOX ) ),
+
     aBorderWin          ( this, CUI_RES(CT_BORDER) ),
     aBackgroundColorSet ( &aBorderWin, CUI_RES( SET_BGDCOLOR ) ),
     aBackgroundColorBox ( this, CUI_RES( GB_BGDCOLOR ) ),
-    pPreviewWin1        ( new BackgroundPreviewImpl(
-                            this, CUI_RES( WIN_PREVIEW1 ), sal_False ) ),
+    pPreviewWin1        ( new BackgroundPreviewImpl( this, CUI_RES( WIN_PREVIEW1 ), sal_False ) ),
+
     aColTransFT         ( this, CUI_RES( FT_COL_TRANS ) ),
     aColTransMF         ( this, CUI_RES( MF_COL_TRANS ) ),
-    aBtnBrowse          ( this, CUI_RES( BTN_BROWSE ) ),
-    aBtnLink            ( this, CUI_RES( BTN_LINK ) ),
     aBtnPreview         ( this, CUI_RES( BTN_PREVIEW ) ),
-    aFtFile             ( this, CUI_RES( FT_FILE ) ),
     aGbFile             ( this, CUI_RES( GB_FILE ) ),
+    aBtnBrowse          ( this, CUI_RES( BTN_BROWSE ) ),
+    aBtnLink            ( this, CUI_RES( BTN_LINK ) ),
+    aGbPosition         ( this, CUI_RES( GB_POSITION ) ),
     aBtnPosition        ( this, CUI_RES( BTN_POSITION ) ),
     aBtnArea            ( this, CUI_RES( BTN_AREA ) ),
     aBtnTile            ( this, CUI_RES( BTN_TILE ) ),
     aWndPosition        ( this, CUI_RES( WND_POSITION ), RP_MM ),
-    aGbPosition         ( this, CUI_RES( GB_POSITION ) ),
+    aFtFile             ( this, CUI_RES( FT_FILE ) ),
     aGraphTransFL       ( this, CUI_RES( FL_GRAPH_TRANS ) ),
     aGraphTransMF       ( this, CUI_RES( MF_GRAPH_TRANS ) ),
     pPreviewWin2        ( new BackgroundPreviewImpl(
                             this, CUI_RES( WIN_PREVIEW2 ), sal_True ) ),
-    aSelectTxt          ( this, CUI_RES( FT_SELECTOR ) ),
-    aLbSelect           ( this, CUI_RES( LB_SELECTOR ) ),
-    aStrBrowse          ( CUI_RES( STR_BROWSE ) ),
-    aStrUnlinked        ( CUI_RES( STR_UNLINKED ) ),
-    aTblDesc            ( this, CUI_RES( FT_TBL_DESC ) ),
-    aTblLBox            ( this, CUI_RES( LB_TBL_BOX ) ),
-    aParaLBox           ( this, CUI_RES( LB_PARA_BOX ) ),
+
     nHtmlMode           ( 0 ),
     bAllowShowSelector  ( sal_True ),
     bIsGraphicValid     ( sal_False ),
@@ -402,6 +404,11 @@ SvxBackgroundTabPage::SvxBackgroundTabPage( Window* pParent,
 
     aBackgroundColorSet.SetSelectHdl( HDL(BackgroundColorHdl_Impl) );
     FreeResource();
+
+    aBtnBrowse.SetAccessibleRelationMemberOf(&aGbFile);
+    aWndPosition.SetAccessibleRelationMemberOf(&aGbPosition);
+    aWndPosition.SetAccessibleRelationLabeledBy(&aBtnPosition);
+    aBackgroundColorSet.SetAccessibleRelationLabeledBy(&aBackgroundColorBox);
 }
 
 //------------------------------------------------------------------------
@@ -657,6 +664,7 @@ void SvxBackgroundTabPage::Reset( const SfxItemSet& rSet )
             aPos.Y()  = nY;
             pPreviewWin1->SetPosPixel(aPos);
             aBackgroundColorBox.Hide();
+            aBackgroundColorSet.SetAccessibleRelationLabeledBy(&aBackgroundColorSet);
         }
     }
 }
@@ -1211,6 +1219,7 @@ void SvxBackgroundTabPage::FillColorValueSets_Impl()
         WinBits nBits = ( aBackgroundColorSet.GetStyle() | WB_ITEMBORDER | WB_NAMEFIELD | WB_NONEFIELD );
         aBackgroundColorSet.SetText( SVX_RESSTR( RID_SVXSTR_TRANSPARENT ) );
         aBackgroundColorSet.SetStyle( nBits );
+        aBackgroundColorSet.SetAccessibleName(aBackgroundColorBox.GetText());
         for ( i = 0; i < nCount; i++ )
         {
             pEntry = pColorTable->GetColor(i);
diff --git a/cui/source/tabpages/connect.cxx b/cui/source/tabpages/connect.cxx
index 69e370be9f8b..f13d36697ca8 100644
--- a/cui/source/tabpages/connect.cxx
+++ b/cui/source/tabpages/connect.cxx
@@ -49,6 +49,7 @@
 #include <dialmgr.hxx>
 #include "svx/dlgutil.hxx"
 
+#include "paragrph.hrc"
 #include <cuires.hrc>
 
 static sal_uInt16 pRanges[] =
@@ -124,6 +125,8 @@ SvxConnectionPage::SvxConnectionPage( Window* pWindow, const SfxItemSet& rInAttr
 {
     FreeResource();
 
+    aCtlPreview.SetAccessibleName(String(CUI_RES(STR_EXAMPLE)));
+
     SfxItemPool* pPool = rOutAttrs.GetPool();
     DBG_ASSERT( pPool, "Wo ist der Pool" );
     eUnit = pPool->GetMetric( SDRATTR_EDGENODE1HORZDIST );
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index c06d564e45dd..4267ce1a795d 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -134,6 +134,8 @@ SvxGrfCropPage::SvxGrfCropPage ( Window *pParent, const SfxItemSet &rSet )
 
     aTimer.SetTimeoutHdl(LINK(this, SvxGrfCropPage, Timeout));
     aTimer.SetTimeout( 1500 );
+
+    aOrigSizePB.SetAccessibleRelationLabeledBy( &aOrigSizeFT );
 }
 
 /*--------------------------------------------------------------------
diff --git a/cui/source/tabpages/measure.cxx b/cui/source/tabpages/measure.cxx
index 2c90310dbf67..1ee81c946cfc 100644
--- a/cui/source/tabpages/measure.cxx
+++ b/cui/source/tabpages/measure.cxx
@@ -130,6 +130,7 @@ SvxMeasurePage::SvxMeasurePage( Window* pWindow, const SfxItemSet& rInAttrs ) :
 
         bPositionModified       ( sal_False )
 {
+    aCtlPreview.SetAccessibleName(aCtlPreview.GetHelpText());
     FillUnitLB();
 
     FreeResource();
@@ -168,6 +169,9 @@ SvxMeasurePage::SvxMeasurePage( Window* pWindow, const SfxItemSet& rInAttrs ) :
     aTsbParallel.SetClickHdl( aLink );
     aTsbShowUnit.SetClickHdl( aLink );
     aLbUnit.SetSelectHdl( aLink );
+    aLbUnit.SetAccessibleName(GetNonMnemonicString(aTsbShowUnit.GetText()));
+    aCtlPosition.SetAccessibleRelationMemberOf( &aFlLabel );
+    aLbUnit.SetAccessibleRelationLabeledBy( &aTsbShowUnit );
 }
 
 /*************************************************************************
diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 4787f263657b..27678b02f50b 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -260,13 +260,18 @@ SvxNumberFormatTabPage::SvxNumberFormatTabPage( Window*             pParent,
         aFtLanguage     ( this, CUI_RES( FT_LANGUAGE ) ),
         aLbLanguage     ( this, CUI_RES( LB_LANGUAGE ), sal_False ),
         aCbSourceFormat ( this, CUI_RES( CB_SOURCEFORMAT ) ),
+#if ENABLE_LAYOUT
+        aWndPreview     ( LAYOUT_THIS_WINDOW(this), CUI_RES_PLAIN( WND_NUMBER_PREVIEW ) ),
+#else
+        aWndPreview     ( this, CUI_RES_PLAIN( WND_NUMBER_PREVIEW ) ),
+#endif
+        aFlOptions      ( this, CUI_RES( FL_OPTIONS ) ),
         aFtDecimals     ( this, CUI_RES( FT_DECIMALS ) ),
         aEdDecimals     ( this, CUI_RES( ED_DECIMALS ) ),
+        aBtnNegRed      ( this, CUI_RES( BTN_NEGRED ) ),
         aFtLeadZeroes   ( this, CUI_RES( FT_LEADZEROES ) ),
         aEdLeadZeroes   ( this, CUI_RES( ED_LEADZEROES ) ),
-        aBtnNegRed      ( this, CUI_RES( BTN_NEGRED ) ),
         aBtnThousand    ( this, CUI_RES( BTN_THOUSAND ) ),
-        aFlOptions      ( this, CUI_RES( FL_OPTIONS ) ),
 
         aFtEdFormat     ( this, CUI_RES( FT_EDFORMAT ) ),
         aEdFormat       ( this, CUI_RES( ED_FORMAT ) ),
@@ -276,11 +281,6 @@ SvxNumberFormatTabPage::SvxNumberFormatTabPage( Window*             pParent,
         aFtComment      ( this, CUI_RES( FT_COMMENT ) ),
         aEdComment      ( this, CUI_RES( ED_COMMENT ) ),
 
-#if ENABLE_LAYOUT
-        aWndPreview     ( LAYOUT_THIS_WINDOW(this), CUI_RES_PLAIN( WND_NUMBER_PREVIEW ) ),
-#else
-        aWndPreview     ( this, CUI_RES_PLAIN( WND_NUMBER_PREVIEW ) ),
-#endif
         pNumItem        ( NULL ),
         pNumFmtShell    ( NULL ),
         nInitFormat     ( ULONG_MAX ),
@@ -380,6 +380,13 @@ void SvxNumberFormatTabPage::Init_Impl()
     {
         aLbLanguage.InsertLanguage( xLang[i] );
     }
+
+    aIbAdd.SetAccessibleRelationLabeledBy( &aFtEdFormat );
+    aIbInfo.SetAccessibleRelationLabeledBy( &aFtEdFormat );
+    aIbRemove.SetAccessibleRelationLabeledBy( &aFtEdFormat );
+    aIbAdd.SetAccessibleRelationMemberOf( &aIbAdd );
+    aIbInfo.SetAccessibleRelationMemberOf( &aIbInfo );
+    aIbRemove.SetAccessibleRelationMemberOf( &aIbRemove );
 }
 
 /*************************************************************************
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index b624da8a509b..5d2e85da8a3b 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -989,6 +989,7 @@ SvxBitmapPickTabPage::SvxBitmapPickTabPage(Window* pParent,
         pExamplesVS->Format();
     }
 
+    pExamplesVS->SetAccessibleRelationMemberOf( &aValuesFL );
 }
 
 /*-----------------12.02.97 07.46-------------------
@@ -1365,6 +1366,8 @@ SvxNumOptionsTabPage::SvxNumOptionsTabPage(Window* pParent,
 
     eCoreUnit = rSet.GetPool()->GetMetric(rSet.GetPool()->GetWhich(SID_ATTR_NUMBERING_RULE));
 
+    aBitmapMB.SetAccessibleRelationLabeledBy( &aBitmapFT );
+
     FreeResource();
 
     //get advanced numbering types from the component
@@ -1421,6 +1424,10 @@ SvxNumOptionsTabPage::SvxNumOptionsTabPage(Window* pParent,
             aFmtLB.RemoveEntry( nPos);
         }
     }
+
+    aBulletPB.SetAccessibleRelationMemberOf(&aFormatFL);
+    aBulletPB.SetAccessibleRelationLabeledBy(&aStartFT);
+    aBulletPB.SetAccessibleName(aStartFT.GetText());
 }
 
 /*-----------------01.12.97 16:30-------------------
@@ -3096,6 +3103,8 @@ SvxNumPositionTabPage::SvxNumPositionTabPage(Window* pParent,
     pDebugFixedText->SetPosSizePixel(aPos, aSize);
     pDebugFixedText->SetText( UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "Das ist ein Debug-Text" ) ) );
 #endif
+
+    aStandardPB.SetAccessibleRelationMemberOf(&aPositionFL);
 }
 /*-----------------03.12.97 10:02-------------------
 
diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index fc9c4f70e621..5bc52b99f3a9 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -272,13 +272,12 @@ SvxPageDescPage::SvxPageDescPage( Window* pParent, const SfxItemSet& rAttr ) :
     aTopMarginEdit      ( this, CUI_RES( ED_TOP_MARGIN ) ),
     aBottomMarginLbl    ( this, CUI_RES( FT_BOTTOM_MARGIN ) ),
     aBottomMarginEdit   ( this, CUI_RES( ED_BOTTOM_MARGIN ) ),
-
+    aBottomSeparatorFl  ( this, CUI_RES( FL_BOTTOM_SEP ) ),
     aLayoutFL           ( this, CUI_RES( FL_LAYOUT ) ),
     aPageText           ( this, CUI_RES( FT_PAGELAYOUT ) ),
     aLayoutBox          ( this, CUI_RES( LB_LAYOUT ) ),
     aNumberFormatText   ( this, CUI_RES( FT_NUMBER_FORMAT ) ),
     aNumberFormatBox    ( this, CUI_RES( LB_NUMBER_FORMAT ) ),
-    aBottomSeparatorFl  ( this, CUI_RES( FL_BOTTOM_SEP ) ),
     aTblAlignFT         ( this, CUI_RES( FT_TBL_ALIGN ) ),
     aHorzBox            ( this, CUI_RES( CB_HORZ ) ),
     aVertBox            ( this, CUI_RES( CB_VERT ) ),
@@ -329,9 +328,10 @@ SvxPageDescPage::SvxPageDescPage( Window* pParent, const SfxItemSet& rAttr ) :
     if( !bWeb )
     {
         if( bCJK )
+        {
             aTextFlowBox.InsertEntryValue( CUI_RESSTR( RID_SVXSTR_PAGEDIR_RTL_VERT ), FRMDIR_VERT_TOP_RIGHT );
-//        if( ... )
 //            aTextFlowBox.InsertEntryValue( CUI_RESSTR( RID_SVXSTR_PAGEDIR_LTR_VERT ), FRMDIR_VERT_TOP_LEFT );
+        }
     }
 
     // #109989# show the text direction box in Writer/Web too, but only, if HTML export mode is not HTML3.2.
@@ -420,6 +420,9 @@ SvxPageDescPage::SvxPageDescPage( Window* pParent, const SfxItemSet& rAttr ) :
     aTopMarginEdit.SetLast(aDrawinglayerOpt.GetMaximumPaperTopMargin());
     aBottomMarginEdit.SetMax(aDrawinglayerOpt.GetMaximumPaperBottomMargin());
     aBottomMarginEdit.SetLast(aDrawinglayerOpt.GetMaximumPaperBottomMargin());
+
+    aPortraitBtn.SetAccessibleRelationMemberOf(&aOrientationFT);
+    aLandscapeBtn.SetAccessibleRelationMemberOf(&aOrientationFT);
 }
 
 // -----------------------------------------------------------------------
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index 408a72d14765..81f898679984 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -637,6 +637,7 @@ SvxStdParagraphTabPage::SvxStdParagraphTabPage( Window* pParent,
 
     SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_STD_PARAGRAPH ), rAttr ),
 
+    aIndentFrm              ( this, CUI_RES( FL_INDENT ) ),
     aLeftLabel              ( this, CUI_RES( FT_LEFTINDENT ) ),
     aLeftIndent             ( this, CUI_RES( ED_LEFTINDENT ) ),
     aRightLabel             ( this, CUI_RES( FT_RIGHTINDENT ) ),
@@ -645,21 +646,21 @@ SvxStdParagraphTabPage::SvxStdParagraphTabPage( Window* pParent,
     aFLineLabel             ( this, CUI_RES( FT_FLINEINDENT ) ),
     aFLineIndent            ( this, CUI_RES( ED_FLINEINDENT ) ),
     aAutoCB                 ( this, CUI_RES( CB_AUTO ) ),
-    aIndentFrm              ( this, CUI_RES( FL_INDENT ) ),
+    aDistFrm                ( this, CUI_RES( FL_DIST ) ),
     aTopLabel               ( this, CUI_RES( FT_TOPDIST ) ),
     aTopDist                ( this, CUI_RES( ED_TOPDIST ) ),
     aBottomLabel            ( this, CUI_RES( FT_BOTTOMDIST ) ),
     aBottomDist             ( this, CUI_RES( ED_BOTTOMDIST ) ),
-    aDistFrm                ( this, CUI_RES( FL_DIST ) ),
+
+    aLineDistFrm            ( this, CUI_RES( FL_LINEDIST ) ),
     aLineDist               ( this, CUI_RES( LB_LINEDIST ) ),
     aLineDistAtLabel        ( this, CUI_RES( FT_LINEDIST ) ),
     aLineDistAtPercentBox   ( this, CUI_RES( ED_LINEDISTPERCENT ) ),
     aLineDistAtMetricBox    ( this, CUI_RES( ED_LINEDISTMETRIC ) ),
-    aLineDistFrm            ( this, CUI_RES( FL_LINEDIST ) ),
     sAbsDist                ( CUI_RES(ST_LINEDIST_ABS) ),
     aExampleWin             ( this, CUI_RES( WN_EXAMPLE ) ),
-    aRegisterCB             ( this, CUI_RES( CB_REGISTER ) ),
     aRegisterFL             ( this, CUI_RES( FL_REGISTER ) ),
+    aRegisterCB             ( this, CUI_RES( CB_REGISTER ) ),
     pActLineDistFld ( &aLineDistAtPercentBox ),
     nAbst           ( MAX_DURCH ),
     nWidth          ( 11905 /*567 * 50*/ ),
@@ -676,6 +677,9 @@ SvxStdParagraphTabPage::SvxStdParagraphTabPage( Window* pParent,
     FreeResource();
     Init_Impl();
     aFLineIndent.SetMin(-9999);    // wird default auf 0 gesetzt
+
+    aExampleWin.SetAccessibleName(String(CUI_RES(STR_EXAMPLE)));
+
 }
 
 
@@ -1093,6 +1097,9 @@ SvxParaAlignTabPage::SvxParaAlignTabPage( Window* pParent, const SfxItemSet& rSe
             aTextDirectionLB.Show();
         }
     }
+
+    aExampleWin.SetAccessibleName(String(CUI_RES(STR_EXAMPLE)));
+
 }
 
 /*-----------------16.01.97 19.33-------------------
@@ -1933,6 +1940,7 @@ SvxExtParagraphTabPage::SvxExtParagraphTabPage( Window* pParent, const SfxItemSe
 
     SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_EXT_PARAGRAPH ), rAttr ),
 
+    aExtFL              ( this, CUI_RES( FL_HYPHEN ) ),
     aHyphenBox          ( this, CUI_RES( BTN_HYPHEN ) ),
     aBeforeText         ( this, CUI_RES( FT_HYPHENBEFORE ) ),
     aExtHyphenBeforeBox ( this, CUI_RES( ED_HYPHENBEFORE ) ),
@@ -1940,7 +1948,6 @@ SvxExtParagraphTabPage::SvxExtParagraphTabPage( Window* pParent, const SfxItemSe
     aExtHyphenAfterBox  ( this, CUI_RES( ED_HYPHENAFTER ) ),
     aMaxHyphenLabel     ( this, CUI_RES( FT_MAXHYPH ) ),
     aMaxHyphenEdit      ( this, CUI_RES( ED_MAXHYPH ) ),
-    aExtFL              ( this, CUI_RES( FL_HYPHEN ) ),
     aBreaksFL           ( this, CUI_RES( FL_BREAKS ) ),
     aPageBreakBox       ( this, CUI_RES( BTN_PAGEBREAK ) ),
     aBreakTypeFT        ( this, CUI_RES( FT_BREAKTYPE     )),
@@ -1970,6 +1977,11 @@ SvxExtParagraphTabPage::SvxExtParagraphTabPage( Window* pParent, const SfxItemSe
 {
     FreeResource();
 
+    aApplyCollBox.SetAccessibleRelationLabeledBy(&aApplyCollBtn);
+    aApplyCollBox.SetAccessibleName(String(CUI_RES(STR_PAGE_STYLE)));
+    aOrphanRowNo.SetAccessibleRelationLabeledBy(&aOrphanBox);
+    aWidowRowNo.SetAccessibleRelationLabeledBy(&aWidowBox);
+
     // diese Page braucht ExchangeSupport
     SetExchangeSupport();
 
diff --git a/cui/source/tabpages/paragrph.hrc b/cui/source/tabpages/paragrph.hrc
index 8a14407a9cd0..c6158a22ceda 100644
--- a/cui/source/tabpages/paragrph.hrc
+++ b/cui/source/tabpages/paragrph.hrc
@@ -117,5 +117,9 @@
 
 #define CB_AS_SCRIPT_SPACE              7
 
+//IAccessibility2 Implementation 2009-----
+#define STR_EXAMPLE                     5010
+#define STR_PAGE_STYLE                  5011
+//-----IAccessibility2 Implementation 2009
 #endif
 
diff --git a/cui/source/tabpages/paragrph.src b/cui/source/tabpages/paragrph.src
index e7e50842ba1c..cd13bdb12a6d 100644
--- a/cui/source/tabpages/paragrph.src
+++ b/cui/source/tabpages/paragrph.src
@@ -732,39 +732,12 @@ TabPage RID_SVXPAGE_PARA_ASIAN
     };
 };
 
-// ********************************************************************** EOF
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+String STR_EXAMPLE
+{
+    Text [ en-US ] = "Example" ;
+};
+String STR_PAGE_STYLE
+{
+    Text [ en-US ] = "Page Style" ;
+};
 
diff --git a/cui/source/tabpages/tabarea.hrc b/cui/source/tabpages/tabarea.hrc
index 10fe10f1495d..8e2f9b4344c2 100644
--- a/cui/source/tabpages/tabarea.hrc
+++ b/cui/source/tabpages/tabarea.hrc
@@ -185,3 +185,7 @@
 
 #define IMG_LOAD_H  23
 #define IMG_SAVE_H  24
+// IAccessibility2 implementation 2009 ------
+#define STR_CUI_COLORMODEL  5030
+#define STR_LB_HATCHINGSTYLE 5031
+// ------ IAccessibility2 implementation 2009.
diff --git a/cui/source/tabpages/tabarea.src b/cui/source/tabpages/tabarea.src
index a9e4ccd207a6..8303509d4c64 100644
--- a/cui/source/tabpages/tabarea.src
+++ b/cui/source/tabpages/tabarea.src
@@ -1563,59 +1563,13 @@ Image RID_SVXIMG_SAVE_H
     MASKCOLOR
 };
 
- // ********************************************************************** EOF
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+String STR_LB_HATCHINGSTYLE
+{
+    Text [ en-US ] = "Hatching Style" ;
+};
 
+String STR_CUI_COLORMODEL
+{
+    Text [ en-US ] = "Color Mode" ;
+};
 
diff --git a/cui/source/tabpages/tabline.hrc b/cui/source/tabpages/tabline.hrc
index 0034e2126bf5..81e9e99e5061 100644
--- a/cui/source/tabpages/tabline.hrc
+++ b/cui/source/tabpages/tabline.hrc
@@ -41,6 +41,21 @@
 #define FT_LINE_ENDS_WIDTH 6
 #define LB_START_STYLE 3
 #define LB_END_STYLE 4
+//IAccessibility2 Impplementaton 2009-----
+#define STR_STYLE (LB_END_STYLE+1)
+#define STR_LB_START_STYLE  30
+#define STR_LB_END_STYLE    31
+#define STR_MTR_FLD_START_WIDTH 32
+#define STR_MTR_FLD_END_WIDTH   33
+#define STR_CENTER_START    34
+#define STR_CENTER_END      35
+#define STR_START_TYPE      36
+#define STR_END_TYPE        37
+#define STR_START_NUM       38
+#define STR_END_NUM         39
+#define STR_START_LENGTH    40
+#define STR_END_LENGTH      41
+//-----IAccessibility2 Impplementaton 2009
 #define MTR_FLD_START_WIDTH 3
 #define MTR_FLD_END_WIDTH 2
 #define CBX_SYNCHRONIZE 1
@@ -103,4 +118,13 @@
 #define MN_SYMBOLS_AUTO    5
 #define MN_GALLERY_ENTRY 100
 
-
+/*
+//IAccessibility2 Implementation 2009-----
+#define STR_START_TYPE      1
+#define STR_END_TYPE        2
+#define STR_START_NUM       3
+#define STR_END_NUM         4
+#define STR_START_LENGTH    5
+#define STR_END_LENGTH      6
+//-----IAccessibility2 Implementation 2009
+*/
diff --git a/cui/source/tabpages/tabline.src b/cui/source/tabpages/tabline.src
index 4e40debbee6d..bdda4ebd1e54 100644
--- a/cui/source/tabpages/tabline.src
+++ b/cui/source/tabpages/tabline.src
@@ -385,6 +385,34 @@ TabPage RID_SVXPAGE_LINE
         Size = MAP_APPFONT ( 118 , 10 ) ;
         Text [ en-US ] = "Keep ratio" ;
     };
+    String STR_STYLE
+    {
+        Text [ en-US ] = "Style" ;
+    };
+    String STR_LB_START_STYLE
+    {
+        Text [ en-US ] = "Start style" ;
+    };
+    String STR_LB_END_STYLE
+    {
+        Text [ en-US ] = "End style" ;
+    };
+    String STR_MTR_FLD_START_WIDTH
+    {
+        Text [ en-US ] = "Start width" ;
+    };
+    String STR_MTR_FLD_END_WIDTH
+    {
+        Text [ en-US ] = "End width" ;
+    };
+     String STR_CENTER_START
+    {
+        Text [ en-US ] = "Start with center" ;
+    };
+    String STR_CENTER_END
+    {
+        Text [ en-US ] = "End with center" ;
+    };
 };
 
 // Defining LineStyles --------------------
@@ -635,6 +663,30 @@ TabPage RID_SVXPAGE_LINE_DEF
         Size = MAP_APPFONT ( 248 , 40 ) ;
     };
 
+    String STR_START_TYPE
+    {
+        Text [ en-US ] = "Start type" ;
+    };
+    String STR_END_TYPE
+    {
+        Text [ en-US ] = "End type" ;
+     };
+    String STR_START_NUM
+    {
+        Text [ en-US ] = "Start number" ;
+    };
+    String STR_END_NUM
+    {
+        Text [ en-US ] = "End number" ;
+    };
+    String STR_START_LENGTH
+    {
+        Text [ en-US ] = "Start length" ;
+    };
+    String STR_END_LENGTH
+    {
+        Text [ en-US ] = "End length" ;
+    };
 };
 
 // Defining LineEnds --------------------
diff --git a/cui/source/tabpages/tabstpge.cxx b/cui/source/tabpages/tabstpge.cxx
index 33e47e8c86ed..bc285bf18c31 100644
--- a/cui/source/tabpages/tabstpge.cxx
+++ b/cui/source/tabpages/tabstpge.cxx
@@ -106,9 +106,10 @@ SvxTabulatorTabPage::SvxTabulatorTabPage( Window* pParent,
 
     SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_TABULATOR ), rAttr ),
 
-    aTabBox         ( this, CUI_RES( ED_TABPOS ) ),
     aTabLabel       ( this, CUI_RES( FL_TABPOS ) ),
+    aTabBox         ( this, CUI_RES( ED_TABPOS ) ),
     aTabLabelVert   ( this, CUI_RES( FL_TABPOS_VERT ) ),
+    aTabTypeLabel   ( this, CUI_RES( FL_TABTYPE ) ),
     aLeftTab        ( this, CUI_RES( BTN_TABTYPE_LEFT ) ),
     aRightTab       ( this, CUI_RES( BTN_TABTYPE_RIGHT ) ),
     aCenterTab      ( this, CUI_RES( BTN_TABTYPE_CENTER ) ),
@@ -119,14 +120,13 @@ SvxTabulatorTabPage::SvxTabulatorTabPage( Window* pParent,
     pDezWin         ( new TabWin_Impl( this, CUI_RES( WIN_TABDECIMAL ), (sal_uInt16)(RULER_TAB_DECIMAL|WB_HORZ) ) ),
     aDezCharLabel   ( this, CUI_RES( FT_TABTYPE_DECCHAR ) ),
     aDezChar        ( this, CUI_RES( ED_TABTYPE_DECCHAR ) ),
-    aTabTypeLabel   ( this, CUI_RES( FL_TABTYPE ) ),
+    aFillLabel      ( this, CUI_RES( FL_FILLCHAR ) ),
     aNoFillChar     ( this, CUI_RES( BTN_FILLCHAR_NO ) ),
     aFillPoints     ( this, CUI_RES( BTN_FILLCHAR_POINTS ) ),
     aFillDashLine   ( this, CUI_RES( BTN_FILLCHAR_DASHLINE ) ),
     aFillSolidLine  ( this, CUI_RES( BTN_FILLCHAR_UNDERSCORE ) ),
     aFillSpecial    ( this, CUI_RES( BTN_FILLCHAR_OTHER ) ),
     aFillChar       ( this, CUI_RES( ED_FILLCHAR_OTHER ) ),
-    aFillLabel      ( this, CUI_RES( FL_FILLCHAR ) ),
     aNewBtn         ( this, CUI_RES( BTN_NEW ) ),
     aDelAllBtn      ( this, CUI_RES( BTN_DELALL ) ),
     aDelBtn         ( this, CUI_RES( BTN_DEL ) ),
@@ -145,6 +145,7 @@ SvxTabulatorTabPage::SvxTabulatorTabPage( Window* pParent,
         aRightTab .SetText(String(CUI_RES(   ST_RIGHTTAB_ASIAN )));
     }
 
+    aFillChar.SetAccessibleName(String(CUI_RES(   ST_FILLCHAR_OTHER )));
     // diese Page braucht ExchangeSupport
     SetExchangeSupport();
 
@@ -182,6 +183,22 @@ SvxTabulatorTabPage::SvxTabulatorTabPage( Window* pParent,
     aTabBox.SetDoubleClickHdl( LINK( this, SvxTabulatorTabPage, SelectHdl_Impl ) );
     aTabBox.SetModifyHdl( LINK( this, SvxTabulatorTabPage, ModifyHdl_Impl ) );
 
+    aLeftTab.SetAccessibleRelationMemberOf( &aTabTypeLabel );
+    aRightTab.SetAccessibleRelationMemberOf( &aTabTypeLabel );
+    aCenterTab.SetAccessibleRelationMemberOf( &aTabTypeLabel );
+    aDezTab.SetAccessibleRelationMemberOf( &aTabTypeLabel );
+    aDezCharLabel.SetAccessibleRelationMemberOf( &aTabTypeLabel );
+    aDezChar.SetAccessibleRelationMemberOf( &aTabTypeLabel );
+
+    aNoFillChar.SetAccessibleRelationMemberOf( &aFillLabel );
+    aFillPoints.SetAccessibleRelationMemberOf( &aFillLabel );
+    aFillDashLine.SetAccessibleRelationMemberOf( &aFillLabel );
+    aFillSolidLine.SetAccessibleRelationMemberOf( &aFillLabel );
+    aFillSpecial.SetAccessibleRelationMemberOf( &aFillLabel );
+    aFillChar.SetAccessibleRelationMemberOf( &aFillLabel );
+
+    aFillChar.SetAccessibleRelationLabeledBy(&aFillSpecial);
+
     // das Default-Dezimalzeichen vom System holen
     LocaleDataWrapper aLocaleWrapper( ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLocale() );
     aAktTab.GetDecimal() = aLocaleWrapper.getNumDecimalSep().GetChar(0);
diff --git a/cui/source/tabpages/tabstpge.hrc b/cui/source/tabpages/tabstpge.hrc
index be3823fd9cd4..40bcc35dba0d 100644
--- a/cui/source/tabpages/tabstpge.hrc
+++ b/cui/source/tabpages/tabstpge.hrc
@@ -59,5 +59,8 @@
 #define BTN_DELALL                      52
 #define ST_LEFTTAB_ASIAN                53
 #define ST_RIGHTTAB_ASIAN               54
+//IAccessibility2 Implementation 2009-----
+#define ST_FILLCHAR_OTHER               55
+//-----IAccessibility2 Implementation 2009
 #endif
 
diff --git a/cui/source/tabpages/tabstpge.src b/cui/source/tabpages/tabstpge.src
index 6a92d21d3ad4..e4f2c600a87e 100644
--- a/cui/source/tabpages/tabstpge.src
+++ b/cui/source/tabpages/tabstpge.src
@@ -207,40 +207,9 @@ TabPage RID_SVXPAGE_TABULATOR
     {
         Text [ en-US ] = "Righ~t/Bottom" ;
     };
+    String ST_FILLCHAR_OTHER
+    {
+        Text [ en-US ] = "Character" ;
+    };
 };
- // ********************************************************************** EOF
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
 
diff --git a/cui/source/tabpages/textanim.cxx b/cui/source/tabpages/textanim.cxx
index c41f8f3f40bf..e9a27adc2cd4 100644
--- a/cui/source/tabpages/textanim.cxx
+++ b/cui/source/tabpages/textanim.cxx
@@ -158,6 +158,24 @@ SvxTextAnimationPage::SvxTextAnimationPage( Window* pWindow, const SfxItemSet& r
     aBtnLeft.SetClickHdl( aLink );
     aBtnRight.SetClickHdl( aLink );
     aBtnDown.SetClickHdl( aLink );
+
+    aNumFldCount.SetAccessibleRelationLabeledBy( &aTsbEndless );
+    aMtrFldAmount.SetAccessibleRelationLabeledBy( &aTsbPixel );
+    aMtrFldDelay.SetAccessibleRelationLabeledBy( &aTsbAuto );
+
+    aBtnUp.SetAccessibleRelationLabeledBy( &aFtDirection );
+    aBtnLeft.SetAccessibleRelationLabeledBy( &aFtDirection );
+    aBtnRight.SetAccessibleRelationLabeledBy( &aFtDirection );
+    aBtnDown.SetAccessibleRelationLabeledBy( &aFtDirection );
+
+    aBtnUp.SetAccessibleRelationMemberOf( &aFlEffect );
+    aBtnLeft.SetAccessibleRelationMemberOf( &aFlEffect );
+    aBtnRight.SetAccessibleRelationMemberOf( &aFlEffect );
+    aBtnDown.SetAccessibleRelationMemberOf( &aFlEffect );
+
+    aTsbEndless.SetAccessibleRelationLabeledBy( &aFtCount );
+    aTsbPixel.SetAccessibleRelationLabeledBy( &aFtAmount );
+    aTsbAuto.SetAccessibleRelationLabeledBy( &aFtDelay );
 }
 
 /*************************************************************************
diff --git a/cui/source/tabpages/textattr.cxx b/cui/source/tabpages/textattr.cxx
index bb13af3703ab..aa2eb7f30573 100644
--- a/cui/source/tabpages/textattr.cxx
+++ b/cui/source/tabpages/textattr.cxx
@@ -144,6 +144,8 @@ SvxTextAttrPage::SvxTextAttrPage( Window* pWindow, const SfxItemSet& rInAttrs )
 
     aTsbFullWidth.SetClickHdl(
         LINK( this, SvxTextAttrPage, ClickFullWidthHdl_Impl ) );
+
+    aCtlPosition.SetAccessibleRelationMemberOf( &aFlPosition );
 }
 
 /*************************************************************************
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index 45469938b099..0cf286217982 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -57,7 +57,7 @@
 #include "svx/dlgutil.hxx"
 #include <svl/intitem.hxx> //add CHINA001
 #include <sfx2/request.hxx>//add CHINA001
-
+#include "paragrph.hrc"
 #define DLGWIN this->GetParent()->GetParent()
 
 // static ----------------------------------------------------------------
@@ -288,6 +288,11 @@ SvxTransparenceTabPage::SvxTransparenceTabPage(Window* pParent, const SfxItemSet
 {
     FreeResource();
 
+    String accName = String(CUI_RES(STR_EXAMPLE));
+    aCtlBitmapPreview.SetAccessibleName(accName);
+    aCtlXRectPreview.SetAccessibleName(accName);
+    aMtrTransparent.SetAccessibleRelationLabeledBy( &aRbtTransLinear );
+
     // main selection
     aRbtTransOff.SetClickHdl(LINK(this, SvxTransparenceTabPage, ClickTransOffHdl_Impl));
     aRbtTransLinear.SetClickHdl(LINK(this, SvxTransparenceTabPage, ClickTransLinearHdl_Impl));
@@ -670,6 +675,10 @@ SvxAreaTabPage::SvxAreaTabPage( Window* pParent, const SfxItemSet& rInAttrs ) :
 {
     FreeResource();
 
+    String accName = String(CUI_RES(STR_EXAMPLE));
+    aCtlXRectPreview.SetAccessibleName(accName);
+    aCtlBitmapPreview.SetAccessibleName(accName);
+
     // Gruppen, die sich ueberlagern
     aLbBitmap.Hide();
     aCtlBitmapPreview.Hide();
@@ -766,6 +775,15 @@ SvxAreaTabPage::SvxAreaTabPage( Window* pParent, const SfxItemSet& rInAttrs ) :
 
     // #i76307# always paint the preview in LTR, because this is what the document does
     aCtlXRectPreview.EnableRTL(sal_False);
+
+    aNumFldStepCount.SetAccessibleRelationLabeledBy( &aTsbStepCount );
+    aCtlPosition.SetAccessibleRelationMemberOf( &aFlPosition );
+    aLbHatchBckgrdColor.SetAccessibleRelationLabeledBy( &aCbxHatchBckgrd );
+    aLbHatchBckgrdColor.SetAccessibleName(aCbxHatchBckgrd.GetText());
+
+    aLbColor.SetAccessibleRelationMemberOf( &aFlProp );
+    aMtrFldOffset.SetAccessibleRelationLabeledBy(&aFlOffset);
+    aMtrFldOffset.SetAccessibleName(aFlOffset.GetText());
 }
 
 // -----------------------------------------------------------------------
diff --git a/cui/source/tabpages/tpbitmap.cxx b/cui/source/tabpages/tpbitmap.cxx
index 640df280f066..131f6c5674f9 100644
--- a/cui/source/tabpages/tpbitmap.cxx
+++ b/cui/source/tabpages/tpbitmap.cxx
@@ -71,6 +71,7 @@
 #include <svx/svxdlg.hxx> //CHINA001
 #include <dialmgr.hxx>
 #include "sfx2/opengrf.hxx"
+#include "paragrph.hrc"
 
 #define DLGWIN this->GetParent()->GetParent()
 
@@ -148,6 +149,16 @@ SvxBitmapTabPage::SvxBitmapTabPage
     aLbBackgroundColor.SetSelectHdl(
         LINK( this, SvxBitmapTabPage, ChangeBackgrndColorHdl_Impl ) );
 
+    String accName = String(SVX_RES(STR_EXAMPLE));
+    aCtlPreview.SetAccessibleName(accName);
+    aCtlPixel.SetAccessibleRelationMemberOf( &aFlProp );
+    aCtlPixel.SetAccessibleRelationLabeledBy( &aFtPixelEdit );
+    aLbBitmaps.SetAccessibleRelationLabeledBy(&aLbBitmaps);
+    aBtnAdd.SetAccessibleRelationMemberOf( &aFlProp );
+    aBtnModify.SetAccessibleRelationMemberOf( &aFlProp );
+    aBtnImport.SetAccessibleRelationMemberOf( &aFlProp );
+    aBtnDelete.SetAccessibleRelationMemberOf( &aFlProp );
+
 }
 
 // -----------------------------------------------------------------------
diff --git a/cui/source/tabpages/tpcolor.cxx b/cui/source/tabpages/tpcolor.cxx
index d1e39b9cd8a0..2a34f5beb702 100644
--- a/cui/source/tabpages/tpcolor.cxx
+++ b/cui/source/tabpages/tpcolor.cxx
@@ -173,6 +173,11 @@ SvxColorTabPage::SvxColorTabPage
     aValSetColorTable.SetExtraSpacing( 0 );
     aValSetColorTable.Show();
 
+    aLbColorModel.SetAccessibleName( String( CUI_RES(STR_CUI_COLORMODEL) ) );
+    aBtnAdd.SetAccessibleRelationMemberOf( &aFlProp );
+    aBtnModify.SetAccessibleRelationMemberOf( &aFlProp );
+    aBtnWorkOn.SetAccessibleRelationMemberOf( &aFlProp );
+    aBtnDelete.SetAccessibleRelationMemberOf( &aFlProp );
 }
 
 // -----------------------------------------------------------------------
@@ -1121,6 +1126,12 @@ IMPL_LINK( SvxColorTabPage, SelectColorModelHdl_Impl, void *, EMPTYARG )
         aMtrFldColorModel3.SetValue( ColorToPercent_Impl( aAktuellColor.GetBlue() ) );
         aMtrFldColorModel4.SetValue( ColorToPercent_Impl( aAktuellColor.GetTransparency() ) );
     }
+
+    aMtrFldColorModel1.SetAccessibleName( GetNonMnemonicString(aFtColorModel1.GetText()) );
+    aMtrFldColorModel2.SetAccessibleName( GetNonMnemonicString(aFtColorModel2.GetText()) );
+    aMtrFldColorModel3.SetAccessibleName( GetNonMnemonicString(aFtColorModel3.GetText()) );
+    aMtrFldColorModel4.SetAccessibleName( GetNonMnemonicString(aFtColorModel4.GetText()) );
+
     return( 0L );
 }
 
diff --git a/cui/source/tabpages/tpgradnt.cxx b/cui/source/tabpages/tpgradnt.cxx
index 63a2f3bbfd4e..3947a4d85aba 100644
--- a/cui/source/tabpages/tpgradnt.cxx
+++ b/cui/source/tabpages/tpgradnt.cxx
@@ -54,6 +54,7 @@
 #include <dialmgr.hxx>
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
+#include "paragrph.hrc"
 
 #define DLGWIN this->GetParent()->GetParent()
 
@@ -114,6 +115,10 @@ SvxGradientTabPage::SvxGradientTabPage
 
     FreeResource();
 
+    aCtlPreview.SetAccessibleName(String(CUI_RES(STR_EXAMPLE)));
+    aLbGradients.SetAccessibleName( GetText());
+
+
     // diese Page braucht ExchangeSupport
     SetExchangeSupport();
 
@@ -154,6 +159,11 @@ SvxGradientTabPage::SvxGradientTabPage
     aBtnSave.SetClickHdl(
         LINK( this, SvxGradientTabPage, ClickSaveHdl_Impl ) );
 
+    aBtnAdd.SetAccessibleRelationMemberOf( &aFlProp );
+    aBtnModify.SetAccessibleRelationMemberOf( &aFlProp );
+    aBtnDelete.SetAccessibleRelationMemberOf( &aFlProp );
+    aLbGradients.SetAccessibleRelationLabeledBy(&aLbGradients);
+
     // #i76307# always paint the preview in LTR, because this is what the document does
     aCtlPreview.EnableRTL( sal_False );
 }
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 556268f2e025..b05d32fbec1a 100644
--- a/cui/source/tabpages/tphatch.cxx
+++ b/cui/source/tabpages/tphatch.cxx
@@ -54,6 +54,7 @@
 #include <dialmgr.hxx>
 #include "svx/dlgutil.hxx"
 #include <svx/dialmgr.hxx>
+#include "paragrph.hrc"
 #include <svx/dialogs.hrc>
 
 #define DLGWIN this->GetParent()->GetParent()
@@ -153,6 +154,15 @@ SvxHatchTabPage::SvxHatchTabPage
     aBtnSave.SetClickHdl( LINK( this, SvxHatchTabPage, ClickSaveHdl_Impl ) );
 
     aCtlPreview.SetDrawMode( GetSettings().GetStyleSettings().GetHighContrastMode() ? OUTPUT_DRAWMODE_CONTRAST : OUTPUT_DRAWMODE_COLOR );
+
+    aCtlPreview.SetAccessibleName(String(CUI_RES(STR_EXAMPLE)));
+    aLbHatchings.SetAccessibleName( String(CUI_RES(STR_LB_HATCHINGSTYLE)) );
+    aCtlAngle.SetAccessibleRelationMemberOf( &aFlProp );
+    aLbHatchings.SetAccessibleRelationMemberOf( &aFlProp );
+    aBtnAdd.SetAccessibleRelationMemberOf( &aFlProp );
+    aBtnModify.SetAccessibleRelationMemberOf( &aFlProp );
+    aBtnDelete.SetAccessibleRelationMemberOf( &aFlProp );
+    aLbHatchings.SetAccessibleRelationLabeledBy(&aLbHatchings);
 }
 
 // -----------------------------------------------------------------------
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index f4edeaa6d392..7c4eea588c86 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -68,6 +68,7 @@
 #include <svx/gallery.hxx>
 #include <svx/xbitmap.hxx>
 #include <unotools/localfilehelper.hxx>
+#include "paragrph.hrc"
 #include "sfx2/opengrf.hxx"
 #include <svx/dialmgr.hxx>
 #include <svx/dialogs.hrc>
@@ -105,6 +106,7 @@ SvxLineTabPage::SvxLineTabPage
     const SfxItemSet& rInAttrs
 ) :
     SvxTabPage          ( pParent, CUI_RES( RID_SVXPAGE_LINE ), rInAttrs ),
+    aFlLine             ( this, CUI_RES( FL_LINE ) ),
     aFtLineStyle        ( this, CUI_RES( FT_LINE_STYLE ) ),
     aLbLineStyle        ( this, CUI_RES( LB_LINE_STYLE ) ),
     aFtColor            ( this, CUI_RES( FT_COLOR ) ),
@@ -113,19 +115,18 @@ SvxLineTabPage::SvxLineTabPage
     aMtrLineWidth       ( this, CUI_RES( MTR_FLD_LINE_WIDTH ) ),
     aFtTransparent      ( this, CUI_RES( FT_TRANSPARENT ) ),
     aMtrTransparent     ( this, CUI_RES( MTR_LINE_TRANSPARENT ) ),
-    aFlLine             ( this, CUI_RES( FL_LINE ) ),
-    aFtLineEndsStyle    ( this, CUI_RES( FT_LINE_ENDS_STYLE ) ),
+    aFlLineEnds         ( this, CUI_RES( FL_LINE_ENDS ) ),
     aLbStartStyle       ( this, CUI_RES( LB_START_STYLE ) ),
-    aFtLineEndsWidth    ( this, CUI_RES( FT_LINE_ENDS_WIDTH ) ),
     aMtrStartWidth      ( this, CUI_RES( MTR_FLD_START_WIDTH ) ),
     aTsbCenterStart     ( this, CUI_RES( TSB_CENTER_START ) ),
+    aFtLineEndsStyle    ( this, CUI_RES( FT_LINE_ENDS_STYLE ) ),
     aLbEndStyle         ( this, CUI_RES( LB_END_STYLE ) ),
+    aFtLineEndsWidth    ( this, CUI_RES( FT_LINE_ENDS_WIDTH ) ),
     aMtrEndWidth        ( this, CUI_RES( MTR_FLD_END_WIDTH ) ),
     aTsbCenterEnd       ( this, CUI_RES( TSB_CENTER_END ) ),
     aCbxSynchronize     ( this, CUI_RES( CBX_SYNCHRONIZE ) ),
-    aFlLineEnds         ( this, CUI_RES( FL_LINE_ENDS ) ),
-    aCtlPreview         ( this, CUI_RES( CTL_PREVIEW ) ),
     aFLSeparator        ( this, CUI_RES( FL_SEPARATOR ) ),
+    aCtlPreview         ( this, CUI_RES( CTL_PREVIEW ) ),
 
     // #116827#
     maFLEdgeStyle       ( this, CUI_RES( FL_EDGE_STYLE ) ),
@@ -165,8 +166,18 @@ SvxLineTabPage::SvxLineTabPage
     pnColorTableState( 0 ),
    nPageType           ( 0 )//CHINA001 pPageType           ( NULL ),
 {
+    aLbEndStyle.SetAccessibleName(String(CUI_RES(STR_STYLE)));
+    aLbStartStyle.SetAccessibleName(String(CUI_RES( STR_LB_START_STYLE ) ) );
+    aMtrStartWidth.SetAccessibleName(String(CUI_RES( STR_MTR_FLD_START_WIDTH ) ) );
+    aLbEndStyle.SetAccessibleName(String(CUI_RES( STR_LB_END_STYLE ) ) );
+    aMtrEndWidth.SetAccessibleName(String(CUI_RES( STR_MTR_FLD_END_WIDTH ) ) );
+    aTsbCenterStart.SetAccessibleName(String(CUI_RES( STR_CENTER_START ) ) );
+    aTsbCenterEnd.SetAccessibleName(String(CUI_RES( STR_CENTER_END ) ) );
+
     FreeResource();
 
+    aCtlPreview.SetAccessibleName(String(CUI_RES(STR_EXAMPLE)));
+
     // diese Page braucht ExchangeSupport
     SetExchangeSupport();
 
diff --git a/cui/source/tabpages/tplnedef.cxx b/cui/source/tabpages/tplnedef.cxx
index d70cb46fb1bc..7c61d05ed8f4 100644
--- a/cui/source/tabpages/tplnedef.cxx
+++ b/cui/source/tabpages/tplnedef.cxx
@@ -113,6 +113,13 @@ SvxLineDefTabPage::SvxLineDefTabPage
     aBtnLoad.SetModeImage( Image( CUI_RES( RID_SVXIMG_LOAD_H ) ), BMP_COLOR_HIGHCONTRAST );
     aBtnSave.SetModeImage( Image( CUI_RES( RID_SVXIMG_SAVE_H ) ), BMP_COLOR_HIGHCONTRAST );
 
+    aLbType1.SetAccessibleName(String(CUI_RES( STR_START_TYPE ) ) );
+    aLbType2.SetAccessibleName(String(CUI_RES( STR_END_TYPE ) ) );
+    aNumFldNumber1.SetAccessibleName(String(CUI_RES( STR_START_NUM ) ) );
+    aNumFldNumber2.SetAccessibleName(String(CUI_RES( STR_END_NUM ) ) );
+    aMtrLength1.SetAccessibleName(String(CUI_RES( STR_START_LENGTH ) ) );
+    aMtrLength2.SetAccessibleName(String(CUI_RES( STR_END_LENGTH ) ) );
+
     FreeResource();
 
     // diese Page braucht ExchangeSupport
@@ -175,6 +182,12 @@ SvxLineDefTabPage::SvxLineDefTabPage
     aMtrDistance.SetModifyHdl( aLink );
 
     pDashList = NULL;
+
+    aBtnAdd.SetAccessibleRelationMemberOf( &aFlDefinition );
+    aBtnModify.SetAccessibleRelationMemberOf( &aFlDefinition );
+    aBtnDelete.SetAccessibleRelationMemberOf( &aFlDefinition );
+    aBtnLoad.SetAccessibleRelationMemberOf( &aFlDefinition );
+    aBtnSave.SetAccessibleRelationMemberOf( &aFlDefinition );
 }
 
 
diff --git a/cui/source/tabpages/tplneend.cxx b/cui/source/tabpages/tplneend.cxx
index 4422d98247c1..4de0960a5610 100644
--- a/cui/source/tabpages/tplneend.cxx
+++ b/cui/source/tabpages/tplneend.cxx
@@ -135,6 +135,9 @@ SvxLineEndDefTabPage::SvxLineEndDefTabPage
     aLbLineEnds.SetSelectHdl(
         LINK( this, SvxLineEndDefTabPage, SelectLineEndHdl_Impl ) );
 
+    aBtnAdd.SetAccessibleRelationMemberOf(&aFlTip);
+    aBtnModify.SetAccessibleRelationMemberOf(&aFlTip);
+    aBtnDelete.SetAccessibleRelationMemberOf(&aFlTip);
 }
 
 //------------------------------------------------------------------------
diff --git a/cui/source/tabpages/tpshadow.cxx b/cui/source/tabpages/tpshadow.cxx
index 7681bca4956a..b4ed21ef0aad 100644
--- a/cui/source/tabpages/tpshadow.cxx
+++ b/cui/source/tabpages/tpshadow.cxx
@@ -46,7 +46,7 @@
 #include <dialmgr.hxx>
 #include "svx/dlgutil.hxx"
 #include <cuitabline.hxx>
-
+#include "paragrph.hrc"
 #include <svx/xlineit0.hxx>
 #include <sfx2/request.hxx> //add CHINA001
 
@@ -188,6 +188,8 @@ SvxShadowTabPage::SvxShadowTabPage( Window* pParent, const SfxItemSet& rInAttrs
     aMtrTransparent.SetModifyHdl( aLink );
     aMtrDistance.SetModifyHdl( aLink );
 
+    aCtlXRectPreview.SetAccessibleName(String(CUI_RES(STR_EXAMPLE)));
+    aCtlPosition.SetAccessibleRelationMemberOf( &aFlProp );
 }
 
 // -----------------------------------------------------------------------
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index ab73b6329e15..3d8deb015039 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -249,6 +249,11 @@ SvxAngleTabPage::SvxAngleTabPage( Window* pParent, const SfxItemSet& rInAttrs  )
     ePoolUnit = pPool->GetMetric(SID_ATTR_TRANSFORM_POS_X);
 
     aMtrAngle.SetModifyHdl(LINK( this, SvxAngleTabPage, ModifiedHdl));
+
+    aCtlRect.SetAccessibleRelationLabeledBy(&aFtPosPresets);
+    aCtlRect.SetAccessibleRelationMemberOf(&aFlPosition);
+    aCtlAngle.SetAccessibleRelationLabeledBy(&aFtAnglePresets);
+    aCtlAngle.SetAccessibleRelationMemberOf(&aFlAngle);
 }
 
 // -----------------------------------------------------------------------
@@ -765,6 +770,10 @@ SvxPositionSizeTabPage::SvxPositionSizeTabPage( Window* pParent, const SfxItemSe
     maTsbPosProtect.SetClickHdl( LINK( this, SvxPositionSizeTabPage, ChangePosProtectHdl ) );
     maTsbSizeProtect.SetClickHdl( LINK( this, SvxPositionSizeTabPage, ChangeSizeProtectHdl ) );
 
+    maCtlPos.SetAccessibleRelationMemberOf( &maFlPosition );
+    maCtlSize.SetAccessibleRelationMemberOf( &maFlSize );
+    maCtlPos.SetAccessibleRelationLabeledBy( &maFtPosReference );
+    maCtlSize.SetAccessibleRelationLabeledBy( &maFtSizeReference );
 }
 
 // -----------------------------------------------------------------------
diff --git a/extensions/prj/build.lst b/extensions/prj/build.lst
index f283da39a4af..e21035fe1163 100644
--- a/extensions/prj/build.lst
+++ b/extensions/prj/build.lst
@@ -1,4 +1,4 @@
-ex  extensions :  officecfg  l10n rdbmaker svx SANE:sane TWAIN:twain np_sdk offuh stoc ZLIB:zlib CURL:curl LIBXSLT:libxslt NULL
+ex  extensions :  officecfg  L10N:l10n rdbmaker svx SANE:sane TWAIN:twain np_sdk offuh stoc ZLIB:zlib CURL:curl LIBXSLT:libxslt NULL
 
 ex  extensions                                  usr1    -   all ex_mkout NULL
 ex  extensions\inc                              nmake   -   all ex_inc NULL
diff --git a/extensions/source/dbpilots/groupboxwiz.cxx b/extensions/source/dbpilots/groupboxwiz.cxx
index 9956cfe86428..69d8835dcdd5 100644
--- a/extensions/source/dbpilots/groupboxwiz.cxx
+++ b/extensions/source/dbpilots/groupboxwiz.cxx
@@ -238,6 +238,9 @@ namespace dbp
         m_aExistingRadios.EnableMultiSelection(sal_True);
 
         getDialog()->defaultButton(&m_aMoveRight);
+
+        m_aExistingRadios.SetAccessibleRelationMemberOf(&m_aExistingRadios);
+        m_aExistingRadios.SetAccessibleRelationLabeledBy(&m_aExistingRadiosLabel);
     }
 
     //---------------------------------------------------------------------
@@ -368,6 +371,8 @@ namespace dbp
 
         announceControls(m_aDefSelYes, m_aDefSelNo, m_aDefSelection);
         m_aDefSelection.SetDropDownLineCount(10);
+        m_aDefSelection.SetAccessibleRelationLabeledBy( &m_aDefSelYes );
+        m_aDefSelection.SetAccessibleRelationMemberOf(&m_aDefaultSelectionLabel);
     }
 
     //---------------------------------------------------------------------
@@ -418,6 +423,9 @@ namespace dbp
         FreeResource();
 
         m_aOptions.SetSelectHdl(LINK(this, OOptionValuesPage, OnOptionSelected));
+
+        m_aOptions.SetAccessibleRelationMemberOf(&m_aOptions);
+        m_aOptions.SetAccessibleRelationLabeledBy(&m_aOptionsLabel);
     }
 
     //---------------------------------------------------------------------
diff --git a/extensions/source/ole/unoobjw.cxx b/extensions/source/ole/unoobjw.cxx
index 5452a95129ff..496ec6fea8db 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -915,7 +915,7 @@ HRESULT InterfaceOleWrapper_Impl::doInvoke( DISPPARAMS * pdispparams, VARIANT *
     HRESULT ret= S_OK;
     try
     {
-        Sequence<INT16>     outIndex;
+        Sequence<sal_Int16>     outIndex;
         Sequence<Any>   outParams;
         Any                 returnValue;
 
diff --git a/extensions/source/oooimprovement/onlogrotate_job.cxx b/extensions/source/oooimprovement/onlogrotate_job.cxx
index d83c43bfcfd8..e1f9cf717584 100644
--- a/extensions/source/oooimprovement/onlogrotate_job.cxx
+++ b/extensions/source/oooimprovement/onlogrotate_job.cxx
@@ -37,7 +37,7 @@
 #include <com/sun/star/ucb/XSimpleFileAccess.hpp>
 #include <com/sun/star/frame/XDesktop.hpp>
 #include <com/sun/star/frame/XTerminateListener.hpp>
-#include <osl/mutex.hxx>
+#include <osl/conditn.hxx>
 #include <osl/thread.hxx>
 #include <osl/time.h>
 #include <cppuhelper/implbase1.hxx>
@@ -108,49 +108,41 @@ namespace
         public:
             OnLogRotateThread(Reference<XMultiServiceFactory> sf);
             virtual void SAL_CALL run();
-            OnLogRotateThread* disposing();
+            void stop();
 
         private:
             Reference<XMultiServiceFactory> m_ServiceFactory;
-            ::osl::Mutex m_ServiceFactoryMutex;
+            ::osl::Condition m_Stop;
     };
 
     OnLogRotateThread::OnLogRotateThread(Reference<XMultiServiceFactory> sf)
         : m_ServiceFactory(sf)
-    { }
+    {
+        OSL_ASSERT(sf.is());
+    }
 
     void SAL_CALL OnLogRotateThread::run()
     {
+        TimeValue wait_intervall = {30,0};
+        if (m_Stop.wait(&wait_intervall) == ::osl::Condition::result_timeout)
         {
-            ::osl::Thread::yield();
-            TimeValue wait_intervall = {30,0};
-            osl_waitThread(&wait_intervall);
-        }
-        {
-            ::osl::Guard< ::osl::Mutex> service_factory_guard(m_ServiceFactoryMutex);
             try
             {
-                if(m_ServiceFactory.is())
+                if(Config(m_ServiceFactory).getInvitationAccepted())
                 {
-                    if(Config(m_ServiceFactory).getInvitationAccepted())
-                    {
-                        packLogs(m_ServiceFactory);
-                        uploadLogs(m_ServiceFactory);
-                    }
-                    else
-                        LogStorage(m_ServiceFactory).clear();
+                    packLogs(m_ServiceFactory);
+                    uploadLogs(m_ServiceFactory);
                 }
-                m_ServiceFactory.clear();
+                else
+                    LogStorage(m_ServiceFactory).clear();
             }
             catch(...) {}
         }
     }
 
-    OnLogRotateThread* OnLogRotateThread::disposing()
+    void OnLogRotateThread::stop()
     {
-        ::osl::Guard< ::osl::Mutex> service_factory_guard(m_ServiceFactoryMutex);
-        m_ServiceFactory.clear();
-        return this;
+        m_Stop.set();
     }
 
     class OnLogRotateThreadWatcher : public ::cppu::WeakImplHelper1<XTerminateListener>
@@ -163,7 +155,7 @@ namespace
             }
             virtual ~OnLogRotateThreadWatcher()
             {
-                m_Thread->disposing()->terminate();
+                m_Thread->stop();
                 m_Thread->join();
             };
 
@@ -172,13 +164,13 @@ namespace
                 { };
             virtual void SAL_CALL notifyTermination(const EventObject&) throw(RuntimeException)
             {
-                m_Thread->disposing()->terminate();
+                m_Thread->stop();
                 m_Thread->join();
             };
             // XEventListener
             virtual void SAL_CALL disposing(const EventObject&) throw(RuntimeException)
             {
-                m_Thread->disposing()->terminate();
+                m_Thread->stop();
                 m_Thread->join();
             };
         private:
diff --git a/forms/prj/build.lst b/forms/prj/build.lst
index 115c035edbbc..81b502832d42 100644
--- a/forms/prj/build.lst
+++ b/forms/prj/build.lst
@@ -1,4 +1,4 @@
-fm	forms	:    l10n oovbaapi svx sfx2 qadevOOo LIBXSLT:libxslt NULL
+fm	forms	:    L10N:l10n oovbaapi svx sfx2 qadevOOo LIBXSLT:libxslt NULL
 fm  forms                                   usr1    -   all fm_mkofrm NULL
 fm	forms\inc								nmake	-	all	fm_inc NULL
 fm	forms\source\inc						get		-	all	fm_sinc NULL
diff --git a/forms/source/component/Filter.cxx b/forms/source/component/Filter.cxx
index a5159679c9de..d20fec8f1459 100644
--- a/forms/source/component/Filter.cxx
+++ b/forms/source/component/Filter.cxx
@@ -104,8 +104,8 @@ namespace frm
     //=====================================================================
     //---------------------------------------------------------------------
     OFilterControl::OFilterControl( const Reference< XMultiServiceFactory >& _rxORB )
-        :m_aTextListeners( *this )
-        ,m_aContext( _rxORB )
+        :UnoControl( _rxORB )
+        ,m_aTextListeners( *this )
         ,m_aParser( _rxORB )
         ,m_nControlClass( FormComponentType::TEXTFIELD )
         ,m_bFilterList( sal_False )
@@ -132,11 +132,11 @@ namespace frm
         if ( !m_xFormatter.is() )
         {
             // we can create one from the connection, if it's an SDB connection
-            Reference< XNumberFormatsSupplier > xFormatSupplier = ::dbtools::getNumberFormats( m_xConnection, sal_True, m_aContext.getLegacyServiceFactory() );
+            Reference< XNumberFormatsSupplier > xFormatSupplier = ::dbtools::getNumberFormats( m_xConnection, sal_True, maContext.getLegacyServiceFactory() );
 
             if ( xFormatSupplier.is() )
             {
-                m_aContext.createComponent( "com.sun.star.util.NumberFormatter", m_xFormatter );
+                maContext.createComponent( "com.sun.star.util.NumberFormatter", m_xFormatter );
                 if ( m_xFormatter.is() )
                     m_xFormatter->attachNumberFormatsSupplier( xFormatSupplier );
             }
@@ -354,7 +354,7 @@ namespace frm
                         sItemText = itemPos->second;
                         if ( sItemText.getLength() )
                         {
-                            ::dbtools::OPredicateInputController aPredicateInput( m_aContext.getLegacyServiceFactory(), m_xConnection, getParseContext() );
+                            ::dbtools::OPredicateInputController aPredicateInput( maContext.getLegacyServiceFactory(), m_xConnection, getParseContext() );
                             ::rtl::OUString sErrorMessage;
                             OSL_VERIFY( aPredicateInput.normalizePredicateString( sItemText, m_xField, &sErrorMessage ) );
                         }
@@ -539,7 +539,7 @@ namespace frm
             aNewText.trim();
             if ( aNewText.getLength() )
             {
-                ::dbtools::OPredicateInputController aPredicateInput( m_aContext.getLegacyServiceFactory(), m_xConnection, getParseContext() );
+                ::dbtools::OPredicateInputController aPredicateInput( maContext.getLegacyServiceFactory(), m_xConnection, getParseContext() );
                 ::rtl::OUString sErrorMessage;
                 if ( !aPredicateInput.normalizePredicateString( aNewText, m_xField, &sErrorMessage ) )
                 {
@@ -763,7 +763,7 @@ namespace frm
 
             static ::rtl::OUString s_sDialogServiceName = ::rtl::OUString::createFromAscii( "com.sun.star.sdb.ErrorMessageDialog" );
 
-            Reference< XExecutableDialog > xErrorDialog( m_aContext.createComponentWithArguments( s_sDialogServiceName, aArgs ), UNO_QUERY );
+            Reference< XExecutableDialog > xErrorDialog( maContext.createComponentWithArguments( s_sDialogServiceName, aArgs ), UNO_QUERY );
             if ( xErrorDialog.is() )
                 xErrorDialog->execute();
             else
diff --git a/forms/source/component/Filter.hxx b/forms/source/component/Filter.hxx
index 99c621d6cdf6..6ebc7c49df6b 100644
--- a/forms/source/component/Filter.hxx
+++ b/forms/source/component/Filter.hxx
@@ -68,7 +68,6 @@ namespace frm
     {
         TextListenerMultiplexer     m_aTextListeners;
 
-        ::comphelper::ComponentContext                                                          m_aContext;
         ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >               m_xField;
         ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter >            m_xFormatter;
         ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >                 m_xConnection;
diff --git a/forms/source/richtext/richtextcontrol.cxx b/forms/source/richtext/richtextcontrol.cxx
index 0755510cdd48..9b37ba6d67c4 100644
--- a/forms/source/richtext/richtextcontrol.cxx
+++ b/forms/source/richtext/richtextcontrol.cxx
@@ -109,7 +109,7 @@ namespace frm
     DBG_NAME( ORichTextControl )
     //------------------------------------------------------------------
     ORichTextControl::ORichTextControl( const Reference< XMultiServiceFactory >& _rxORB )
-        :m_xORB( _rxORB )
+        :UnoEditControl( _rxORB )
     {
         DBG_CTOR( ORichTextControl, NULL );
     }
diff --git a/forms/source/richtext/richtextcontrol.hxx b/forms/source/richtext/richtextcontrol.hxx
index e4dea25ec225..54f0b6e08966 100644
--- a/forms/source/richtext/richtextcontrol.hxx
+++ b/forms/source/richtext/richtextcontrol.hxx
@@ -59,10 +59,6 @@ namespace frm
     class ORichTextControl  :public UnoEditControl
                             ,public ORichTextControl_Base
     {
-    private:
-        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
-                        m_xORB;
-
     public:
         ORichTextControl(
             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB
diff --git a/forms/source/solar/component/navbarcontrol.cxx b/forms/source/solar/component/navbarcontrol.cxx
index 36b1f12eb6b2..622df5783715 100644
--- a/forms/source/solar/component/navbarcontrol.cxx
+++ b/forms/source/solar/component/navbarcontrol.cxx
@@ -106,7 +106,7 @@ namespace frm
     DBG_NAME( ONavigationBarControl )
     //------------------------------------------------------------------
     ONavigationBarControl::ONavigationBarControl( const Reference< XMultiServiceFactory >& _rxORB )
-        :m_xORB( _rxORB )
+        :UnoControl( _rxORB )
     {
         DBG_CTOR( ONavigationBarControl, NULL );
     }
@@ -181,7 +181,7 @@ namespace frm
             }
 
             // create the peer
-            ONavigationBarPeer* pPeer = ONavigationBarPeer::Create( m_xORB, pParentWin, getModel() );
+            ONavigationBarPeer* pPeer = ONavigationBarPeer::Create( maContext.getLegacyServiceFactory(), pParentWin, getModel() );
             DBG_ASSERT( pPeer, "ONavigationBarControl::createPeer: invalid peer returned!" );
             if ( pPeer )
                 // by definition, the returned component is aquired once
diff --git a/forms/source/solar/component/navbarcontrol.hxx b/forms/source/solar/component/navbarcontrol.hxx
index 0040d5d4e6ad..877aa55aaba2 100644
--- a/forms/source/solar/component/navbarcontrol.hxx
+++ b/forms/source/solar/component/navbarcontrol.hxx
@@ -56,10 +56,6 @@ namespace frm
                             :public UnoControl
                             ,public ONavigationBarControl_Base
     {
-    private:
-        ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >
-                        m_xORB;
-
     public:
         ONavigationBarControl(
             const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB
diff --git a/javainstaller2/prj/build.lst b/javainstaller2/prj/build.lst
index f6a0ef5b6036..28ad41ba6c7b 100755
--- a/javainstaller2/prj/build.lst
+++ b/javainstaller2/prj/build.lst
@@ -1,4 +1,4 @@
-jl2    javainstaller2    :    l10n setup_native NULL
+jl2    javainstaller2    :    L10N:l10n setup_native NULL
 jl2    javainstaller2\src\Localization   nmake    -    u    jl2_local NULL
 jl2    javainstaller2\src\Properties     nmake    -    u    jl2_properties jl2_local.u NULL
 jl2    javainstaller2\src\Helpfiles      nmake    -    u    jl2_helpfiles jl2_local.u NULL
diff --git a/setup_native/prj/build.lst b/setup_native/prj/build.lst
index df7b02484039..00d7a0c92045 100644
--- a/setup_native/prj/build.lst
+++ b/setup_native/prj/build.lst
@@ -1,4 +1,4 @@
-pk	setup_native	:	l10n l10ntools soltools sal xml2cmp NULL
+pk	setup_native	:	L10N:l10n l10ntools soltools sal xml2cmp NULL
 pk  setup_native                                          usr1    - all  sn_mkout NULL
 pk  setup_native\scripts\source                           nmake   -  u   sn_source NULL
 pk  setup_native\scripts                                  nmake   -  u   sn_scripts sn_source.u NULL
diff --git a/setup_native/source/mac/ooo3_installer.icns b/setup_native/source/mac/ooo3_installer.icns
index e064ad70479d..bacdd17d8470 100644
--- a/setup_native/source/mac/ooo3_installer.icns
+++ b/setup_native/source/mac/ooo3_installer.icns
diff --git a/setup_native/source/packinfo/packinfo_office.txt b/setup_native/source/packinfo/packinfo_office.txt
index fb04b347fcdf..242507c59db9 100755
--- a/setup_native/source/packinfo/packinfo_office.txt
+++ b/setup_native/source/packinfo/packinfo_office.txt
@@ -566,7 +566,7 @@ linuxpatchrequires = ""
 copyright = "1999-2010 by Oracle"
 solariscopyright = "solariscopyrightfile"
 vendor = "Oracle"
-description = "De-AT dictionary for %PACKAGENAME %PRODUCTVERSION"
+description = "De-AT dictionary for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
 End
@@ -582,7 +582,7 @@ linuxpatchrequires = ""
 copyright = "1999-2010 by Oracle"
 solariscopyright = "solariscopyrightfile"
 vendor = "Oracle"
-description = "De-CH dictionary for %PACKAGENAME %PRODUCTVERSION"
+description = "De-CH dictionary for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
 End
@@ -598,7 +598,7 @@ linuxpatchrequires = ""
 copyright = "1999-2010 by Oracle"
 solariscopyright = "solariscopyrightfile"
 vendor = "Oracle"
-description = "De-DE dictionary for %PACKAGENAME %PRODUCTVERSION"
+description = "De-DE dictionary for %PRODUCTNAME %PRODUCTVERSION"
 destpath = "/opt"
 packageversion = "%PACKAGEVERSION"
 End
diff --git a/setup_native/source/win32/msi-encodinglist.txt b/setup_native/source/win32/msi-encodinglist.txt
index 5185a9ea642e..ebfe9371f59f 100644
--- a/setup_native/source/win32/msi-encodinglist.txt
+++ b/setup_native/source/win32/msi-encodinglist.txt
@@ -3,19 +3,20 @@
 af    1252  1078   # Afrikaans
 ar    1256  1025
 ar-SA 1256  1025
-as-IN    0  1101   # Assamese
 as       0  1101   # Assamese
+as-IN    0  1101   # Assamese
 ast   1252  1610
 be-BY 1251  1059   # Belarusian
 bg    1251  1026   # Bulgarian
 bn       0  2117   # Bengali
 bn-BD    0  2117   # Bengali Bangladesh
 bn-IN    0  1093   # Bengali India
+bo       0  2121   
 br    1252  1150   # Breton
 brx      0  1603   # Bodo (India)
 bs       0  5146   # bosnian
-bo       0  2121   
 ca    1252  1027   # Catalan
+ca-XV   1252  32771  # Catalan Valencian
 cs    1250  1029   # Czech
 cy    1252  1106   # Welsh
 da    1252  1030
@@ -38,11 +39,12 @@ fr-CA 1252  3084
 ga       0  2108   # Irish
 gd       0  1084   # Gaelic (Scotland)
 gl    1252  1110   # Galician
-gu    0  1095   # Gujarati
+gu       0  1095   # Gujarati
 gu-IN    0  1095   # Gujarati
 he    1255  1037
 hi       0  1081
 hr    1250  1050   # Croatian
+ht    1252  1626   # Haitian
 hu    1250  1038
 hy       0  1067   # Armenian
 id    1252  1057   # Indonesian
@@ -50,6 +52,8 @@ is    1252  1039   # Icelandic
 it    1252  1040
 ja     932  1041
 ka       0  1079   # Georgian
+kid   1252  1033   # key id pseudo language
+kk       0  1087
 km       0  1107   # Khmer
 kn       0  1099   # Kannada
 kn-IN    0  1099   # Kannada
@@ -57,15 +61,14 @@ ko     949  1042
 kok      0  1111   # Konkani
 ks       0  1120   # Kashmiri
 ku       0  1574
-kid   1252  1033   # key id pseudo language
 ky       0  2100
 lo       0  1108   # Lao
 lt    1257  1063   # Lithuanian
 lv    1257  1062   # Latvian
 mai      0  1605   # Maithili (India)
 mk    1251  1071   # Macedonian
-ml-IN    0  1100
 ml       0  1100
+ml-IN    0  1100
 mn       0  1104   # Mongolian
 mni      0  1112   # Manipuri
 mn-TR    0  2128   # Mongolian Classical/traditional
@@ -81,18 +84,17 @@ nn    1252  2068
 no    1252  1044
 nr       0  1580   # Ndebele South
 ns       0  1132   # Northern Sotho (Sepedi)
-or       0  1096   # Oriya
 oc    1252  1154   # Occitan-lengadocian
+om       0  2162
+or       0  1096   # Oriya
 or-IN    0  1096
 pa-IN    0  1094   # Punjabi
 pap      0  2171 
-om       0  2162
 pl    1250  1045
+ps       0  2171
 pt    1252  2070
 pt-BR 1252  1046
 pt-PT 1252  2070
-ps       0  2171
-ca-XV   1252  32771  # Catalan Valencian
 rm       0  1047   # Raeto-Romance
 ro    1250  1048   # Romanian
 ru    1251  1049
@@ -103,6 +105,7 @@ sb       0  1070   # Sorbian
 sc       0  3047
 sd       0  1113   # Sindhi
 sh    1250  2074   # Serbian Latin
+si       0  2133
 sk    1250  1051   # Slovak
 sl    1250  1060   # Slovenian
 sq    1250  1052   # Albanian
@@ -113,11 +116,10 @@ st       0  1072   # Southern Sotho, Sutu
 sv    1252  1053
 sw    1252  1089   # Swahili
 sw-TZ 1252  1089   # Swahili
-si       0  2133
 ta       0  1097   # Tamil
 ta-IN    0  1097   # Tamil
-te-IN    0  1098
 te       0  1098
+te-IN    0  1098
 tg       0  1064   # Tajik
 th     874  1054
 ti-ER    0  1139
@@ -125,11 +127,11 @@ tn       0  1074   # Setsuana
 tr    1254  1055   # Turkish
 ts       0  1073   # Tsonga
 tt    1251  1092   # Tatar
+ug       0  2200
 uk    1251  1058   # Ukrainian
 ur    1256  1056   # Urdu
 ur-IN    0  2080
 uz       0  1091   # Uzbek (Latin)
-ug       0  2200
 ve       0  1075   # Venda
 vi    1258  1066   # Vietnamese
 xh       0  1076   # Xhosa
@@ -137,4 +139,3 @@ yi       0  1085   # Yiddish
 zh-CN  936  2052
 zh-TW  950  1028
 zu       0  1077   # Zulu
-kk       0  1087
diff --git a/wizards/prj/build.lst b/wizards/prj/build.lst
index ca4e940d3527..e0d94b1c1e4d 100644
--- a/wizards/prj/build.lst
+++ b/wizards/prj/build.lst
@@ -1,4 +1,4 @@
-wz      wizards     :    l10n rsc javaunohelper unoil LIBXSLT:libxslt NULL
+wz      wizards     :    L10N:l10n rsc javaunohelper unoil LIBXSLT:libxslt NULL
 wz      wizards\util                                            nmake           -       all     wz_util NULL
 wz      wizards\source\config                                   nmake           -       all     wz_config NULL
 wz      wizards\source\configshare                              nmake           -       all     wz_configshare NULL
diff --git a/xmlsecurity/prj/build.lst b/xmlsecurity/prj/build.lst
index 3d70b9cb1181..54326d4fe5ef 100644
--- a/xmlsecurity/prj/build.lst
+++ b/xmlsecurity/prj/build.lst
@@ -1,4 +1,4 @@
-xs	xmlsecurity	:    l10n xmloff unotools offapi unoil svx MOZ:moz SO:moz_prebuilt LIBXMLSEC:libxmlsec NSS:nss LIBXSLT:libxslt NULL
+xs	xmlsecurity	:    L10N:l10n xmloff unotools offapi unoil svx MOZ:moz SO:moz_prebuilt LIBXMLSEC:libxmlsec NSS:nss LIBXSLT:libxslt NULL
 xs	xmlsecurity                                                        usr1	 -	all	xs_mkout	NULL
 xs	xmlsecurity\inc				                                       nmake -	all	xs_inc NULL
 xs	xmlsecurity\source\framework                                       nmake -	all	xs_fw xs_inc NULL