diff options
Diffstat (limited to 'sc/source/filter/inc/lotimpop.hxx')
| -rw-r--r-- | sc/source/filter/inc/lotimpop.hxx | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/sc/source/filter/inc/lotimpop.hxx b/sc/source/filter/inc/lotimpop.hxx index 09efab80320a..8856f45cb4a9 100644 --- a/sc/source/filter/inc/lotimpop.hxx +++ b/sc/source/filter/inc/lotimpop.hxx @@ -48,45 +48,45 @@ private: SvStream* pIn; // benoetigt wegen multiplem Read()! LotusFontBuffer* pFontBuff; LotusToSc aConv; - UINT16 nTab; // z.Zt. bearbeitete Tabelle - INT32 nExtTab; + sal_uInt16 nTab; // z.Zt. bearbeitete Tabelle + sal_Int32 nExtTab; // ------------------------------------------------------------------- // in WK?-Datei void Bof( void ); // 0x0000 00 - BOOL BofFm3( void ); // 0x0000 00 - void Columnwidth( UINT16 nRecLen ); // 0x0007 07 - void Hiddencolumn( UINT16 nRecLen ); // 0x0008 08 + sal_Bool BofFm3( void ); // 0x0000 00 + void Columnwidth( sal_uInt16 nRecLen ); // 0x0007 07 + void Hiddencolumn( sal_uInt16 nRecLen ); // 0x0008 08 void Userrange( void ); // 0x0009 09 void Errcell( void ); // 0x0014 20 void Nacell( void ); // 0x0015 21 void Labelcell( void ); // 0x0016 22 void Numbercell( void ); // 0x0017 23 void Smallnumcell( void ); // 0x0018 24 - ScFormulaCell* Formulacell( UINT16 nRecLen ); // 0x0019 25 + ScFormulaCell* Formulacell( sal_uInt16 nRecLen ); // 0x0019 25 void Formulastring( ScFormulaCell& ); // 0x001a 26 // 0x001b 27 special void NamedSheet( void ); // 14000 - void RowPresentation( UINT16 nRecLen ); // 2007 + void RowPresentation( sal_uInt16 nRecLen ); // 2007 // ------------------------------------------------------------------- // in FM?-Datei void Font_Face( void ); // 174 void Font_Type( void ); // 176 void Font_Ysize( void ); // 177 - void _Row( const UINT16 nRecLen ); // 197 ? + void _Row( const sal_uInt16 nRecLen ); // 197 ? // ------------------------------------------------------------------- inline void Read( ScAddress& ); inline void Read( ScRange& ); // fuer Addresses/Ranges im Format Row(16)/Tab(8)/Col(8) inline void Read( sal_Char& ); - inline void Read( BYTE& ); - inline void Read( UINT16& ); - inline void Read( INT16& ); - inline void Read( UINT32& ); + inline void Read( sal_uInt8& ); + inline void Read( sal_uInt16& ); + inline void Read( sal_Int16& ); + inline void Read( sal_uInt32& ); inline void Read( double& ); // 10-Byte-IEEE lesen inline void Read( LotAttrWK3& ); void Read( String& ); // 0-terminierten String einlesen - inline void Skip( const UINT16 nNumBytes ); + inline void Skip( const sal_uInt16 nNumBytes ); // ------------------------------------------------------------------- public: ImportLotus( SvStream&, ScDocument*, CharSet eSrc ); @@ -100,10 +100,10 @@ public: inline void ImportLotus::Read( ScAddress& rAddr ) { - UINT16 nRow; + sal_uInt16 nRow; *pIn >> nRow; rAddr.SetRow( static_cast<SCROW>(nRow) ); - BYTE nByte; + sal_uInt8 nByte; *pIn >> nByte; rAddr.SetTab( static_cast<SCTAB>(nByte) ); *pIn >> nByte; @@ -124,25 +124,25 @@ inline void ImportLotus::Read( sal_Char& r ) } -inline void ImportLotus::Read( BYTE& r ) +inline void ImportLotus::Read( sal_uInt8& r ) { *pIn >> r; } -inline void ImportLotus::Read( UINT16& r ) +inline void ImportLotus::Read( sal_uInt16& r ) { *pIn >> r; } -inline void ImportLotus::Read( INT16& r ) +inline void ImportLotus::Read( sal_Int16& r ) { *pIn >> r; } -inline void ImportLotus::Read( UINT32& r ) +inline void ImportLotus::Read( sal_uInt32& r ) { *pIn >> r; } @@ -160,7 +160,7 @@ inline void ImportLotus::Read( LotAttrWK3& r ) } -inline void ImportLotus::Skip( const UINT16 n ) +inline void ImportLotus::Skip( const sal_uInt16 n ) { pIn->SeekRel( n ); } |