os150: m101 merged

10 files changed, 39 insertions, 9 deletions

diff --git a/sw/source/ui/table/colwd.cxx b/sw/source/ui/table/colwd.cxx
index dc7ca95821..2361f50a98 100644
--- a/sw/source/ui/table/colwd.cxx
+++ b/sw/source/ui/table/colwd.cxx
@@ -76,12 +76,12 @@ IMPL_LINK_INLINE_END( SwTableWidthDlg, LoseFocusHdl, Edit *, EMPTYARG )
 SwTableWidthDlg::SwTableWidthDlg(Window *pParent, SwTableFUNC &rTableFnc ) :
 
     SvxStandardDialog( pParent, SW_RES(DLG_COL_WIDTH) ),
+    aWidthFL(this,     SW_RES(FL_WIDTH)),
 
     aColFT(this, 		SW_RES(FT_COL)),
     aColEdit(this, 		SW_RES(ED_COL)),
     aWidthFT(this, 		SW_RES(FT_WIDTH)),
     aWidthEdit(this, 	SW_RES(ED_WIDTH)),
-    aWidthFL(this,     SW_RES(FL_WIDTH)),
     aOKBtn(this, 		SW_RES(BT_OK)),
     aCancelBtn(this, 	SW_RES(BT_CANCEL)),
     aHelpBtn(this, 		SW_RES(BT_HELP)),
diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx
index 9678ff6f51..1c08d7c075 100644
--- a/sw/source/ui/table/convert.cxx
+++ b/sw/source/ui/table/convert.cxx
@@ -153,6 +153,8 @@ SwConvertTableDlg::SwConvertTableDlg( SwView& rView, bool bToTable )
     pTAutoFmt( 0 ),
     pShell( &rView.GetWrtShell() )
 {
+    aOtherEd.SetAccessibleName(String(SW_RES(STR_SYMBOL)));
+    aOtherEd.SetAccessibleRelationLabeledBy(&aOtherBtn);
     FreeResource();
     if(nSaveButtonState > -1)
     {
diff --git a/sw/source/ui/table/convert.hrc b/sw/source/ui/table/convert.hrc
index e86906dd20..34e152c489 100644
--- a/sw/source/ui/table/convert.hrc
+++ b/sw/source/ui/table/convert.hrc
@@ -45,3 +45,6 @@
 #define BT_AUTOFORMAT	102
 #define BT_HELP 		103
 #define WIN_REPEAT_HEADER   104
+//IAccessibility2 Implementation 2009-----
+#define	STR_SYMBOL		105
+//-----IAccessibility2 Implementation 2009
diff --git a/sw/source/ui/table/convert.src b/sw/source/ui/table/convert.src
index 13e9b9e860..56f8d098a1 100644
--- a/sw/source/ui/table/convert.src
+++ b/sw/source/ui/table/convert.src
@@ -191,6 +191,12 @@ ModalDialog DLG_CONV_TEXT_TABLE
         Hide = TRUE ;
         Text [ en-US ] = "Auto~Format..." ;
     };
+    /*IAccessibility2 Implementation 2009-----*/
+    String STR_SYMBOL
+    {
+        Text [ en-US ] = "Symbol" ;
+    };
+    /*-----IAccessibility2 Implementation 2009*/
 };
 
 
diff --git a/sw/source/ui/table/rowht.cxx b/sw/source/ui/table/rowht.cxx
index 9bfdbe74e5..0493123823 100644
--- a/sw/source/ui/table/rowht.cxx
+++ b/sw/source/ui/table/rowht.cxx
@@ -86,10 +86,10 @@ void SwTableHeightDlg::Apply()
 SwTableHeightDlg::SwTableHeightDlg( Window *pParent, SwWrtShell &rS ) :
 
     SvxStandardDialog(pParent, SW_RES(DLG_ROW_HEIGHT)),
+    aHeightFL(this, SW_RES(FL_HEIGHT)),
 
     aHeightEdit(this, SW_RES(ED_HEIGHT)),
     aAutoHeightCB(this, SW_RES(CB_AUTOHEIGHT)),
-    aHeightFL(this, SW_RES(FL_HEIGHT)),
     aOKBtn(this, SW_RES(BT_OK)),
     aCancelBtn(this, SW_RES(BT_CANCEL)),
     aHelpBtn( this, SW_RES( BT_HELP ) ),
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index 18385059ac..3101aecc16 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -53,6 +53,8 @@
 #include <fmtrowsplt.hxx>
 #include <svx/htmlmode.hxx>
 
+#include "access.hrc"
+
 #ifndef _DOCSH_HXX
 #include <docsh.hxx>
 #endif
