From 38fe580341a3f1e379edada08db7e1aebab258f5 Mon Sep 17 00:00:00 2001 From: "Malte Timmermann [mt]" Date: Thu, 20 Jan 2011 16:34:26 +0100 Subject: accfixes: added more accessibility information and fixed tab orders in multiple dialogs (sc module) --- sc/source/ui/app/inputhdl.cxx | 7 ++++- sc/source/ui/app/inputwin.cxx | 1 + sc/source/ui/attrdlg/condfrmt.cxx | 30 +++++++++++++++++-- sc/source/ui/dbgui/dbnamdlg.cxx | 1 + sc/source/ui/dbgui/filtdlg.cxx | 59 +++++++++++++++++++++++++++++++++++++ sc/source/ui/dbgui/scendlg.cxx | 5 ++++ sc/source/ui/dbgui/scendlg.hrc | 3 ++ sc/source/ui/dbgui/scendlg.src | 4 +++ sc/source/ui/dbgui/scuiasciiopt.cxx | 3 ++ sc/source/ui/dbgui/sfiltdlg.cxx | 7 ++++- sc/source/ui/dbgui/tpsort.cxx | 7 +++++ sc/source/ui/dbgui/tpsubt.cxx | 3 ++ sc/source/ui/inc/areasdlg.hxx | 6 ++-- sc/source/ui/inc/condfrmt.hrc | 6 ++++ sc/source/ui/inc/condfrmt.hxx | 7 ++--- sc/source/ui/inc/filldlg.hxx | 19 ++++++------ sc/source/ui/inc/filtdlg.hxx | 2 +- sc/source/ui/inc/filter.hrc | 8 ++++- sc/source/ui/inc/instbdlg.hxx | 4 +-- sc/source/ui/inc/shtabdlg.hxx | 2 +- sc/source/ui/miscdlgs/crnrdlg.cxx | 3 ++ sc/source/ui/miscdlgs/filldlg.cxx | 18 ++++++----- sc/source/ui/miscdlgs/highred.cxx | 1 + sc/source/ui/miscdlgs/highred.src | 2 +- sc/source/ui/miscdlgs/instbdlg.cxx | 5 ++-- sc/source/ui/miscdlgs/linkarea.cxx | 3 ++ sc/source/ui/miscdlgs/optsolver.cxx | 13 ++++++++ sc/source/ui/miscdlgs/shtabdlg.cxx | 4 +-- sc/source/ui/miscdlgs/solvrdlg.cxx | 3 ++ sc/source/ui/namedlg/namedlg.cxx | 2 ++ sc/source/ui/navipi/navipi.cxx | 4 +++ sc/source/ui/pagedlg/areasdlg.cxx | 6 ++-- sc/source/ui/pagedlg/tphf.cxx | 2 ++ sc/source/ui/pagedlg/tptable.cxx | 3 ++ sc/source/ui/src/condfrmt.src | 49 ++++++++---------------------- sc/source/ui/src/filter.src | 20 +++++++++++++ sc/source/ui/src/scstring.src | 17 +++++++++++ 37 files changed, 259 insertions(+), 80 deletions(-) (limited to 'sc/source/ui') diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx index 55aa0986d2ec..520171954138 100644 --- a/sc/source/ui/app/inputhdl.cxx +++ b/sc/source/ui/app/inputhdl.cxx @@ -3443,8 +3443,13 @@ void ScInputHandler::NotifyChange( const ScInputHdlState* pState, else aCursorPos.Format( aPosStr, SCA_VALID | nFlags, pDoc, aAddrDetails ); } - + //IAccessibility2 Implementation 2009----- + // Disable the accessible VALUE_CHANGE event + BOOL IsSuppressed = pInputWin->IsAccessibilityEventsSuppressed(FALSE); + pInputWin->SetAccessibilityEventsSuppressed(TRUE); pInputWin->SetPosString(aPosStr); + pInputWin->SetAccessibilityEventsSuppressed(IsSuppressed); + //-----IAccessibility2 Implementation 2009 pInputWin->SetSumAssignMode(); } diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx index b028a0a153ce..cfd00a3ef098 100755 --- a/sc/source/ui/app/inputwin.cxx +++ b/sc/source/ui/app/inputwin.cxx @@ -223,6 +223,7 @@ ScInputWindow::ScInputWindow( Window* pParent, SfxBindings* pBind ) : pViewSh->UpdateInputHandler( TRUE ); // unbedingtes Update pImgMgr->RegisterToolBox( this ); + SetAccessibleName(ScResId(STR_ACC_TOOLBAR_FORMULA)); } __EXPORT ScInputWindow::~ScInputWindow() diff --git a/sc/source/ui/attrdlg/condfrmt.cxx b/sc/source/ui/attrdlg/condfrmt.cxx index 5e3b23af8afa..04076c956cbf 100644 --- a/sc/source/ui/attrdlg/condfrmt.cxx +++ b/sc/source/ui/attrdlg/condfrmt.cxx @@ -71,7 +71,6 @@ ScConditionalFormatDlg::ScConditionalFormatDlg( aFtCond1Template ( this, ScResId( FT_COND1_TEMPLATE ) ), aLbCond1Template ( this, ScResId( LB_COND1_TEMPLATE ) ), aBtnNew1 ( this, ScResId( BTN_COND1_NEW ) ), - aFlSep1 ( this, ScResId( FL_SEP1 ) ), aCbxCond2 ( this, ScResId( CBX_COND2 ) ), aLbCond21 ( this, ScResId( LB_COND2_1 ) ), @@ -84,7 +83,6 @@ ScConditionalFormatDlg::ScConditionalFormatDlg( aFtCond2Template ( this, ScResId( FT_COND2_TEMPLATE ) ), aLbCond2Template ( this, ScResId( LB_COND2_TEMPLATE ) ), aBtnNew2 ( this, ScResId( BTN_COND2_NEW ) ), - aFlSep2 ( this, ScResId( FL_SEP2 ) ), aCbxCond3 ( this, ScResId( CBX_COND3 ) ), aLbCond31 ( this, ScResId( LB_COND3_1 ) ), @@ -101,6 +99,8 @@ ScConditionalFormatDlg::ScConditionalFormatDlg( aBtnOk ( this, ScResId( BTN_OK ) ), aBtnCancel ( this, ScResId( BTN_CANCEL ) ), aBtnHelp ( this, ScResId( BTN_HELP ) ), + aFlSep2 ( this, ScResId( FL_SEP2 ) ), + aFlSep1 ( this, ScResId( FL_SEP1 ) ), pEdActive ( NULL ), bDlgLostFocus ( FALSE ), @@ -322,6 +322,32 @@ ScConditionalFormatDlg::ScConditionalFormatDlg( //@BugID 54702 Enablen/Disablen nur noch in Basisklasse //SFX_APPWINDOW->Enable(); // Ref-Feld hat Focus // SFX_APPWINDOW->Disable(); + + aLbCond11.SetAccessibleRelationLabeledBy( &aCbxCond1 ); + aLbCond12.SetAccessibleRelationLabeledBy( &aCbxCond1 ); + aEdtCond11.SetAccessibleRelationLabeledBy( &aCbxCond1 ); + aRbCond11.SetAccessibleRelationLabeledBy( &aCbxCond1 ); + + aLbCond21.SetAccessibleRelationLabeledBy( &aCbxCond2 ); + aLbCond22.SetAccessibleRelationLabeledBy( &aCbxCond2 ); + aEdtCond21.SetAccessibleRelationLabeledBy( &aCbxCond2 ); + aRbCond21.SetAccessibleRelationLabeledBy( &aCbxCond2 ); + + aLbCond31.SetAccessibleRelationLabeledBy( &aCbxCond3 ); + aLbCond32.SetAccessibleRelationLabeledBy( &aCbxCond3 ); + aEdtCond31.SetAccessibleRelationLabeledBy( &aCbxCond3 ); + aRbCond31.SetAccessibleRelationLabeledBy( &aCbxCond3 ); + aLbCond11.SetAccessibleName( ScResId(LABEL_FORMARTTING_CONDITIONS) ); + aLbCond12.SetAccessibleName( ScResId(LABEL_CONDITIONS) ); + aEdtCond11.SetAccessibleName( ScResId(LABEL_CONDITION_VALUE) ); + + aLbCond21.SetAccessibleName( ScResId(LABEL_FORMARTTING_CONDITIONS) ); + aLbCond22.SetAccessibleName( ScResId(LABEL_CONDITIONS) ); + aEdtCond21.SetAccessibleName( ScResId(LABEL_CONDITION_VALUE) ); + + aLbCond31.SetAccessibleName( ScResId(LABEL_FORMARTTING_CONDITIONS) ); + aLbCond32.SetAccessibleName( ScResId(LABEL_CONDITIONS) ); + aEdtCond31.SetAccessibleName( ScResId(LABEL_CONDITION_VALUE) ); } diff --git a/sc/source/ui/dbgui/dbnamdlg.cxx b/sc/source/ui/dbgui/dbnamdlg.cxx index a2f4d61af537..d20d29930e8c 100644 --- a/sc/source/ui/dbgui/dbnamdlg.cxx +++ b/sc/source/ui/dbgui/dbnamdlg.cxx @@ -185,6 +185,7 @@ ScDbNameDlg::ScDbNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, aBtnDoSize, aBtnKeepFmt, aBtnStripData, theCurArea ); Init(); FreeResource(); + aRbAssign.SetAccessibleRelationMemberOf(&aFlAssign); } diff --git a/sc/source/ui/dbgui/filtdlg.cxx b/sc/source/ui/dbgui/filtdlg.cxx index b5dd2f3242c2..dacc141aaed0 100644 --- a/sc/source/ui/dbgui/filtdlg.cxx +++ b/sc/source/ui/dbgui/filtdlg.cxx @@ -132,6 +132,65 @@ ScFilterDlg::ScFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, pTimer = new Timer; pTimer->SetTimeout( 50 ); // 50ms warten pTimer->SetTimeoutHdl( LINK( this, ScFilterDlg, TimeOutHdl ) ); + + String sAccName (ScResId(RID_FILTER_OPERATOR)); + String sIndexName(sAccName); + sIndexName.AppendAscii (RTL_CONSTASCII_STRINGPARAM (" 1")); + aLbConnect1.SetAccessibleName(sIndexName); + sIndexName = sAccName; + sIndexName.AppendAscii (RTL_CONSTASCII_STRINGPARAM (" 2")); + aLbConnect2.SetAccessibleName(sIndexName); + + sAccName = String(ScResId(RID_FILTER_FIELDNAME)); + sIndexName = sAccName; + sIndexName.AppendAscii (RTL_CONSTASCII_STRINGPARAM (" 1")); + aLbField1.SetAccessibleName(sIndexName); + sIndexName = sAccName; + sIndexName.AppendAscii (RTL_CONSTASCII_STRINGPARAM (" 2")); + aLbField2.SetAccessibleName(sIndexName); + sIndexName = sAccName; + sIndexName.AppendAscii (RTL_CONSTASCII_STRINGPARAM (" 3")); + aLbField3.SetAccessibleName(sIndexName); + + + sAccName = String(ScResId(RID_FILTER_CONDITION)); + sIndexName = sAccName; + sIndexName.AppendAscii (RTL_CONSTASCII_STRINGPARAM (" 1")); + aLbCond1.SetAccessibleName(sIndexName); + sIndexName = sAccName; + sIndexName.AppendAscii (RTL_CONSTASCII_STRINGPARAM (" 2")); + aLbCond2.SetAccessibleName(sIndexName); + sIndexName = sAccName; + sIndexName.AppendAscii (RTL_CONSTASCII_STRINGPARAM (" 3")); + aLbCond3.SetAccessibleName(sIndexName); + + sAccName = String(ScResId(RID_FILTER_VALUE)); + sIndexName = sAccName; + sIndexName.AppendAscii (RTL_CONSTASCII_STRINGPARAM (" 1")); + aEdVal1.SetAccessibleName(sIndexName); + sIndexName = sAccName; + sIndexName.AppendAscii (RTL_CONSTASCII_STRINGPARAM (" 2")); + aEdVal2.SetAccessibleName(sIndexName); + sIndexName = sAccName; + sIndexName.AppendAscii (RTL_CONSTASCII_STRINGPARAM (" 3")); + aEdVal3.SetAccessibleName(sIndexName); + + aLbCopyArea.SetAccessibleName(ScResId(STR_COPY_AREA_TO)); + aEdCopyArea.SetAccessibleName(ScResId(STR_COPY_AREA_TO)); + aLbCopyArea.SetAccessibleRelationLabeledBy(&aBtnCopyResult); + aEdCopyArea.SetAccessibleRelationLabeledBy(&aBtnCopyResult); + + aLbConnect1.SetAccessibleRelationLabeledBy(&aFtConnect); + aLbConnect2.SetAccessibleRelationLabeledBy(&aFtConnect); + aLbField1.SetAccessibleRelationLabeledBy(&aFtField); + aLbField2.SetAccessibleRelationLabeledBy(&aFtField); + aLbField3.SetAccessibleRelationLabeledBy(&aFtField); + aLbCond1.SetAccessibleRelationLabeledBy(&aFtCond); + aLbCond2.SetAccessibleRelationLabeledBy(&aFtCond); + aLbCond3.SetAccessibleRelationLabeledBy(&aFtCond); + aEdVal1.SetAccessibleRelationLabeledBy(&aFtVal); + aEdVal2.SetAccessibleRelationLabeledBy(&aFtVal); + aEdVal3.SetAccessibleRelationLabeledBy(&aFtVal); } diff --git a/sc/source/ui/dbgui/scendlg.cxx b/sc/source/ui/dbgui/scendlg.cxx index 96c9f120f5b1..37e1ddbc5580 100644 --- a/sc/source/ui/dbgui/scendlg.cxx +++ b/sc/source/ui/dbgui/scendlg.cxx @@ -117,6 +117,8 @@ ScNewScenarioDlg::ScNewScenarioDlg( Window* pParent, const String& rName, BOOL b aBtnOk .SetClickHdl( LINK( this, ScNewScenarioDlg, OkHdl ) ); aCbShowFrame.SetClickHdl( LINK( this, ScNewScenarioDlg, EnableHdl ) ); + aLbColor.SetAccessibleName(String(ScResId( STR_COLOR ) )); + FreeResource(); aLbColor.SelectEntry( Color( COL_LIGHTGRAY ) ); @@ -142,6 +144,9 @@ ScNewScenarioDlg::ScNewScenarioDlg( Window* pParent, const String& rName, BOOL b aCbAttrib.Enable(FALSE); aCbValue.Enable(FALSE); */ + + aEdComment.SetAccessibleRelationMemberOf(&aFlComment); + aLbColor.SetAccessibleRelationLabeledBy(&aCbShowFrame); } //------------------------------------------------------------------------ diff --git a/sc/source/ui/dbgui/scendlg.hrc b/sc/source/ui/dbgui/scendlg.hrc index 83818773bf5a..f7fa562a5b17 100644 --- a/sc/source/ui/dbgui/scendlg.hrc +++ b/sc/source/ui/dbgui/scendlg.hrc @@ -55,3 +55,6 @@ #define STR_CREATEDBY 31 #define STR_ON 32 #define STR_EDIT 33 +//IAccessibility2 Implementation 2009----- +#define STR_COLOR 34 +//-----IAccessibility2 Implementation 2009 diff --git a/sc/source/ui/dbgui/scendlg.src b/sc/source/ui/dbgui/scendlg.src index f7c3d29b8365..640fdda8bc30 100644 --- a/sc/source/ui/dbgui/scendlg.src +++ b/sc/source/ui/dbgui/scendlg.src @@ -147,6 +147,10 @@ ModalDialog RID_SCDLG_NEWSCENARIO { Text [ en-US ] = "on" ; }; + String STR_COLOR + { + Text [ en-US ] = "Display border in" ; + }; FixedLine FL_NAME { Pos = MAP_APPFONT ( 6 , 3 ) ; diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx index 42f2a2d86933..223557106267 100644 --- a/sc/source/ui/dbgui/scuiasciiopt.cxx +++ b/sc/source/ui/dbgui/scuiasciiopt.cxx @@ -410,6 +410,9 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,String aDatName, UpdateVertical(); maTableBox.Execute( CSVCMD_NEWCELLTEXTS ); + + aEdOther.SetAccessibleName(aCkbOther.GetText()); + aEdOther.SetAccessibleRelationLabeledBy(&aCkbOther); } diff --git a/sc/source/ui/dbgui/sfiltdlg.cxx b/sc/source/ui/dbgui/sfiltdlg.cxx index f70fbb094c92..df946873738f 100644 --- a/sc/source/ui/dbgui/sfiltdlg.cxx +++ b/sc/source/ui/dbgui/sfiltdlg.cxx @@ -70,8 +70,8 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Wi : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_SPEC_FILTER ), // - aLbFilterArea ( this, ScResId( LB_CRITERIA_AREA ) ), aFtFilterArea ( this, ScResId( FT_CRITERIA_AREA ) ), + aLbFilterArea ( this, ScResId( LB_CRITERIA_AREA ) ), aEdFilterArea ( this, this, ScResId( ED_CRITERIA_AREA ) ), aRbFilterArea ( this, ScResId( RB_CRITERIA_AREA ), &aEdFilterArea, this ), // @@ -103,6 +103,11 @@ ScSpecialFilterDlg::ScSpecialFilterDlg( SfxBindings* pB, SfxChildWindow* pCW, Wi pTimer->SetTimeout( 50 ); // 50ms warten pTimer->SetTimeoutHdl( LINK( this, ScSpecialFilterDlg, TimeOutHdl ) ); pTimer->Start(); + + aLbCopyArea.SetAccessibleName(aBtnCopyResult.GetText()); + aEdCopyArea.SetAccessibleName(aBtnCopyResult.GetText()); + aLbCopyArea.SetAccessibleRelationLabeledBy(&aBtnCopyResult); + aEdCopyArea.SetAccessibleRelationLabeledBy(&aBtnCopyResult); } diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx index 18c1eb25664a..4c4e8395186c 100644 --- a/sc/source/ui/dbgui/tpsort.cxx +++ b/sc/source/ui/dbgui/tpsort.cxx @@ -600,6 +600,13 @@ ScTabPageSortOptions::ScTabPageSortOptions( Window* pParent, Init(); FreeResource(); SetExchangeSupport(); + + aLbOutPos.SetAccessibleRelationLabeledBy(&aBtnCopyResult); + aLbOutPos.SetAccessibleName(aBtnCopyResult.GetText()); + aEdOutPos.SetAccessibleRelationLabeledBy(&aBtnCopyResult); + aEdOutPos.SetAccessibleName(aBtnCopyResult.GetText()); + aLbSortUser.SetAccessibleRelationLabeledBy(&aBtnSortUser); + aLbSortUser.SetAccessibleName(aBtnSortUser.GetText()); } // ----------------------------------------------------------------------- diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx index fbada165b55d..52b7918f12c1 100644 --- a/sc/source/ui/dbgui/tpsubt.cxx +++ b/sc/source/ui/dbgui/tpsubt.cxx @@ -523,6 +523,9 @@ ScTpSubTotalOptions::ScTpSubTotalOptions( Window* pParent, { Init(); FreeResource(); + + aLbUserDef.SetAccessibleRelationLabeledBy(&aBtnUserDef); + aLbUserDef.SetAccessibleName(aBtnUserDef.GetText()); } // ----------------------------------------------------------------------- diff --git a/sc/source/ui/inc/areasdlg.hxx b/sc/source/ui/inc/areasdlg.hxx index 08c6e3cf0a91..84616ec2a619 100644 --- a/sc/source/ui/inc/areasdlg.hxx +++ b/sc/source/ui/inc/areasdlg.hxx @@ -62,18 +62,18 @@ public: virtual BOOL Close(); private: - ListBox aLbPrintArea; FixedLine aFlPrintArea; + ListBox aLbPrintArea; formula::RefEdit aEdPrintArea; formula::RefButton aRbPrintArea; - ListBox aLbRepeatRow; FixedLine aFlRepeatRow; + ListBox aLbRepeatRow; formula::RefEdit aEdRepeatRow; formula::RefButton aRbRepeatRow; - ListBox aLbRepeatCol; FixedLine aFlRepeatCol; + ListBox aLbRepeatCol; formula::RefEdit aEdRepeatCol; formula::RefButton aRbRepeatCol; diff --git a/sc/source/ui/inc/condfrmt.hrc b/sc/source/ui/inc/condfrmt.hrc index 099d82b2fa85..773d57db0470 100644 --- a/sc/source/ui/inc/condfrmt.hrc +++ b/sc/source/ui/inc/condfrmt.hrc @@ -63,6 +63,12 @@ #define FL_SEP1 41 #define FL_SEP2 42 +//IAccessibility2 Implementation 2009----- +#define LABEL_FORMARTTING_CONDITIONS 43 +#define LABEL_CONDITIONS 44 +#define LABEL_CONDITION_VALUE 45 +//-----IAccessibility2 Implementation 2009 + #define BTN_OK 31 #define BTN_CANCEL 32 #define BTN_HELP 33 diff --git a/sc/source/ui/inc/condfrmt.hxx b/sc/source/ui/inc/condfrmt.hxx index ecd4c529d57a..f2025cb04536 100644 --- a/sc/source/ui/inc/condfrmt.hxx +++ b/sc/source/ui/inc/condfrmt.hxx @@ -69,8 +69,6 @@ private: FixedText aFtCond1Template; ListBox aLbCond1Template; PushButton aBtnNew1; - FixedLine aFlSep1; - CheckBox aCbxCond2; ListBox aLbCond21; ListBox aLbCond22; @@ -82,8 +80,6 @@ private: FixedText aFtCond2Template; ListBox aLbCond2Template; PushButton aBtnNew2; - FixedLine aFlSep2; - CheckBox aCbxCond3; ListBox aLbCond31; ListBox aLbCond32; @@ -123,7 +119,8 @@ private: Size aCond3Size1; Size aCond3Size2; Size aCond3Size3; - + FixedLine aFlSep2; + FixedLine aFlSep1; formula::RefEdit* pEdActive; BOOL bDlgLostFocus; ScDocument* pDoc; diff --git a/sc/source/ui/inc/filldlg.hxx b/sc/source/ui/inc/filldlg.hxx index 7f2fb046093c..8dca05e35962 100644 --- a/sc/source/ui/inc/filldlg.hxx +++ b/sc/source/ui/inc/filldlg.hxx @@ -79,6 +79,15 @@ public: void SetEdStartValEnabled(BOOL bFlag=FALSE); private: + FixedText aFtStartVal; + Edit aEdStartVal; + String aStartStrVal; + + FixedText aFtEndVal; + Edit aEdEndVal; + + FixedText aFtIncrement; + Edit aEdIncrement; FixedLine aFlDirection; RadioButton aBtnDown; RadioButton aBtnRight; @@ -98,17 +107,7 @@ private: RadioButton aBtnDayOfWeek; RadioButton aBtnMonth; RadioButton aBtnYear; - BOOL bStartValFlag; - FixedText aFtStartVal; - Edit aEdStartVal; - String aStartStrVal; - - FixedText aFtEndVal; - Edit aEdEndVal; - - FixedText aFtIncrement; - Edit aEdIncrement; OKButton aBtnOk; CancelButton aBtnCancel; diff --git a/sc/source/ui/inc/filtdlg.hxx b/sc/source/ui/inc/filtdlg.hxx index 31e0e3a5d4b1..3d95d94c2260 100644 --- a/sc/source/ui/inc/filtdlg.hxx +++ b/sc/source/ui/inc/filtdlg.hxx @@ -216,8 +216,8 @@ public: virtual BOOL Close(); private: - ListBox aLbFilterArea; FixedText aFtFilterArea; + ListBox aLbFilterArea; formula::RefEdit aEdFilterArea; formula::RefButton aRbFilterArea; diff --git a/sc/source/ui/inc/filter.hrc b/sc/source/ui/inc/filter.hrc index 508c5af9aab5..e6c2b80ceefe 100644 --- a/sc/source/ui/inc/filter.hrc +++ b/sc/source/ui/inc/filter.hrc @@ -79,4 +79,10 @@ #define LB_CRITERIA_AREA 51 #define ED_CRITERIA_AREA 52 #define RB_CRITERIA_AREA 53 - +//IAccessibility2 Implementation 2009----- +#define STR_COPY_AREA_TO 54 +#define RID_FILTER_OPERATOR 55 +#define RID_FILTER_FIELDNAME 56 +#define RID_FILTER_CONDITION 57 +#define RID_FILTER_VALUE 58 +//-----IAccessibility2 Implementation 2009 diff --git a/sc/source/ui/inc/instbdlg.hxx b/sc/source/ui/inc/instbdlg.hxx index 660d16b62cca..6c856f35877f 100644 --- a/sc/source/ui/inc/instbdlg.hxx +++ b/sc/source/ui/inc/instbdlg.hxx @@ -83,9 +83,10 @@ public: SCTAB GetTableCount() { return nTableCount;} private: + FixedLine aFlPos; RadioButton aBtnBefore; RadioButton aBtnBehind; - FixedLine aFlPos; + FixedLine aFlTable; RadioButton aBtnNew; RadioButton aBtnFromFile; FixedText aFtCount; @@ -96,7 +97,6 @@ private: ScExpandedFixedText aFtPath; PushButton aBtnBrowse; CheckBox aBtnLink; - FixedLine aFlTable; OKButton aBtnOk; CancelButton aBtnCancel; HelpButton aBtnHelp; diff --git a/sc/source/ui/inc/shtabdlg.hxx b/sc/source/ui/inc/shtabdlg.hxx index 00ebb8a7c480..99b2b49c2e91 100644 --- a/sc/source/ui/inc/shtabdlg.hxx +++ b/sc/source/ui/inc/shtabdlg.hxx @@ -44,11 +44,11 @@ class ScShowTabDlg : public ModalDialog { private: + FixedText aFtLbTitle; ::svtools::ToolTipMultiListBox aLb; OKButton aBtnOk; CancelButton aBtnCancel; HelpButton aBtnHelp; - FixedText aFtLbTitle; DECL_LINK( DblClkHdl, void * ); diff --git a/sc/source/ui/miscdlgs/crnrdlg.cxx b/sc/source/ui/miscdlgs/crnrdlg.cxx index 0ad2a2e80ca4..4cf31d02ea11 100644 --- a/sc/source/ui/miscdlgs/crnrdlg.cxx +++ b/sc/source/ui/miscdlgs/crnrdlg.cxx @@ -114,6 +114,9 @@ ScColRowNameRangesDlg::ScColRowNameRangesDlg( SfxBindings* pB, xRowNameRanges = pDoc->GetRowNameRanges()->Clone(); Init(); FreeResource(); + + aRbAssign.SetAccessibleRelationMemberOf(&aEdAssign); + aRbAssign2.SetAccessibleRelationMemberOf(&aEdAssign); } diff --git a/sc/source/ui/miscdlgs/filldlg.cxx b/sc/source/ui/miscdlgs/filldlg.cxx index 2b247f0f9a07..dd3a8789790b 100644 --- a/sc/source/ui/miscdlgs/filldlg.cxx +++ b/sc/source/ui/miscdlgs/filldlg.cxx @@ -65,6 +65,16 @@ ScFillSeriesDlg::ScFillSeriesDlg( Window* pParent, : ModalDialog ( pParent, ScResId( RID_SCDLG_FILLSERIES ) ), + aFtStartVal ( this, ScResId( FT_START_VALUE ) ), + aEdStartVal ( this, ScResId( ED_START_VALUES ) ), + aStartStrVal ( aStartStr), + + aFtEndVal ( this, ScResId( FT_END_VALUE ) ), + aEdEndVal ( this, ScResId( ED_END_VALUES ) ), + + aFtIncrement ( this, ScResId( FT_INCREMENT ) ), + aEdIncrement ( this, ScResId( ED_INCREMENT ) ), + aFlDirection ( this, ScResId( FL_DIRECTION ) ), aBtnDown ( this, ScResId( BTN_BOTTOM ) ), aBtnRight ( this, ScResId( BTN_RIGHT ) ), @@ -83,14 +93,6 @@ ScFillSeriesDlg::ScFillSeriesDlg( Window* pParent, aBtnMonth ( this, ScResId( BTN_MONTH ) ), aBtnYear ( this, ScResId( BTN_YEAR ) ), - aFtStartVal ( this, ScResId( FT_START_VALUE ) ), - aEdStartVal ( this, ScResId( ED_START_VALUES ) ), - aStartStrVal ( aStartStr), - aFtEndVal ( this, ScResId( FT_END_VALUE ) ), - aEdEndVal ( this, ScResId( ED_END_VALUES ) ), - aFtIncrement ( this, ScResId( FT_INCREMENT ) ), - aEdIncrement ( this, ScResId( ED_INCREMENT ) ), - aBtnOk ( this, ScResId( BTN_OK ) ), aBtnCancel ( this, ScResId( BTN_CANCEL ) ), aBtnHelp ( this, ScResId( BTN_HELP ) ), diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx index dce755c10db3..8b0e5ac0dd8f 100644 --- a/sc/source/ui/miscdlgs/highred.cxx +++ b/sc/source/ui/miscdlgs/highred.cxx @@ -109,6 +109,7 @@ ScHighlightChgDlg::ScHighlightChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Wind Init(); + aFilterCtr.SetMemberOf(&aFlFilter); } ScHighlightChgDlg::~ScHighlightChgDlg() { diff --git a/sc/source/ui/miscdlgs/highred.src b/sc/source/ui/miscdlgs/highred.src index dd32eb9b4012..3fa4a62fcd17 100644 --- a/sc/source/ui/miscdlgs/highred.src +++ b/sc/source/ui/miscdlgs/highred.src @@ -100,7 +100,7 @@ ModelessDialog RID_SCDLG_HIGHLIGHT_CHANGES Hide = TRUE ; Pos = MAP_APPFONT ( 142 , 118 ) ; Size = MAP_APPFONT ( 13 , 15 ) ; - TabStop = FALSE ; + TabStop = TRUE; QuickHelpText [ en-US ] = "Minimize/Maximize" ; }; Text [ en-US ] = "Show Changes" ; diff --git a/sc/source/ui/miscdlgs/instbdlg.cxx b/sc/source/ui/miscdlgs/instbdlg.cxx index 06d4f23389c0..4c29c3b39c83 100644 --- a/sc/source/ui/miscdlgs/instbdlg.cxx +++ b/sc/source/ui/miscdlgs/instbdlg.cxx @@ -69,9 +69,10 @@ ScInsertTableDlg::ScInsertTableDlg( Window* pParent, ScViewData& rData, SCTAB nT : ModalDialog ( pParent, ScResId( RID_SCDLG_INSERT_TABLE ) ), // + aFlPos ( this, ScResId( FL_POSITION ) ), aBtnBefore ( this, ScResId( RB_BEFORE ) ), aBtnBehind ( this, ScResId( RB_BEHIND ) ), - aFlPos ( this, ScResId( FL_POSITION ) ), + aFlTable ( this, ScResId( FL_TABLE ) ), aBtnNew ( this, ScResId( RB_NEW ) ), aBtnFromFile ( this, ScResId( RB_FROMFILE ) ), aFtCount ( this, ScResId( FT_COUNT ) ), @@ -82,7 +83,6 @@ ScInsertTableDlg::ScInsertTableDlg( Window* pParent, ScViewData& rData, SCTAB nT aFtPath ( this, ScResId( FT_PATH ) ), aBtnBrowse ( this, ScResId( BTN_BROWSE ) ), aBtnLink ( this, ScResId( CB_LINK ) ), - aFlTable ( this, ScResId( FL_TABLE ) ), aBtnOk ( this, ScResId( BTN_OK ) ), aBtnCancel ( this, ScResId( BTN_CANCEL ) ), aBtnHelp ( this, ScResId( BTN_HELP ) ), @@ -100,6 +100,7 @@ ScInsertTableDlg::ScInsertTableDlg( Window* pParent, ScViewData& rData, SCTAB nT #endif /* ENABLE_LAYOUT */ Init_Impl( bFromFile ); FreeResource(); + aLbTables.SetAccessibleName(aBtnFromFile.GetText()); } //------------------------------------------------------------------------ diff --git a/sc/source/ui/miscdlgs/linkarea.cxx b/sc/source/ui/miscdlgs/linkarea.cxx index 48e33622e99f..8c219719ad6d 100644 --- a/sc/source/ui/miscdlgs/linkarea.cxx +++ b/sc/source/ui/miscdlgs/linkarea.cxx @@ -82,6 +82,9 @@ ScLinkedAreaDlg::ScLinkedAreaDlg( Window* pParent ) : aLbRanges.SetSelectHdl( LINK( this, ScLinkedAreaDlg, RangeHdl ) ); aBtnReload.SetClickHdl( LINK( this, ScLinkedAreaDlg, ReloadHdl ) ); UpdateEnable(); + + aNfDelay.SetAccessibleName(aBtnReload.GetText()); + aNfDelay.SetAccessibleRelationLabeledBy(&aBtnReload); } ScLinkedAreaDlg::~ScLinkedAreaDlg() diff --git a/sc/source/ui/miscdlgs/optsolver.cxx b/sc/source/ui/miscdlgs/optsolver.cxx index 37759aef81b5..5aa4912e9938 100644 --- a/sc/source/ui/miscdlgs/optsolver.cxx +++ b/sc/source/ui/miscdlgs/optsolver.cxx @@ -269,6 +269,19 @@ ScOptSolverDlg::ScOptSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pP mpOperator[3] = &maLbOp4; mpDelButton[3] = &maBtnDel4; + maRbMax.SetAccessibleRelationMemberOf(&maFtDirection); + maRbMin.SetAccessibleRelationMemberOf(&maFtDirection); + maRbValue.SetAccessibleRelationMemberOf(&maFtDirection); + maEdLeft2.SetAccessibleName(maFtCellRef.GetText()); + maLbOp2.SetAccessibleName(maFtOperator.GetText()); + maEdRight2.SetAccessibleName(maFtConstraint.GetText()); + maEdLeft3.SetAccessibleName(maFtCellRef.GetText()); + maLbOp3.SetAccessibleName(maFtOperator.GetText()); + maEdRight3.SetAccessibleName(maFtConstraint.GetText()); + maEdLeft4.SetAccessibleName(maFtCellRef.GetText()); + maLbOp4.SetAccessibleName(maFtOperator.GetText()); + maEdRight4.SetAccessibleName(maFtConstraint.GetText()); + Init( aCursorPos ); FreeResource(); } diff --git a/sc/source/ui/miscdlgs/shtabdlg.cxx b/sc/source/ui/miscdlgs/shtabdlg.cxx index 99f3ba5ad444..a629ee064310 100644 --- a/sc/source/ui/miscdlgs/shtabdlg.cxx +++ b/sc/source/ui/miscdlgs/shtabdlg.cxx @@ -45,11 +45,11 @@ ScShowTabDlg::ScShowTabDlg( Window* pParent ) : ModalDialog ( pParent, ScResId( RID_SCDLG_SHOW_TAB ) ), + aFtLbTitle ( this, ScResId( FT_LABEL ) ), aLb ( this, ScResId( LB_ENTRYLIST ) ), aBtnOk ( this, ScResId( BTN_OK ) ), aBtnCancel ( this, ScResId( BTN_CANCEL ) ), - aBtnHelp ( this, ScResId( BTN_HELP ) ), - aFtLbTitle ( this, ScResId( FT_LABEL ) ) + aBtnHelp ( this, ScResId( BTN_HELP ) ) { aLb.Clear(); aLb.SetDoubleClickHdl( LINK( this, ScShowTabDlg, DblClkHdl ) ); diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxx index 5b41592e8457..1a0e8c14da3d 100644 --- a/sc/source/ui/miscdlgs/solvrdlg.cxx +++ b/sc/source/ui/miscdlgs/solvrdlg.cxx @@ -88,6 +88,9 @@ ScSolverDlg::ScSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, { Init(); FreeResource(); + + aRBFormulaCell.SetAccessibleRelationMemberOf(&aFlVariables); + aRBVariableCell.SetAccessibleRelationMemberOf(&aFlVariables); } //---------------------------------------------------------------------------- diff --git a/sc/source/ui/namedlg/namedlg.cxx b/sc/source/ui/namedlg/namedlg.cxx index bc79fa7c65e7..97758d7165ae 100644 --- a/sc/source/ui/namedlg/namedlg.cxx +++ b/sc/source/ui/namedlg/namedlg.cxx @@ -154,6 +154,8 @@ ScNameDlg::ScNameDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent, pSaveObj = new SaveData; Init(); FreeResource(); + + aRbAssign.SetAccessibleRelationMemberOf(&aFlAssign); } diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx index 846e2ce53310..c16c2b79a909 100644 --- a/sc/source/ui/navipi/navipi.cxx +++ b/sc/source/ui/navipi/navipi.cxx @@ -767,6 +767,10 @@ ScNavigatorDlg::ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, Win aContentTimer.SetTimeout( SC_CONTENT_TIMEOUT ); FreeResource(); + + aLbEntries.SetAccessibleRelationLabeledBy(&aLbEntries); + aTbxCmd.SetAccessibleRelationLabeledBy(&aTbxCmd); + aLbDocuments.SetAccessibleName(aStrActiveWin); } //------------------------------------------------------------------------ diff --git a/sc/source/ui/pagedlg/areasdlg.cxx b/sc/source/ui/pagedlg/areasdlg.cxx index 915355d5d0f2..ab5bcdd684a0 100644 --- a/sc/source/ui/pagedlg/areasdlg.cxx +++ b/sc/source/ui/pagedlg/areasdlg.cxx @@ -112,18 +112,18 @@ static void printAddressFlags(USHORT nFlag) ScPrintAreasDlg::ScPrintAreasDlg( SfxBindings* pB, SfxChildWindow* pCW, Window* pParent ) : ScAnyRefDlg ( pB, pCW, pParent, RID_SCDLG_AREAS), // - aLbPrintArea ( this, ScResId( LB_PRINTAREA ) ), aFlPrintArea ( this, ScResId( FL_PRINTAREA ) ), + aLbPrintArea ( this, ScResId( LB_PRINTAREA ) ), aEdPrintArea ( this, this, ScResId( ED_PRINTAREA ) ), aRbPrintArea ( this, ScResId( RB_PRINTAREA ), &aEdPrintArea, this ), // - aLbRepeatRow ( this, ScResId( LB_REPEATROW ) ), aFlRepeatRow ( this, ScResId( FL_REPEATROW ) ), + aLbRepeatRow ( this, ScResId( LB_REPEATROW ) ), aEdRepeatRow ( this, this, ScResId( ED_REPEATROW ) ), aRbRepeatRow ( this, ScResId( RB_REPEATROW ), &aEdRepeatRow, this ), // - aLbRepeatCol ( this, ScResId( LB_REPEATCOL ) ), aFlRepeatCol ( this, ScResId( FL_REPEATCOL ) ), + aLbRepeatCol ( this, ScResId( LB_REPEATCOL ) ), aEdRepeatCol ( this, this, ScResId( ED_REPEATCOL ) ), aRbRepeatCol ( this, ScResId( RB_REPEATCOL ), &aEdRepeatCol, this ), // diff --git a/sc/source/ui/pagedlg/tphf.cxx b/sc/source/ui/pagedlg/tphf.cxx index de647cf5f82a..294638ef9d6a 100644 --- a/sc/source/ui/pagedlg/tphf.cxx +++ b/sc/source/ui/pagedlg/tphf.cxx @@ -101,6 +101,8 @@ ScHFPage::ScHFPage( Window* pParent, USHORT nResId, aBtnEdit.SetHelpId( HID_SC_HEADER_EDIT ); else aBtnEdit.SetHelpId( HID_SC_FOOTER_EDIT ); + + aBtnEdit.SetAccessibleRelationMemberOf(&aFrm); } //------------------------------------------------------------------ diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx index a2b732464e12..169480b789ec 100644 --- a/sc/source/ui/pagedlg/tptable.cxx +++ b/sc/source/ui/pagedlg/tptable.cxx @@ -162,6 +162,9 @@ ScTablePage::ScTablePage( Window* pParent, const SfxItemSet& rCoreAttrs ) : aBmpPageDir.SetOutputSizePixel( aBmpSize ); FreeResource(); + + aEdPageNo.SetAccessibleName(aBtnPageNo.GetText()); + aEdPageNo.SetAccessibleRelationLabeledBy(&aBtnPageNo); } // ----------------------------------------------------------------------- diff --git a/sc/source/ui/src/condfrmt.src b/sc/source/ui/src/condfrmt.src index 4cd79a2ffc3d..4adc735a7f2d 100644 --- a/sc/source/ui/src/condfrmt.src +++ b/sc/source/ui/src/condfrmt.src @@ -385,41 +385,16 @@ ModelessDialog RID_SCDLG_CONDFORMAT Text [ en-US ] = "Conditional Formatting" ; }; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +String LABEL_FORMARTTING_CONDITIONS +{ + Text [ en-US ] = "Formatting Conditions" ; +}; +String LABEL_CONDITIONS +{ + Text [ en-US ] = "Conditions" ; +}; +String LABEL_CONDITION_VALUE +{ + Text [ en-US ] = "Condition Value" ; +}; diff --git a/sc/source/ui/src/filter.src b/sc/source/ui/src/filter.src index eed896330b0e..ed501b782a8d 100644 --- a/sc/source/ui/src/filter.src +++ b/sc/source/ui/src/filter.src @@ -872,3 +872,23 @@ ModalDialog RID_SCDLG_PIVOTFILTER }; }; +String STR_COPY_AREA_TO +{ + Text [ en-US ] = "Copy results to" ; +}; +String RID_FILTER_OPERATOR +{ + Text [ en-US ] = "Operator" ; +}; +String RID_FILTER_FIELDNAME +{ + Text [ en-US ] = "Field Name" ; +}; +String RID_FILTER_CONDITION +{ + Text [ en-US ] = "Condition" ; +}; +String RID_FILTER_VALUE +{ + Text [ en-US ] = "Value" ; +}; diff --git a/sc/source/ui/src/scstring.src b/sc/source/ui/src/scstring.src index 9c47a42239cc..2921f5242813 100644 --- a/sc/source/ui/src/scstring.src +++ b/sc/source/ui/src/scstring.src @@ -733,6 +733,23 @@ String RID_SCSTR_ONCLICK Text [ en-US ] = "Mouse button pressed"; }; +String STR_ACC_TOOLBAR_FORMULA +{ + Text [ en-US ] = "Formula Tool Bar"; +}; +String STR_ACC_DOC_SPREADSHEET +{ + Text [ en-US ] = "%PRODUCTNAME Spreadsheets"; +}; +String STR_ACC_DOC_SPREADSHEET_READONLY +{ + Text [ en-US ] = "(read-only)"; +}; +String STR_ACC_DOC_PREVIEW_SUFFIX +{ + Text [ en-US ] = "(Preview mode)"; +}; + String SCSTR_MOREBTN_MOREOPTIONS { Text [ en-US ] = "More ~Options"; -- cgit v1.2.3 From 8483bc84fca8055630cc91bced28407d5fb5aaa6 Mon Sep 17 00:00:00 2001 From: "Malte Timmermann [mt]" Date: Fri, 21 Jan 2011 17:07:29 +0100 Subject: accfixes: global resources need id greater 256 --- sc/inc/sc.hrc | 5 +++++ sc/source/ui/inc/condfrmt.hrc | 6 +++--- sc/source/ui/inc/filter.hrc | 11 ++++++----- 3 files changed, 14 insertions(+), 8 deletions(-) (limited to 'sc/source/ui') diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc index 382f106562c8..aa1bb83ea599 100644 --- a/sc/inc/sc.hrc +++ b/sc/inc/sc.hrc @@ -993,8 +993,13 @@ #define STR_ACC_DATAPILOT_COL_DESCR (STR_START + 179) #define STR_ACC_DATAPILOT_DATA_DESCR (STR_START + 180) #define STR_ACC_DATAPILOT_SEL_DESCR (STR_START + 181) + //IAccessibility2 Implementation 2009----- #define STR_ACC_TOOLBAR_FORMULA (STR_START + 182) +#define STR_ACC_DOC_SPREADSHEET (STR_START + 185) +#define STR_ACC_DOC_PREVIEW_SUFFIX (STR_START + 186) +#define STR_ACC_DOC_SPREADSHEET_READONLY (STR_START + 187) + //-----IAccessibility2 Implementation 2009 // -------------------------------------------------- diff --git a/sc/source/ui/inc/condfrmt.hrc b/sc/source/ui/inc/condfrmt.hrc index 773d57db0470..06af0cd485ce 100644 --- a/sc/source/ui/inc/condfrmt.hrc +++ b/sc/source/ui/inc/condfrmt.hrc @@ -64,9 +64,9 @@ #define FL_SEP2 42 //IAccessibility2 Implementation 2009----- -#define LABEL_FORMARTTING_CONDITIONS 43 -#define LABEL_CONDITIONS 44 -#define LABEL_CONDITION_VALUE 45 +#define LABEL_FORMARTTING_CONDITIONS 5043 +#define LABEL_CONDITIONS 5044 +#define LABEL_CONDITION_VALUE 5045 //-----IAccessibility2 Implementation 2009 #define BTN_OK 31 diff --git a/sc/source/ui/inc/filter.hrc b/sc/source/ui/inc/filter.hrc index e6c2b80ceefe..f62c4d5e015e 100644 --- a/sc/source/ui/inc/filter.hrc +++ b/sc/source/ui/inc/filter.hrc @@ -79,10 +79,11 @@ #define LB_CRITERIA_AREA 51 #define ED_CRITERIA_AREA 52 #define RB_CRITERIA_AREA 53 + //IAccessibility2 Implementation 2009----- -#define STR_COPY_AREA_TO 54 -#define RID_FILTER_OPERATOR 55 -#define RID_FILTER_FIELDNAME 56 -#define RID_FILTER_CONDITION 57 -#define RID_FILTER_VALUE 58 +#define STR_COPY_AREA_TO 5054 +#define RID_FILTER_OPERATOR 5055 +#define RID_FILTER_FIELDNAME 5056 +#define RID_FILTER_CONDITION 5057 +#define RID_FILTER_VALUE 5058 //-----IAccessibility2 Implementation 2009 -- cgit v1.2.3 From c9fa5def7645d8dbea676bc88c086e0b493337e5 Mon Sep 17 00:00:00 2001 From: "Malte Timmermann [mt]" Date: Fri, 21 Jan 2011 17:34:45 +0100 Subject: accfixes: reverted one change in sc --- sc/source/ui/miscdlgs/highred.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sc/source/ui') diff --git a/sc/source/ui/miscdlgs/highred.cxx b/sc/source/ui/miscdlgs/highred.cxx index 8b0e5ac0dd8f..0f7e3ba1485e 100644 --- a/sc/source/ui/miscdlgs/highred.cxx +++ b/sc/source/ui/miscdlgs/highred.cxx @@ -109,8 +109,8 @@ ScHighlightChgDlg::ScHighlightChgDlg( SfxBindings* pB, SfxChildWindow* pCW, Wind Init(); - aFilterCtr.SetMemberOf(&aFlFilter); } + ScHighlightChgDlg::~ScHighlightChgDlg() { SetDispatcherLock( FALSE ); -- cgit v1.2.3 From d8624c7d123e2ced21e8ddcd6bcee92b6aa10a14 Mon Sep 17 00:00:00 2001 From: "Daniel Rentz [dr]" Date: Mon, 24 Jan 2011 15:30:24 +0100 Subject: dr79: #i5759# extend pivot layout dialog: support for unlimited number of fields in all areas --- sc/inc/dpglobal.hxx | 2 - sc/inc/dpobject.hxx | 12 +- sc/inc/global.hxx | 4 - sc/inc/pivot.hxx | 120 +- sc/inc/scabstdlg.hxx | 8 +- sc/source/core/data/dpobject.cxx | 146 +- sc/source/core/data/global2.cxx | 176 +- sc/source/core/data/makefile.mk | 1 + sc/source/core/data/pivot2.cxx | 55 +- .../Accessibility/AccessibleDataPilotControl.cxx | 130 +- sc/source/ui/attrdlg/scdlgfact.cxx | 6 +- sc/source/ui/attrdlg/scdlgfact.hxx | 6 +- sc/source/ui/dbgui/fieldwnd.cxx | 1231 +++++++----- sc/source/ui/dbgui/pivot.hrc | 7 +- sc/source/ui/dbgui/pivot.src | 11 - sc/source/ui/dbgui/pvfundlg.cxx | 12 +- sc/source/ui/dbgui/pvglob.hxx | 42 - sc/source/ui/dbgui/pvlaydlg.cxx | 2081 ++++++-------------- sc/source/ui/inc/AccessibleDataPilotControl.hxx | 6 +- sc/source/ui/inc/fieldwnd.hxx | 358 ++-- sc/source/ui/inc/pvfundlg.hxx | 22 +- sc/source/ui/inc/pvlaydlg.hxx | 283 +-- sc/source/ui/view/gridwin2.cxx | 4 +- sc/source/ui/view/tabvwshc.cxx | 2 +- 24 files changed, 1860 insertions(+), 2865 deletions(-) mode change 100755 => 100644 sc/inc/dpglobal.hxx mode change 100755 => 100644 sc/source/core/data/makefile.mk delete mode 100644 sc/source/ui/dbgui/pvglob.hxx mode change 100755 => 100644 sc/source/ui/inc/fieldwnd.hxx (limited to 'sc/source/ui') diff --git a/sc/inc/dpglobal.hxx b/sc/inc/dpglobal.hxx old mode 100755 new mode 100644 index 7de5947cc969..1f850ae40cec --- a/sc/inc/dpglobal.hxx +++ b/sc/inc/dpglobal.hxx @@ -62,8 +62,6 @@ // moved from fieldwnd.hxx, see also SC_DAPI_MAXFIELDS #define MAX_LABELS 256 -#define MAX_PAGEFIELDS 10 // maximum count of fields for page area - #define PIVOT_MAXFUNC 11 #define PIVOT_FUNC_NONE 0x0000 #define PIVOT_FUNC_SUM 0x0001 diff --git a/sc/inc/dpobject.hxx b/sc/inc/dpobject.hxx index e1b88919dad6..e42c0eefc3e7 100644 --- a/sc/inc/dpobject.hxx +++ b/sc/inc/dpobject.hxx @@ -208,7 +208,7 @@ public: void ToggleDetails(const ::com::sun::star::sheet::DataPilotTableHeaderData& rElemDesc, ScDPObject* pDestObj); - BOOL FillOldParam(ScPivotParam& rParam, BOOL bForFile) const; + BOOL FillOldParam(ScPivotParam& rParam) const; BOOL FillLabelData(ScPivotParam& rParam); void InitFromOldPivot(const ScPivot& rOld, ScDocument* pDoc, BOOL bSetSource); @@ -251,14 +251,14 @@ public: CreateSource( const ScDPServiceDesc& rDesc ); static void ConvertOrientation( ScDPSaveData& rSaveData, - PivotField* pFields, SCSIZE nCount, USHORT nOrient, + const ScPivotFieldVector& rFields, USHORT nOrient, ScDocument* pDoc, SCROW nRow, SCTAB nTab, const com::sun::star::uno::Reference< com::sun::star::sheet::XDimensionsSupplier>& xSource, - BOOL bOldDefaults, - PivotField* pRefColFields = NULL, SCSIZE nRefColCount = 0, - PivotField* pRefRowFields = NULL, SCSIZE nRefRowCount = 0, - PivotField* pRefPageFields = NULL, SCSIZE nRefPageCount = 0 ); + bool bOldDefaults, + const ScPivotFieldVector* pRefColFields = 0, + const ScPivotFieldVector* pRefRowFields = 0, + const ScPivotFieldVector* pRefPageFields = 0 ); static bool IsOrientationAllowed( USHORT nOrient, sal_Int32 nDimFlags ); }; diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx index 8178eb4a01d2..d259b39a6f71 100644 --- a/sc/inc/global.hxx +++ b/sc/inc/global.hxx @@ -118,13 +118,9 @@ const sal_Unicode CHAR_ZWNBSP = 0x2060; #ifdef SC_ROWLIMIT_TYPECONVERSION_NOCONVPASS const size_t MAXSUBTOTAL = 3; const size_t MAXQUERY = 8; -const size_t PIVOT_MAXFIELD = 8; -const size_t PIVOT_MAXPAGEFIELD = 10; #else const SCSIZE MAXSUBTOTAL = 3; const SCSIZE MAXQUERY = 8; -const SCSIZE PIVOT_MAXFIELD = 8; -const SCSIZE PIVOT_MAXPAGEFIELD = 10; #endif #define SC_START_INDEX_DB_COLL 50000 diff --git a/sc/inc/pivot.hxx b/sc/inc/pivot.hxx index 489f272bc8ba..0c60c7608d91 100644 --- a/sc/inc/pivot.hxx +++ b/sc/inc/pivot.hxx @@ -68,77 +68,14 @@ class SvStream; class ScDocument; class ScUserListData; class ScProgress; -struct ScDPLabelData; -typedef ::boost::shared_ptr ScDPLabelDataRef; - -// ----------------------------------------------------------------------- - -struct PivotField -{ - SCsCOL nCol; - USHORT nFuncMask; - USHORT nFuncCount; - ::com::sun::star::sheet::DataPilotFieldReference maFieldRef; - - explicit PivotField( SCsCOL nNewCol = 0, USHORT nNewFuncMask = PIVOT_FUNC_NONE ); - - bool operator==( const PivotField& r ) const; -}; - -// ----------------------------------------------------------------------- - -// implementation still in global2.cxx -struct ScPivotParam -{ - SCCOL nCol; // Cursor Position / - SCROW nRow; // bzw. Anfang des Zielbereiches - SCTAB nTab; - ::std::vector maLabelArray; - PivotField aPageArr[PIVOT_MAXPAGEFIELD]; - PivotField aColArr[PIVOT_MAXFIELD]; - PivotField aRowArr[PIVOT_MAXFIELD]; - PivotField aDataArr[PIVOT_MAXFIELD]; - SCSIZE nPageCount; - SCSIZE nColCount; - SCSIZE nRowCount; - SCSIZE nDataCount; - BOOL bIgnoreEmptyRows; - BOOL bDetectCategories; - BOOL bMakeTotalCol; - BOOL bMakeTotalRow; - - ScPivotParam(); - ScPivotParam( const ScPivotParam& r ); - ~ScPivotParam(); - - ScPivotParam& operator= ( const ScPivotParam& r ); - BOOL operator== ( const ScPivotParam& r ) const; -//UNUSED2009-05 void Clear (); - void ClearPivotArrays(); - void SetLabelData (const ::std::vector& r); - void SetPivotArrays ( const PivotField* pPageArr, - const PivotField* pColArr, - const PivotField* pRowArr, - const PivotField* pDataArr, - SCSIZE nPageCnt, - SCSIZE nColCnt, - SCSIZE nRowCnt, - SCSIZE nDataCnt ); -}; - -// ----------------------------------------------------------------------- - -typedef PivotField PivotFieldArr[PIVOT_MAXFIELD]; -typedef PivotField PivotPageFieldArr[PIVOT_MAXPAGEFIELD]; - -//------------------------------------------------------------------------ +// ============================================================================ struct ScDPLabelData { ::rtl::OUString maName; /// Original name of the dimension. ::rtl::OUString maLayoutName; /// Layout name (display name) - SCsCOL mnCol; + SCCOL mnCol; USHORT mnFuncMask; /// Page/Column/Row subtotal function. sal_Int32 mnUsedHier; /// Used hierarchy. sal_Int32 mnFlags; /// Flags from the DataPilotSource dimension @@ -167,7 +104,7 @@ struct ScDPLabelData ::com::sun::star::sheet::DataPilotFieldLayoutInfo maLayoutInfo; /// Layout info. ::com::sun::star::sheet::DataPilotFieldAutoShowInfo maShowInfo; /// AutoShow info. - explicit ScDPLabelData( const String& rName, short nCol, bool bIsValue ); + explicit ScDPLabelData( const String& rName, SCCOL nCol, bool bIsValue ); /** * return the name that should be displayed in the dp dialogs i.e. when @@ -176,22 +113,63 @@ struct ScDPLabelData ::rtl::OUString SC_DLLPUBLIC getDisplayName() const; }; +typedef std::vector< ScDPLabelData > ScDPLabelDataVector; + +// ============================================================================ + +struct ScPivotField +{ + SCCOL nCol; + USHORT nFuncMask; + USHORT nFuncCount; + ::com::sun::star::sheet::DataPilotFieldReference maFieldRef; + + explicit ScPivotField( SCCOL nNewCol = 0, USHORT nNewFuncMask = PIVOT_FUNC_NONE ); + + bool operator==( const ScPivotField& r ) const; +}; + +typedef ::std::vector< ScPivotField > ScPivotFieldVector; + +// ============================================================================ + +struct ScPivotParam +{ + SCCOL nCol; // Cursor Position / + SCROW nRow; // bzw. Anfang des Zielbereiches + SCTAB nTab; + ScDPLabelDataVector maLabelArray; + ScPivotFieldVector maPageArr; + ScPivotFieldVector maColArr; + ScPivotFieldVector maRowArr; + ScPivotFieldVector maDataArr; + BOOL bIgnoreEmptyRows; + BOOL bDetectCategories; + BOOL bMakeTotalCol; + BOOL bMakeTotalRow; + + ScPivotParam(); + + bool operator==( const ScPivotParam& r ) const; +}; + // ============================================================================ -struct ScDPFuncData +struct ScPivotFuncData { - short mnCol; + SCCOL mnCol; USHORT mnFuncMask; ::com::sun::star::sheet::DataPilotFieldReference maFieldRef; - explicit ScDPFuncData( short nNewCol, USHORT nNewFuncMask ); - explicit ScDPFuncData( short nNewCol, USHORT nNewFuncMask, + explicit ScPivotFuncData( SCCOL nCol, USHORT nFuncMask ); + explicit ScPivotFuncData( SCCOL nCol, USHORT nFuncMask, const ::com::sun::star::sheet::DataPilotFieldReference& rFieldRef ); }; +typedef ::std::vector< ScPivotFuncData > ScPivotFuncDataVector; + // ============================================================================ -typedef std::vector< ScDPLabelData > ScDPLabelDataVec; typedef std::vector< String > ScDPNameVec; // ============================================================================ diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx index 40711a200e19..c54c0317960d 100644 --- a/sc/inc/scabstdlg.hxx +++ b/sc/inc/scabstdlg.hxx @@ -51,7 +51,7 @@ class ScQueryItem; class ScImportOptions; class SfxStyleSheetBase; class ScDPObject; -struct ScDPFuncData; +struct ScPivotFuncData; struct ScDPNumGroupInfo; //