User: ihi Date: 2007-11-21 15:59:15+0000 Modified: dba/dbaccess/source/ui/inc/DExport.hxx
Log: INTEGRATION: CWS dba24c (1.18.4); FILE MERGED 2007/10/15 10:48:05 oj 1.18.4.3: #i80916# #i80917# special handling for table formats which doesn't have a header definition 2007/10/12 12:27:13 oj 1.18.4.2: #i80917# append first line as first data row 2007/10/02 08:09:18 oj 1.18.4.1: #i81879# correction of numberformat usage File Changes: Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: DExport.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/DExport.hxx?r1=1.18&r2=1.19 Delta lines: +3 -2 ------------------- --- DExport.hxx 2007-09-26 14:49:39+0000 1.18 +++ DExport.hxx 2007-11-21 15:59:12+0000 1.19 @@ -105,7 +105,7 @@ TPositions m_vColumns; // Welche Spalten "ubernommen werden sollen ::std::vector<sal_Int32> m_vColumnTypes; // FeldTypen f"ur schnelleren Zugriff ::std::vector<sal_Int32> m_vColumnSize; - ::std::vector<sal_Int32> m_vFormatKey; + ::std::vector<sal_Int16> m_vNumberFormat; ::com::sun::star::lang::Locale m_aLocale; TColumns m_aDestColumns; // container for new created columns @@ -143,6 +143,7 @@ sal_Bool m_bIsAutoIncrement; // if PKey is set by user sal_Bool m_bFoundTable; // set to true when a table was found sal_Bool m_bCheckOnly; + bool m_bAppendFirstLine; virtual sal_Bool CreateTable(int nToken) = 0; @@ -151,7 +152,7 @@ */ virtual OWizTypeSelect* createPage(Window* _pParent) = 0; void CreateDefaultColumn(const ::rtl::OUString& _rColumnName); - sal_Int32 CheckString(const String& aToken, sal_Int32 _nOldFormat); + sal_Int16 CheckString(const String& aToken, sal_Int16 _nOldNumberFormat); void adjustFormat(); void eraseTokens(); void insertValueIntoColumn(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
