diff options
author | Armin Le Grand <alg@apache.org> | 2013-11-27 16:25:40 +0000 |
---|---|---|
committer | Armin Le Grand <alg@apache.org> | 2013-11-27 16:25:40 +0000 |
commit | 812e2a8bf64274e47db572b8ca592f49b1263ad7 (patch) | |
tree | 404f9a7432e94c42a09bb76b33eb7d38186ccff6 /sc/source/ui/miscdlgs | |
parent | 9818d8d1c64bd93adfaacb8a2f824a9db1f4987d (diff) |
resync to trunk (after accessibility integration)
Diffstat (limited to 'sc/source/ui/miscdlgs')
-rw-r--r-- | sc/source/ui/miscdlgs/highred.cxx | 4 | ||||
-rw-r--r-- | sc/source/ui/miscdlgs/solveroptions.cxx | 26 |
2 files changed, 29 insertions, 1 deletions
diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx index 564caec25d37..af135722b3a6 100644 --- a/sc/source/ui/miscdlgs/highred.cxx +++ b/sc/source/ui/miscdlgs/highred.cxx @@ -105,6 +105,7 @@ ScHighlightChgDlg::ScHighlightChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Wind Init(); + aFilterCtr.SetAccessibleRelationMemberOf(&aFlFilter); } ScHighlightChgDlg::~ScHighlightChgDlg() @@ -257,6 +258,9 @@ IMPL_LINK( ScHighlightChgDlg, RefHandle, SvxTPFilter*, pRef ) aEdAssign.Show(); aRbAssign.Show(); aEdAssign.SetText(aFilterCtr.GetRange()); + //IAccessibility2 Implementation 2009----- + aEdAssign.GrabFocus(); + //-----IAccessibility2 Implementation 2009 ScAnyRefDlg::RefInputStart(&aEdAssign,&aRbAssign); } return 0; diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx index 172fb0547c38..f572efa57cf4 100644 --- a/sc/source/ui/miscdlgs/solveroptions.cxx +++ b/sc/source/ui/miscdlgs/solveroptions.cxx @@ -84,10 +84,34 @@ public: void SetDoubleValue( double fNew ) { mbIsDouble = true; mfDoubleValue = fNew; } void SetIntValue( sal_Int32 nNew ) { mbIsDouble = false; mnIntValue = nNew; } - + //IAccessibility2 Implementation 2009----- +// MT: Commented out SV_ITEM_ID_EXTENDRLBOXSTRING and GetExtendText() in svlbitem.hxx - needed? +// virtual USHORT IsA() {return SV_ITEM_ID_EXTENDRLBOXSTRING;} +// virtual XubString GetExtendText() const; + //-----IAccessibility2 Implementation 2009 virtual void Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry ); }; +//IAccessibility2 Implementation 2009----- +// MT: Commented out SV_ITEM_ID_EXTENDRLBOXSTRING and GetExtendText() in svlbitem.hxx - needed? +/* +XubString ScSolverOptionsString::GetExtendText() const +{ + String aNormalStr( GetText() ); + aNormalStr.Append( (sal_Unicode) ':' ); + String sTxt( ' ' ); + if ( mbIsDouble ) + sTxt += (String)rtl::math::doubleToUString( mfDoubleValue, + rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max, + ScGlobal::GetpLocaleData()->getNumDecimalSep().GetChar(0), true ); + else + sTxt += String::CreateFromInt32( mnIntValue ); + aNormalStr.Append(sTxt); + return aNormalStr; +} +*/ +//-----IAccessibility2 Implementation 2009 + void ScSolverOptionsString::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16, SvLBoxEntry* /* pEntry */ ) { //! move position? (SvxLinguTabPage: aPos.X() += 20) |