summaryrefslogtreecommitdiff
path: root/cui/source/tabpages
diff options
context:
space:
mode:
authorMalte Timmermann [mt] <malte.timmermann@oracle.com>2011-01-20 12:21:31 +0100
committerMalte Timmermann [mt] <malte.timmermann@oracle.com>2011-01-20 12:21:31 +0100
commit0c514ad4f653c63702b55a1e3c6f8e725a549079 (patch)
tree61e401c3feb763a3a28aefcbe0abce91b4edd1cc /cui/source/tabpages
parent5f153ecded340480ce432640f2e22e71f2ab15e7 (diff)
accfixes: added more accessibility information and fixed tab orders in multiple dialogs (cui module)
Diffstat (limited to 'cui/source/tabpages')
-rw-r--r--cui/source/tabpages/align.cxx4
-rw-r--r--cui/source/tabpages/autocdlg.cxx27
-rw-r--r--cui/source/tabpages/autocdlg.hrc12
-rw-r--r--cui/source/tabpages/autocdlg.src40
-rw-r--r--cui/source/tabpages/backgrnd.cxx35
-rw-r--r--cui/source/tabpages/connect.cxx3
-rw-r--r--cui/source/tabpages/grfpage.cxx2
-rw-r--r--cui/source/tabpages/measure.cxx4
-rw-r--r--cui/source/tabpages/numfmt.cxx21
-rw-r--r--cui/source/tabpages/numpages.cxx9
-rw-r--r--cui/source/tabpages/page.cxx6
-rw-r--r--cui/source/tabpages/paragrph.cxx22
-rw-r--r--cui/source/tabpages/paragrph.hrc4
-rw-r--r--cui/source/tabpages/paragrph.src43
-rw-r--r--cui/source/tabpages/tabarea.hrc4
-rw-r--r--cui/source/tabpages/tabarea.src62
-rw-r--r--cui/source/tabpages/tabline.hrc26
-rw-r--r--cui/source/tabpages/tabline.src52
-rw-r--r--cui/source/tabpages/tabstpge.cxx23
-rw-r--r--cui/source/tabpages/tabstpge.hrc3
-rw-r--r--cui/source/tabpages/tabstpge.src39
-rw-r--r--cui/source/tabpages/textanim.cxx18
-rw-r--r--cui/source/tabpages/textattr.cxx2
-rw-r--r--cui/source/tabpages/tparea.cxx20
-rw-r--r--cui/source/tabpages/tpbitmap.cxx11
-rw-r--r--cui/source/tabpages/tpcolor.cxx11
-rw-r--r--cui/source/tabpages/tpgradnt.cxx10
-rw-r--r--cui/source/tabpages/tphatch.cxx10
-rw-r--r--cui/source/tabpages/tpline.cxx21
-rw-r--r--cui/source/tabpages/tplnedef.cxx13
-rw-r--r--cui/source/tabpages/tplneend.cxx3
-rw-r--r--cui/source/tabpages/tpshadow.cxx4
-rw-r--r--cui/source/tabpages/transfrm.cxx9
33 files changed, 411 insertions, 162 deletions
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index 65d0cad3dfd1..9d1ab08c7c7d 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 05ec88e5aa7f..096613789012 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();
BOOL bShowSWOptions = 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 f9d2b9078824..f993e7a90036 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 ), FALSE ) ),
+ pPreviewWin1 ( new BackgroundPreviewImpl( this, CUI_RES( WIN_PREVIEW1 ), 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 ), 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 ( TRUE ),
bIsGraphicValid ( 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 2cc564c3c553..19e4db50ef1a 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 USHORT 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 6fb538a76947..4e0da47218bc 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 c370b5183ebd..01b99903f3d1 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 ( 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 15ac78e9975e..e0bd5171f6db 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 ), 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 5b2bb4474573..2510c678416b 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 e2ee5b11af8f..dc0f2c6f2fc1 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 ) ),
@@ -420,6 +419,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 0359ef595a87..1815c1c0bd70 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 e1e65404b1a2..66326a710f38 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 ), (USHORT)(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 cfff61fd5009..52cfb8378902 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 93330fbeb4dd..ca02fd3c4a74 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 774a58b4a34d..fdf912f0e2aa 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(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 9060b6fb013e..906c64954474 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 5152bd0e9478..88c90af0f0eb 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 1de256416b9d..bb81be3196c5 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( FALSE );
}
diff --git a/cui/source/tabpages/tphatch.cxx b/cui/source/tabpages/tphatch.cxx
index 4fa65d95221a..fc9fe25892b7 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 2fee90d5871b..682721d56b39 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 5f1b385e8137..f42d67fdee11 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 4949ce4da6fa..598d3c4c42af 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 3accd144efcc..c1283acada68 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 e42f85c811f1..c99fee2bb42f 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 );
}
// -----------------------------------------------------------------------