diff options
Diffstat (limited to 'sc/source/filter/lotus/lotattr.cxx')
| -rw-r--r-- | sc/source/filter/lotus/lotattr.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sc/source/filter/lotus/lotattr.cxx b/sc/source/filter/lotus/lotattr.cxx index 6a05585cf326..809ac336a371 100644 --- a/sc/source/filter/lotus/lotattr.cxx +++ b/sc/source/filter/lotus/lotattr.cxx @@ -48,9 +48,9 @@ -void LotAttrCache::LotusToScBorderLine( UINT8 nLine, SvxBorderLine& aBL ) +void LotAttrCache::LotusToScBorderLine( sal_uInt8 nLine, SvxBorderLine& aBL ) { - static const UINT16 pPara[ 4 ][ 3 ] = + static const sal_uInt16 pPara[ 4 ][ 3 ] = { { 0,0,0 }, { DEF_LINE_WIDTH_1, 0, 0 }, @@ -69,7 +69,7 @@ void LotAttrCache::LotusToScBorderLine( UINT8 nLine, SvxBorderLine& aBL ) } -const SvxColorItem& LotAttrCache::GetColorItem( const UINT8 nLotIndex ) const +const SvxColorItem& LotAttrCache::GetColorItem( const sal_uInt8 nLotIndex ) const { DBG_ASSERT( nLotIndex > 0 && nLotIndex < 7, "-LotAttrCache::GetColorItem(): so nicht!" ); @@ -78,7 +78,7 @@ const SvxColorItem& LotAttrCache::GetColorItem( const UINT8 nLotIndex ) const } -const Color& LotAttrCache::GetColor( const UINT8 nLotIndex ) const +const Color& LotAttrCache::GetColor( const sal_uInt8 nLotIndex ) const { // Farbe <-> Index passt fuer Background, nicht aber fuer Fonts (0 <-> 7)! DBG_ASSERT( nLotIndex < 8, "*LotAttrCache::GetColor(): Index > 7!" ); @@ -122,7 +122,7 @@ LotAttrCache::~LotAttrCache() pAkt = ( ENTRY* ) List::Next(); } - for( UINT16 nCnt = 0 ; nCnt < 6 ; nCnt++ ) + for( sal_uInt16 nCnt = 0 ; nCnt < 6 ; nCnt++ ) delete ppColorItems[ nCnt ]; delete pBlack; @@ -134,7 +134,7 @@ LotAttrCache::~LotAttrCache() const ScPatternAttr& LotAttrCache::GetPattAttr( const LotAttrWK3& rAttr ) { - UINT32 nRefHash; + sal_uInt32 nRefHash; ENTRY* pAkt = ( ENTRY* ) List::First(); MakeHash( rAttr, nRefHash ); @@ -156,7 +156,7 @@ const ScPatternAttr& LotAttrCache::GetPattAttr( const LotAttrWK3& rAttr ) pLotusRoot->pFontBuff->Fill( rAttr.nFont, rItemSet ); - UINT8 nLine = rAttr.nLineStyle; + sal_uInt8 nLine = rAttr.nLineStyle; if( nLine ) { SvxBoxItem aBox( ATTR_BORDER ); @@ -178,7 +178,7 @@ const ScPatternAttr& LotAttrCache::GetPattAttr( const LotAttrWK3& rAttr ) rItemSet.Put( aBox ); } - UINT8 nFontCol = rAttr.nFontCol & 0x07; + sal_uInt8 nFontCol = rAttr.nFontCol & 0x07; if( nFontCol ) { // nFontCol > 0 @@ -188,7 +188,7 @@ const ScPatternAttr& LotAttrCache::GetPattAttr( const LotAttrWK3& rAttr ) rItemSet.Put( *pWhite ); } - UINT8 nBack = rAttr.nBack & 0x1F; + sal_uInt8 nBack = rAttr.nBack & 0x1F; if( nBack ) rItemSet.Put( SvxBrushItem( GetColor( nBack & 0x07 ), ATTR_BACKGROUND ) ); @@ -239,7 +239,7 @@ void LotAttrCol::SetAttr( const SCROW nRow, const ScPatternAttr& rAttr ) } -void LotAttrCol::Apply( const SCCOL nColNum, const SCTAB nTabNum, const BOOL /*bClear*/ ) +void LotAttrCol::Apply( const SCCOL nColNum, const SCTAB nTabNum, const sal_Bool /*bClear*/ ) { ScDocument* pDoc = pLotusRoot->pDoc; ENTRY* pAkt = ( ENTRY* ) List::First(); |