diff options
author | Kohei Yoshida <kyoshida@novell.com> | 2011-03-10 16:55:21 -0500 |
---|---|---|
committer | Kohei Yoshida <kyoshida@novell.com> | 2011-03-10 20:21:13 -0500 |
commit | 12343c15568dcc2c9209d8ca41fda2263122448f (patch) | |
tree | 3212a89c6cd8ea2e0aee7103aa9669bbb8a6f307 /sc/source/ui/inc/scuiimoptdlg.hxx | |
parent | 99745dbcbb25b61437914c9782475d0b67a4b0bd (diff) | |
parent | ce6308e4fad2281241bf4ca78280eba29f744d43 (diff) |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'sc/source/ui/inc/scuiimoptdlg.hxx')
-rw-r--r-- | sc/source/ui/inc/scuiimoptdlg.hxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/sc/source/ui/inc/scuiimoptdlg.hxx b/sc/source/ui/inc/scuiimoptdlg.hxx index 605dec3cd7f6..9a0de3c23f4c 100644 --- a/sc/source/ui/inc/scuiimoptdlg.hxx +++ b/sc/source/ui/inc/scuiimoptdlg.hxx @@ -40,12 +40,12 @@ class ScImportOptionsDlg : public ModalDialog { public: ScImportOptionsDlg( Window* pParent, - BOOL bAscii = TRUE, + sal_Bool bAscii = sal_True, const ScImportOptions* pOptions = NULL, const String* pStrTitle = NULL, - BOOL bMultiByte = FALSE, - BOOL bOnlyDbtoolsEncodings = FALSE, - BOOL bImport = TRUE ); + sal_Bool bMultiByte = false, + sal_Bool bOnlyDbtoolsEncodings = false, + sal_Bool bImport = sal_True ); ~ScImportOptionsDlg(); @@ -59,17 +59,18 @@ private: ComboBox aEdFieldSep; FixedText aFtTextSep; ComboBox aEdTextSep; + CheckBox aCbQuoteAll; + CheckBox aCbShown; CheckBox aCbFixed; OKButton aBtnOk; CancelButton aBtnCancel; HelpButton aBtnHelp; - CheckBox aCbShown; ScDelimiterTable* pFieldSepTab; ScDelimiterTable* pTextSepTab; private: - USHORT GetCodeFromCombo( const ComboBox& rEd ) const; + sal_uInt16 GetCodeFromCombo( const ComboBox& rEd ) const; DECL_LINK( FixedWidthHdl, CheckBox* ); DECL_LINK( DoubleClickHdl, ListBox* ); |