diff options
| author | Niklas Nebel <nn@openoffice.org> | 2011-02-15 10:55:41 +0100 |
|---|---|---|
| committer | Niklas Nebel <nn@openoffice.org> | 2011-02-15 10:55:41 +0100 |
| commit | c97e8ed65c02f7a0fe39f888f383d5a0bfff7c2a (patch) | |
| tree | 908e4d544958bc955ab85de3f9aedfb334a4638f /sc/source/ui/inc/scuiimoptdlg.hxx | |
| parent | aede73a350906eedae41e5971511c6c2f2c0e5f2 (diff) | |
| parent | d0ce561b856d43b13d5884b5aa5106f7889ea929 (diff) | |
csvexport: merge with DEV300_m100
Diffstat (limited to 'sc/source/ui/inc/scuiimoptdlg.hxx')
| -rw-r--r-- | sc/source/ui/inc/scuiimoptdlg.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/ui/inc/scuiimoptdlg.hxx b/sc/source/ui/inc/scuiimoptdlg.hxx index 705b244233a9..08215d99e98d 100644 --- a/sc/source/ui/inc/scuiimoptdlg.hxx +++ b/sc/source/ui/inc/scuiimoptdlg.hxx @@ -39,12 +39,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 = sal_False, + sal_Bool bOnlyDbtoolsEncodings = sal_False, + sal_Bool bImport = sal_True ); ~ScImportOptionsDlg(); @@ -69,7 +69,7 @@ private: ScDelimiterTable* pTextSepTab; private: - USHORT GetCodeFromCombo( const ComboBox& rEd ) const; + sal_uInt16 GetCodeFromCombo( const ComboBox& rEd ) const; DECL_LINK( FixedWidthHdl, CheckBox* ); DECL_LINK( DoubleClickHdl, ListBox* ); |