diff options
| author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-03 18:05:36 +0000 |
|---|---|---|
| committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-03 18:05:36 +0000 |
| commit | bf9826aaf1c66316aea18be01d9f03ad9d3f4ad0 (patch) | |
| tree | 9815da638a49e6fb6a1388ee4ea729999799e514 /svx | |
| parent | 5acaaf11e1cf33757915539440516b1cc66b4e1d (diff) | |
INTEGRATION: CWS dialogdiet (1.39.480); FILE MERGED
2004/01/19 20:53:47 mba 1.39.480.2: RESYNC: (1.39-1.40); FILE MERGED
2004/01/13 03:12:12 mwu 1.39.480.1: DialogDiet 2004_01_13
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/fmcomp/fmgridcl.cxx | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index fed5797d0d78..b1db98154921 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fmgridcl.cxx,v $ * - * $Revision: 1.40 $ + * $Revision: 1.41 $ * - * last change: $Author: rt $ $Date: 2003-12-01 09:28:42 $ + * last change: $Author: hr $ $Date: 2004-02-03 19:05:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -212,9 +212,9 @@ #include "fmgridif.hxx" #endif -#ifndef _SVX_SHOWCOLS_HXX -#include "showcols.hxx" -#endif +//CHINA001 #ifndef _SVX_SHOWCOLS_HXX +//CHINA001 #include "showcols.hxx" +//CHINA001 #endif #ifndef _COMPHELPER_EXTRACT_HXX_ #include <comphelper/extract.hxx> @@ -244,6 +244,9 @@ #include <tools/multisel.hxx> #endif +#include "svxdlg.hxx" //CHINA001 +#include <svx/dialogs.hrc> //CHINA001 + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::view; using namespace ::com::sun::star::beans; @@ -1055,9 +1058,19 @@ void FmGridHeader::PostExecuteColumnContextMenu(sal_uInt16 nColId, const PopupMe break; case SID_FM_SHOWCOLS_MORE: { - FmShowColsDialog dlg(NULL); - dlg.SetColumns(xCols); - dlg.Execute(); + //CHINA001 FmShowColsDialog dlg(NULL); + //CHINA001 dlg.SetColumns(xCols); + //CHINA001 dlg.Execute(); + SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create(); + if(pFact) + { + AbstractFmShowColsDialog* pDlg = pFact->CreateFmShowColsDialog(NULL, ResId(RID_SVX_DLG_SHOWGRIDCOLUMNS)); + DBG_ASSERT(pDlg, "Dialogdiet fail!");//CHINA001 + pDlg->SetColumns(xCols); + pDlg->Execute(); + delete pDlg; + } + } break; case SID_FM_SHOWALLCOLS: |