diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-10-19 07:32:01 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-10-19 07:32:01 +0000 |
| commit | 9e8f7d129d307cdf0bc85f9f24b9d79f44ae0cba (patch) | |
| tree | e1944b4177f61a0b49a16caa1799ed9db11b2dae /sw/source/ui | |
| parent | b7a2c4851101b16de215aed5acfed8810efd6f2f (diff) | |
INTEGRATION: CWS os64 (1.9.308); FILE MERGED
2005/10/14 04:42:51 os 1.9.308.3: RESYNC: (1.9-1.10); FILE MERGED
2005/09/05 08:12:32 os 1.9.308.2: #i50026# convert flag correctly used
2005/06/20 11:19:19 os 1.9.308.1: #i50026 convert to table now also possible inside of a table
Diffstat (limited to 'sw/source/ui')
| -rw-r--r-- | sw/source/ui/table/convert.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sw/source/ui/table/convert.cxx b/sw/source/ui/table/convert.cxx index 03ad71ac0665..4d15f48ca950 100644 --- a/sw/source/ui/table/convert.cxx +++ b/sw/source/ui/table/convert.cxx @@ -4,9 +4,9 @@ * * $RCSfile: convert.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: rt $ $Date: 2005-09-09 10:57:54 $ + * last change: $Author: rt $ $Date: 2005-10-19 08:32:01 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -135,10 +135,11 @@ void SwConvertTableDlg::GetValues( sal_Unicode& rDelim, } -SwConvertTableDlg::SwConvertTableDlg( SwView& rView ) +SwConvertTableDlg::SwConvertTableDlg( SwView& rView, bool bToTable ) : SfxModalDialog( &rView.GetViewFrame()->GetWindow(), SW_RES(DLG_CONV_TEXT_TABLE)), +#pragma warning (disable : 4355) aTabBtn (this, SW_RES(CB_TAB)), aSemiBtn (this, SW_RES(CB_SEMI)), aParaBtn (this, SW_RES(CB_PARA)), @@ -162,6 +163,7 @@ SwConvertTableDlg::SwConvertTableDlg( SwView& rView ) aCancelBtn(this,SW_RES(BT_CANCEL)), aHelpBtn(this, SW_RES(BT_HELP)), aAutoFmtBtn(this,SW_RES(BT_AUTOFORMAT)), +#pragma warning (default : 4355) pTAutoFmt( 0 ), pShell( &rView.GetWrtShell() ), @@ -186,7 +188,7 @@ SwConvertTableDlg::SwConvertTableDlg( SwView& rView ) } } - if( 0 == pShell->GetTableFmt() ) + if( bToTable ) { SetText( sConvertTextTable ); aAutoFmtBtn.SetClickHdl(LINK(this, SwConvertTableDlg, AutoFmtHdl)); |