diff options
| author | Mathias Bauer <mba@openoffice.org> | 2009-12-05 19:29:07 +0100 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2009-12-05 19:29:07 +0100 |
| commit | e1593452b25bbfd9e61a73f69a4d50aa4c28510b (patch) | |
| tree | 3123590defc1c25847be4ce61a9f5e5b1074260d /sc/source/ui/attrdlg | |
| parent | 95619e5c6332e7ac36282f2bc0390d34c138779f (diff) | |
| parent | 8c30146af0e6d4fbdb731eae01dbf47661e788ae (diff) | |
merge to m67
Diffstat (limited to 'sc/source/ui/attrdlg')
| -rw-r--r-- | sc/source/ui/attrdlg/scdlgfact.cxx | 10 | ||||
| -rw-r--r-- | sc/source/ui/attrdlg/scdlgfact.hxx | 5 |
2 files changed, 12 insertions, 3 deletions
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx b/sc/source/ui/attrdlg/scdlgfact.cxx index 60b101d482c0..8d5e0e1e6791 100644 --- a/sc/source/ui/attrdlg/scdlgfact.cxx +++ b/sc/source/ui/attrdlg/scdlgfact.cxx @@ -1425,13 +1425,19 @@ SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScParagraphDlg( Windo //add for ScValidationDlg begin SfxAbstractTabDialog * ScAbstractDialogFactory_Impl::CreateScValidationDlg( Window* pParent, - const SfxItemSet* pArgSet,int nId ) +//<!--Modified by PengYunQuan for Validity Cell Range Picker +// const SfxItemSet* pArgSet,int nId ) + const SfxItemSet* pArgSet,int nId, ScTabViewShell *pTabVwSh ) +//-->Modified by PengYunQuan for Validity Cell Range Picke { SfxTabDialog* pDlg=NULL; switch ( nId ) { case TAB_DLG_VALIDATION : - pDlg = new ScValidationDlg( pParent, pArgSet ); + //<!--Modified by PengYunQuan for Validity Cell Range Picker + //pDlg = new ScValidationDlg( pParent, pArgSet ); + pDlg = new ScValidationDlg( pParent, pArgSet, pTabVwSh ); + //-->Modified by PengYunQuan for Validity Cell Range Picker break; default: break; diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx b/sc/source/ui/attrdlg/scdlgfact.hxx index 40f6d3bee976..530220858f35 100644 --- a/sc/source/ui/attrdlg/scdlgfact.hxx +++ b/sc/source/ui/attrdlg/scdlgfact.hxx @@ -546,7 +546,10 @@ public: int nId ); virtual SfxAbstractTabDialog * CreateScValidationDlg( Window* pParent, //add for ScValidationDlg - const SfxItemSet* pArgSet,int nId ); + //<!--Modified by PengYunQuan for Validity Cell Range Picker + // const SfxItemSet* pArgSet,int nId ); + const SfxItemSet* pArgSet,int nId, ScTabViewShell *pTabVwSh ); + //-->Modified by PengYunQuan for Validity Cell Range Picker virtual SfxAbstractTabDialog * CreateScSortDlg( Window* pParent, //add for ScSortDlg const SfxItemSet* pArgSet,int nId ); |