@@ -824,7 +826,8 @@ SwTableColumnPage::SwTableColumnPage( Window* pParent,
     aProportionalCB(this,	SW_RES(CB_PROP)),
     aSpaceFT(this,			SW_RES(FT_SPACE)),
     aSpaceED(this,			SW_RES(ED_SPACE)),
-
+    
+    aColFL(this,            SW_RES(COL_FL_LAYOUT)),
     aUpBtn(this,            SW_RES(COL_BTN_UP)),
     aFT1(this,              SW_RES(COL_FT_1)),
     aMF1(this,				SW_RES(COL_MF_1)),
@@ -839,7 +842,6 @@ SwTableColumnPage::SwTableColumnPage( Window* pParent,
     aFT6(this,				SW_RES(COL_FT_6)),
     aMF6(this,				SW_RES(COL_MF_6)),
     aDownBtn(this,          SW_RES(COL_BTN_DOWN)),
-    aColFL(this,            SW_RES(COL_FL_LAYOUT)),
 
     nTableWidth(0),
     nMinWidth( MINLAY ),
@@ -852,6 +854,9 @@ SwTableColumnPage::SwTableColumnPage( Window* pParent,
     FreeResource();
     SetExchangeSupport();
 
+    aDownBtn.SetAccessibleRelationMemberOf(&aColFL);
+    aUpBtn.SetAccessibleRelationMemberOf(&aColFL);
+
     pFieldArr[0] = &aMF1;
     pFieldArr[1] = &aMF2;
     pFieldArr[2] = &aMF3;
@@ -986,8 +991,16 @@ IMPL_LINK( SwTableColumnPage, AutoClickHdl, CheckBox *, pBox )
     for( sal_uInt16 i = 0; (i < nNoOfVisibleCols ) && ( i < MET_FIELDS); i++ )
     {
         String sEntry('~');
-        sEntry += String::CreateFromInt32( aValueTbl[i] + 1 );
+        String sIndex = String::CreateFromInt32( aValueTbl[i] + 1 );
+        sEntry += sIndex;
         pTextArr[i]->SetText( sEntry );
+//IAccessibility2 Impplementaton 2009-----
+        //added by menghu for SODC_5143,12/12/2006
+        String sColumnWidth = SW_RESSTR( STR_ACCESS_COLUMN_WIDTH);
+        sColumnWidth.SearchAndReplace( DEFINE_CONST_UNICODE("%1"), sIndex );
+        pFieldArr[i]->SetAccessibleName( sColumnWidth );
+        //end of SODC_5143
+//-----IAccessibility2 Impplementaton 2009
     }
 
     aDownBtn.Enable(aValueTbl[0] > 0);
@@ -1464,6 +1477,13 @@ SwTextFlowPage::SwTextFlowPage( Window* pParent,
 {
     FreeResource();
 
+    aPgBrkRB.SetAccessibleRelationMemberOf(&aPgBrkCB);
+    aColBrkRB.SetAccessibleRelationMemberOf(&aPgBrkCB);
+    aPgBrkBeforeRB.SetAccessibleRelationMemberOf(&aPgBrkCB);
+    aPgBrkAfterRB.SetAccessibleRelationMemberOf(&aPgBrkCB);
+    aPageCollLB.SetAccessibleRelationLabeledBy(&aPageCollCB);
+    aPageCollLB.SetAccessibleName(aPageCollCB.GetText());
+
     aPgBrkCB.SetClickHdl(LINK(this, SwTextFlowPage, PageBreakHdl_Impl));
     aPgBrkBeforeRB.SetClickHdl(
         LINK( this, SwTextFlowPage, PageBreakPosHdl_Impl ) );
diff --git a/sw/source/ui/table/tabledlg.hrc b/sw/source/ui/table/tabledlg.hrc
index 1640c623d9..395613dac4 100644
--- a/sw/source/ui/table/tabledlg.hrc
+++ b/sw/source/ui/table/tabledlg.hrc
@@ -108,3 +108,4 @@
 
 #define FT_VERTORIENT       150
 #define LB_VERTORIENT       151
+
diff --git a/sw/source/ui/table/tabledlg.src b/sw/source/ui/table/tabledlg.src
index b3d52ec516..8c33398ca9 100644
--- a/sw/source/ui/table/tabledlg.src
+++ b/sw/source/ui/table/tabledlg.src
@@ -786,4 +786,3 @@ InfoBox MSG_WRONG_TABLENAME
 {
     Message [ en-US ] = "The name of the table must not contain spaces." ;
 };
-
diff --git a/sw/source/ui/table/tablepg.hxx b/sw/source/ui/table/tablepg.hxx
index ea200094c6..a95e659fe0 100644
--- a/sw/source/ui/table/tablepg.hxx
+++ b/sw/source/ui/table/tablepg.hxx
@@ -121,7 +121,7 @@ class SwTableColumnPage : public SfxTabPage
     CheckBox		aProportionalCB;
     FixedText		aSpaceFT;
     MetricField		aSpaceED;
-
+     FixedLine        aColFL;
     ImageButton 	aUpBtn;
     FixedText		aFT1;
     PercentField	aMF1;
@@ -136,7 +136,6 @@ class SwTableColumnPage : public SfxTabPage
     FixedText		aFT6;
     PercentField	aMF6;
     ImageButton 	aDownBtn;
-    FixedLine        aColFL;
 
     SwTableRep*		pTblData;
     PercentField*	pFieldArr[MET_FIELDS];
diff --git a/sw/source/ui/table/tautofmt.cxx b/sw/source/ui/table/tautofmt.cxx
index e9665532f1..88854b9a88 100644
--- a/sw/source/ui/table/tautofmt.cxx
+++ b/sw/source/ui/table/tautofmt.cxx
@@ -184,13 +184,13 @@ SwAutoFormatDlg::SwAutoFormatDlg( Window* pParent, SwWrtShell* pWrtShell,
     //
     aFlFormat       ( this, SW_RES( FL_FORMAT ) ),
     aLbFormat		( this, SW_RES( LB_FORMAT ) ),
+    aFlFormats       ( this, SW_RES( FL_FORMATS ) ),
 
     aBtnNumFormat	( this, SW_RES( BTN_NUMFORMAT ) ),
     aBtnBorder		( this, SW_RES( BTN_BORDER ) ),
     aBtnFont		( this, SW_RES( BTN_FONT ) ),
     aBtnPattern 	( this, SW_RES( BTN_PATTERN ) ),
     aBtnAlignment	( this, SW_RES( BTN_ALIGNMENT ) ),
-    aFlFormats       ( this, SW_RES( FL_FORMATS ) ),
     aBtnOk			( this, SW_RES( BTN_OK ) ),
     aBtnCancel		( this, SW_RES( BTN_CANCEL ) ),
     aBtnHelp		( this, SW_RES( BTN_HELP ) ),