diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2004-05-03 12:54:25 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2004-05-03 12:54:25 +0000 |
| commit | 64e7b26055a8dfd326306503218806639e69a6e2 (patch) | |
| tree | c851cf2f08fd5b2a9e228f0324bcafa3f982bba9 /sw/source/ui/shells/basesh.cxx | |
| parent | ad1b25b6334779cfe1c0e61fbc895b5d9241fa87 (diff) | |
INTEGRATION: CWS gt03 (1.48.78); FILE MERGED
2004/04/20 09:41:49 gt 1.48.78.3: RESYNC: (1.48-1.49); FILE MERGED
2004/04/08 11:19:50 gt 1.48.78.2: #i26167# repeated rows
2004/03/11 14:55:21 fme 1.48.78.1: #26165# Feature - Multiple headline rows in tables
Diffstat (limited to 'sw/source/ui/shells/basesh.cxx')
| -rw-r--r-- | sw/source/ui/shells/basesh.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sw/source/ui/shells/basesh.cxx b/sw/source/ui/shells/basesh.cxx index 8ba6735ddc..3ecb7def02 100644 --- a/sw/source/ui/shells/basesh.cxx +++ b/sw/source/ui/shells/basesh.cxx @@ -2,9 +2,9 @@ * * $RCSfile: basesh.cxx,v $ * - * $Revision: 1.49 $ + * $Revision: 1.50 $ * - * last change: $Author: obo $ $Date: 2004-03-19 12:49:21 $ + * last change: $Author: rt $ $Date: 2004-05-03 13:54:25 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -948,12 +948,12 @@ void SwBaseShell::Execute(SfxRequest &rReq) case FN_CONVERT_TEXT_TABLE: { sal_Unicode cDelim = 0; - USHORT nInsTblFlags = ALL_TBL_INS_ATTR; + SwInsertTableOptions aInsTblOpts( tabopts::ALL_TBL_INS_ATTR, 1 ); SwTableAutoFmt* pTAFmt = 0; SwConvertTableDlg *pDlg = new SwConvertTableDlg( GetView() ); if( RET_OK == pDlg->Execute() ) { - pDlg->GetValues( cDelim, nInsTblFlags, pTAFmt ); + pDlg->GetValues( cDelim, aInsTblOpts, pTAFmt ); } delete pDlg; @@ -966,8 +966,7 @@ void SwBaseShell::Execute(SfxRequest &rReq) if( rSh.GetTableFmt() ) rSh.TableToText( cDelim ); else - bInserted = rSh.TextToTable( cDelim, HORI_FULL, - nInsTblFlags, pTAFmt ); + bInserted = rSh.TextToTable( aInsTblOpts, cDelim, HORI_FULL, pTAFmt ); rSh.EnterStdMode(); if( bInserted ) |