diff options
Diffstat (limited to 'sw/source/filter/ww8/wrtw8nds.cxx')
-rw-r--r-- | sw/source/filter/ww8/wrtw8nds.cxx | 130 |
1 files changed, 65 insertions, 65 deletions
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index 34d6c1a654f4..80be5b14b222 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -192,7 +192,7 @@ private: const SwRedline* pCurRedline; xub_StrLen nAktSwPos; - USHORT nCurRedlinePos; + sal_uInt16 nCurRedlinePos; bool mbParaIsRTL; @@ -222,8 +222,8 @@ public: void NextPos() { nAktSwPos = SearchNext( nAktSwPos + 1 ); } void OutAttr( xub_StrLen nSwPos ); - virtual const SfxPoolItem* HasTextItem( USHORT nWhich ) const; - virtual const SfxPoolItem& GetItem( USHORT nWhich ) const; + virtual const SfxPoolItem* HasTextItem( sal_uInt16 nWhich ) const; + virtual const SfxPoolItem& GetItem( sal_uInt16 nWhich ) const; int OutAttrWithRange(xub_StrLen nPos); const SwRedlineData* GetRedline( xub_StrLen nPos ); void OutFlys(xub_StrLen nSwPos); @@ -477,7 +477,7 @@ void SwAttrIter::OutAttr( xub_StrLen nSwPos ) //The hard formatting properties that affect the entire paragraph if (rNd.HasSwAttrSet()) { - BOOL bDeep = FALSE; + sal_Bool bDeep = sal_False; // only copy hard attributes - bDeep = false aExportSet.Set(rNd.GetSwAttrSet(), bDeep); // get the current font item. Use rNd.GetSwAttrSet instead of aExportSet: @@ -511,7 +511,7 @@ void SwAttrIter::OutAttr( xub_StrLen nSwPos ) sal_uInt16 nWhichId = aIter.FirstWhich(); while( nWhichId ) { - if( SFX_ITEM_SET == pSet->GetItemState( nWhichId, FALSE, &pItem )) + if( SFX_ITEM_SET == pSet->GetItemState( nWhichId, sal_False, &pItem )) { if (nWhichId == nFontId) pFont = &(item_cast<SvxFontItem>(*pItem)); @@ -609,7 +609,7 @@ bool SwAttrIter::IsTxtAttr( xub_StrLen nSwPos ) // search for attrs with CH_TXTATR if (const SwpHints* pTxtAttrs = rNd.GetpSwpHints()) { - for (USHORT i = 0; i < pTxtAttrs->Count(); ++i) + for (sal_uInt16 i = 0; i < pTxtAttrs->Count(); ++i) { const SwTxtAttr* pHt = (*pTxtAttrs)[i]; if ( pHt->HasDummyChar() && (*pHt->GetStart() == nSwPos) ) @@ -644,7 +644,7 @@ bool SwAttrIter::RequiresImplicitBookmark() SwImplBookmarksIter bkmkIterEnd = m_rExport.maImplicitBookmarks.end(); for ( SwImplBookmarksIter aIter = m_rExport.maImplicitBookmarks.begin(); aIter != bkmkIterEnd; ++aIter ) { - ULONG sample = aIter->second; + sal_uLong sample = aIter->second; if ( sample == rNd.GetIndex() ) return true; @@ -658,14 +658,14 @@ bool SwAttrIter::RequiresImplicitBookmark() // Attribut-Anfangposition fragen kann. // Es koennen nur Attribute mit Ende abgefragt werden. // Es wird mit bDeep gesucht -const SfxPoolItem* SwAttrIter::HasTextItem( USHORT nWhich ) const +const SfxPoolItem* SwAttrIter::HasTextItem( sal_uInt16 nWhich ) const { const SfxPoolItem* pRet = 0; const SwpHints* pTxtAttrs = rNd.GetpSwpHints(); xub_StrLen nTmpSwPos = m_rExport.m_aCurrentCharPropStarts.top(); if (pTxtAttrs) { - for (USHORT i = 0; i < pTxtAttrs->Count(); ++i) + for (sal_uInt16 i = 0; i < pTxtAttrs->Count(); ++i) { const SwTxtAttr* pHt = (*pTxtAttrs)[i]; const SfxPoolItem* pItem = &pHt->GetAttr(); @@ -686,12 +686,12 @@ const SfxPoolItem* SwAttrIter::HasTextItem( USHORT nWhich ) const void WW8Export::GetCurrentItems(WW8Bytes& rItems) const { - USHORT nEnd = pO ? pO->Count() : 0; - for (USHORT nI = 0; nI < nEnd; ++nI) + sal_uInt16 nEnd = pO ? pO->Count() : 0; + for (sal_uInt16 nI = 0; nI < nEnd; ++nI) rItems.Insert((*pO)[nI], rItems.Count()); } -const SfxPoolItem& SwAttrIter::GetItem(USHORT nWhich) const +const SfxPoolItem& SwAttrIter::GetItem(sal_uInt16 nWhich) const { const SfxPoolItem* pRet = HasTextItem(nWhich); return pRet ? *pRet : rNd.SwCntntNode::GetAttr(nWhich); @@ -737,7 +737,7 @@ void WW8AttributeOutput::StartRuby( const SwTxtNode& rNode, const SwFmtRuby& rRu other, so we make a guess based upon the first character of the text, defaulting to asian. */ - USHORT nRubyScript; + sal_uInt16 nRubyScript; if( pBreakIt->GetBreakIter().is() ) nRubyScript = pBreakIt->GetBreakIter()->getScriptType( rRuby.GetText(), 0); else @@ -920,20 +920,20 @@ bool WW8AttributeOutput::StartURL( const String &rUrl, const String &rTarget ) m_rWW8Export.OutputField( 0, ww::eHYPERLINK, sURL, WRITEFIELD_START | WRITEFIELD_CMD_START ); // write the refence to the "picture" structure - ULONG nDataStt = m_rWW8Export.pDataStrm->Tell(); + sal_uLong nDataStt = m_rWW8Export.pDataStrm->Tell(); m_rWW8Export.pChpPlc->AppendFkpEntry( m_rWW8Export.Strm().Tell() ); // WinWord 2000 doesn't write this - so its a temp solution by W97 ? m_rWW8Export.WriteChar( 0x01 ); - static BYTE aArr1[] = { + static sal_uInt8 aArr1[] = { 0x03, 0x6a, 0,0,0,0, // sprmCPicLocation 0x06, 0x08, 0x01, // sprmCFData 0x55, 0x08, 0x01, // sprmCFSpec 0x02, 0x08, 0x01 // sprmCFFldVanish }; - BYTE* pDataAdr = aArr1 + 2; + sal_uInt8* pDataAdr = aArr1 + 2; Set_UInt32( pDataAdr, nDataStt ); m_rWW8Export.pChpPlc->AppendFkpEntry( m_rWW8Export.Strm().Tell(), sizeof( aArr1 ), aArr1 ); @@ -946,7 +946,7 @@ bool WW8AttributeOutput::StartURL( const String &rUrl, const String &rTarget ) //all links end up in the data stream as absolute references. bool bAbsolute = !bBookMarkOnly; - static BYTE __READONLY_DATA aURLData1[] = { + static sal_uInt8 __READONLY_DATA aURLData1[] = { 0,0,0,0, // len of struct 0x44,0, // the start of "next" data 0,0,0,0,0,0,0,0,0,0, // PIC-Structure! @@ -955,20 +955,20 @@ bool WW8AttributeOutput::StartURL( const String &rUrl, const String &rTarget ) 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, // | 0,0,0,0, // / }; - static BYTE __READONLY_DATA MAGIC_A[] = { + static sal_uInt8 __READONLY_DATA MAGIC_A[] = { // start of "next" data 0xD0,0xC9,0xEA,0x79,0xF9,0xBA,0xCE,0x11, 0x8C,0x82,0x00,0xAA,0x00,0x4B,0xA9,0x0B }; m_rWW8Export.pDataStrm->Write( aURLData1, sizeof( aURLData1 ) ); - BYTE nAnchor = 0x00; + sal_uInt8 nAnchor = 0x00; if ( sMark.Len() ) nAnchor = 0x08; m_rWW8Export.pDataStrm->Write( &nAnchor, 1 ); m_rWW8Export.pDataStrm->Write( MAGIC_A, sizeof(MAGIC_A) ); SwWW8Writer::WriteLong( *m_rWW8Export.pDataStrm, 0x00000002); - UINT32 nFlag = bBookMarkOnly ? 0 : 0x01; + sal_uInt32 nFlag = bBookMarkOnly ? 0 : 0x01; if ( bAbsolute ) nFlag |= 0x02; if ( sMark.Len() ) @@ -980,13 +980,13 @@ bool WW8AttributeOutput::StartURL( const String &rUrl, const String &rTarget ) { // version 1 (for a document) - static BYTE __READONLY_DATA MAGIC_C[] = { + static sal_uInt8 __READONLY_DATA MAGIC_C[] = { 0x03, 0x03, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xC0, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x46, 0x00, 0x00 }; - static BYTE __READONLY_DATA MAGIC_D[] = { + static sal_uInt8 __READONLY_DATA MAGIC_D[] = { 0xFF, 0xFF, 0xAD, 0xDE, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 @@ -1026,7 +1026,7 @@ bool WW8AttributeOutput::StartURL( const String &rUrl, const String &rTarget ) // what the data mean, except for the URL. // The First piece is the WW8_PIC structure. // - static BYTE __READONLY_DATA MAGIC_B[] = { + static sal_uInt8 __READONLY_DATA MAGIC_B[] = { 0xE0,0xC9,0xEA,0x79,0xF9,0xBA,0xCE,0x11, 0x8C,0x82,0x00,0xAA,0x00,0x4B,0xA9,0x0B }; @@ -1091,7 +1091,7 @@ void WW8AttributeOutput::FieldVanish( const String& rTxt, ww::eField /*eType*/ ) aItems.Insert( 67, aItems.Count() ); aItems.Insert( 1, aItems.Count() ); - USHORT nStt_sprmCFSpec = aItems.Count(); + sal_uInt16 nStt_sprmCFSpec = aItems.Count(); // sprmCFSpec -- fSpec-Attribut true if ( m_rWW8Export.bWrtWW8 ) @@ -1155,7 +1155,7 @@ void AttributeOutputBase::TOXMark( const SwTxtNode& rNode, const SwTOXMark& rAtt { eType = ww::eTC; sTxt.InsertAscii( " TC \"", 0 ); - USHORT nLvl = rAttr.GetLevel(); + sal_uInt16 nLvl = rAttr.GetLevel(); if (nLvl > WW8ListManager::nMaxLevel) nLvl = WW8ListManager::nMaxLevel; @@ -1179,7 +1179,7 @@ int SwAttrIter::OutAttrWithRange(xub_StrLen nPos) { m_rExport.m_aCurrentCharPropStarts.push( nPos ); const xub_StrLen* pEnd; - for ( USHORT i = 0; i < pTxtAttrs->Count(); ++i ) + for ( sal_uInt16 i = 0; i < pTxtAttrs->Count(); ++i ) { const SwTxtAttr* pHt = (*pTxtAttrs)[i]; const SfxPoolItem* pItem = &pHt->GetAttr(); @@ -1237,7 +1237,7 @@ bool SwAttrIter::IsRedlineAtEnd( xub_StrLen nEnd ) const { bool bRet = false; // search next Redline - for( USHORT nPos = nCurRedlinePos; + for( sal_uInt16 nPos = nCurRedlinePos; nPos < m_rExport.pDoc->GetRedlineTbl().Count(); ++nPos ) { const SwPosition* pEnd = m_rExport.pDoc->GetRedlineTbl()[ nPos ]->End(); @@ -1516,8 +1516,8 @@ String SwAttrIter::GetSnippet(const String &rStr, xub_StrLen nAktPos, */ static SwTxtFmtColl& lcl_getFormatCollection( MSWordExportBase& rExport, const SwTxtNode* pTxtNode ) { - USHORT nPos = 0; - USHORT nMax = rExport.pDoc->GetRedlineTbl().Count(); + sal_uInt16 nPos = 0; + sal_uInt16 nMax = rExport.pDoc->GetRedlineTbl().Count(); while( nPos < nMax ) { const SwRedline* pRedl = rExport.pDoc->GetRedlineTbl()[ nPos++ ]; @@ -1538,7 +1538,7 @@ static SwTxtFmtColl& lcl_getFormatCollection( MSWordExportBase& rExport, const S return static_cast<SwTxtFmtColl&>( pTxtNode->GetAnyFmtColl() ); } -void WW8AttributeOutput::FormatDrop( const SwTxtNode& rNode, const SwFmtDrop &rSwFmtDrop, USHORT nStyle, +void WW8AttributeOutput::FormatDrop( const SwTxtNode& rNode, const SwFmtDrop &rSwFmtDrop, sal_uInt16 nStyle, ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo, ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner ) { short nDropLines = rSwFmtDrop.GetLines(); @@ -1547,7 +1547,7 @@ void WW8AttributeOutput::FormatDrop( const SwTxtNode& rNode, const SwFmtDrop &rS SVBT16 nSty; ShortToSVBT16( nStyle, nSty ); - m_rWW8Export.pO->Insert( (BYTE*)&nSty, 2, m_rWW8Export.pO->Count() ); // Style # + m_rWW8Export.pO->Insert( (sal_uInt8*)&nSty, 2, m_rWW8Export.pO->Count() ); // Style # if ( m_rWW8Export.bWrtWW8 ) { @@ -1559,7 +1559,7 @@ void WW8AttributeOutput::FormatDrop( const SwTxtNode& rNode, const SwFmtDrop &rS m_rWW8Export.InsUInt16( NS_sprm::LN_PDcs ); // Dropcap (sprmPDcs) int nDCS = ( nDropLines << 3 ) | 0x01; - m_rWW8Export.InsUInt16( static_cast< UINT16 >( nDCS ) ); + m_rWW8Export.InsUInt16( static_cast< sal_uInt16 >( nDCS ) ); m_rWW8Export.InsUInt16( NS_sprm::LN_PDxaFromText ); // Distance from text (sprmPDxaFromText) m_rWW8Export.InsUInt16( nDistance ); @@ -1567,7 +1567,7 @@ void WW8AttributeOutput::FormatDrop( const SwTxtNode& rNode, const SwFmtDrop &rS if ( rNode.GetDropSize( rFontHeight, rDropHeight, rDropDescent ) ) { m_rWW8Export.InsUInt16( NS_sprm::LN_PDyaLine ); // Line spacing - m_rWW8Export.InsUInt16( static_cast< UINT16 >( -rDropHeight ) ); + m_rWW8Export.InsUInt16( static_cast< sal_uInt16 >( -rDropHeight ) ); m_rWW8Export.InsUInt16( 0 ); } } @@ -1581,7 +1581,7 @@ void WW8AttributeOutput::FormatDrop( const SwTxtNode& rNode, const SwFmtDrop &rS m_rWW8Export.pO->Insert( 46, m_rWW8Export.pO->Count() ); // Dropcap (sprmPDcs) int nDCS = ( nDropLines << 3 ) | 0x01; - m_rWW8Export.InsUInt16( static_cast< UINT16 >( nDCS ) ); + m_rWW8Export.InsUInt16( static_cast< sal_uInt16 >( nDCS ) ); m_rWW8Export.pO->Insert( 49, m_rWW8Export.pO->Count() ); // Distance from text (sprmPDxaFromText) m_rWW8Export.InsUInt16( nDistance ); @@ -1589,7 +1589,7 @@ void WW8AttributeOutput::FormatDrop( const SwTxtNode& rNode, const SwFmtDrop &rS if (rNode.GetDropSize(rFontHeight, rDropHeight, rDropDescent)) { m_rWW8Export.pO->Insert( 20, m_rWW8Export.pO->Count() ); // Line spacing - m_rWW8Export.InsUInt16( static_cast< UINT16 >( -rDropHeight ) ); + m_rWW8Export.InsUInt16( static_cast< sal_uInt16 >( -rDropHeight ) ); m_rWW8Export.InsUInt16( 0 ); } } @@ -1620,10 +1620,10 @@ void WW8AttributeOutput::FormatDrop( const SwTxtNode& rNode, const SwFmtDrop &rS } m_rWW8Export.InsUInt16( NS_sprm::LN_CHpsPos ); // Lower the chars - m_rWW8Export.InsUInt16( static_cast< UINT16 >( -((nDropLines - 1)*rDropDescent) / 10 ) ); + m_rWW8Export.InsUInt16( static_cast< sal_uInt16 >( -((nDropLines - 1)*rDropDescent) / 10 ) ); m_rWW8Export.InsUInt16( NS_sprm::LN_CHps ); // Font Size - m_rWW8Export.InsUInt16( static_cast< UINT16 >( rFontHeight / 10 ) ); + m_rWW8Export.InsUInt16( static_cast< sal_uInt16 >( rFontHeight / 10 ) ); } else { @@ -1635,10 +1635,10 @@ void WW8AttributeOutput::FormatDrop( const SwTxtNode& rNode, const SwFmtDrop &rS } m_rWW8Export.pO->Insert( 101, m_rWW8Export.pO->Count() ); // Lower the chars - m_rWW8Export.InsUInt16( static_cast< UINT16 >( -((nDropLines - 1)*rDropDescent) / 10 ) ); + m_rWW8Export.InsUInt16( static_cast< sal_uInt16 >( -((nDropLines - 1)*rDropDescent) / 10 ) ); m_rWW8Export.pO->Insert( 99, m_rWW8Export.pO->Count() ); // Font Size - m_rWW8Export.InsUInt16( static_cast< UINT16 >( rFontHeight / 10 ) ); + m_rWW8Export.InsUInt16( static_cast< sal_uInt16 >( rFontHeight / 10 ) ); } } @@ -1673,7 +1673,7 @@ bool MSWordExportBase::GetBookmarks( const SwTxtNode& rNd, xub_StrLen nStt, xub_StrLen nEnd, IMarkVector& rArr ) { IDocumentMarkAccess* const pMarkAccess = pDoc->getIDocumentMarkAccess(); - ULONG nNd = rNd.GetIndex( ); + sal_uLong nNd = rNd.GetIndex( ); const sal_Int32 nMarks = pMarkAccess->getMarksCount(); for ( sal_Int32 i = 0; i < nMarks; i++ ) @@ -1795,7 +1795,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode ) // nStyleBeforeFly may change when we recurse into another node, so we // have to remember it in nStyle - USHORT nStyle = nStyleBeforeFly; + sal_uInt16 nStyle = nStyleBeforeFly; SwAttrIter aAttrIter( *this, rNode ); rtl_TextEncoding eChrSet = aAttrIter.GetCharSet(); @@ -1917,9 +1917,9 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode ) if ( isDropdownOrCheckbox ) AppendBookmark( pFieldmark->GetName(), false ); } - nLen -= static_cast< USHORT >( ofs ); + nLen -= static_cast< sal_uInt16 >( ofs ); - String aSnippet( aAttrIter.GetSnippet( aStr, nAktPos + static_cast< USHORT >( ofs ), nLen ) ); + String aSnippet( aAttrIter.GetSnippet( aStr, nAktPos + static_cast< sal_uInt16 >( ofs ), nLen ) ); if ( ( nTxtTyp == TXT_EDN || nTxtTyp == TXT_FTN ) && nAktPos == 0 && nLen > 0 ) { // Insert tab for aesthetic puposes #i24762# @@ -2038,7 +2038,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode ) if ( !bFlyInTable ) { SfxItemSet* pTmpSet = 0; - const BYTE nPrvNxtNd = rNode.HasPrevNextLayNode(); + const sal_uInt8 nPrvNxtNd = rNode.HasPrevNextLayNode(); if( (ND_HAS_PREV_LAYNODE|ND_HAS_NEXT_LAYNODE ) != nPrvNxtNd ) { @@ -2068,16 +2068,16 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode ) } } - BOOL bParaRTL = FALSE; + sal_Bool bParaRTL = sal_False; const SvxFrameDirectionItem* pItem = (const SvxFrameDirectionItem*) rNode.GetSwAttrSet().GetItem(RES_FRAMEDIR); if ( aAttrIter.IsParaRTL()) - bParaRTL = TRUE; + bParaRTL = sal_True; if( rNode.IsNumbered()) { const SwNumRule* pRule = rNode.GetNumRule(); - BYTE nLvl = static_cast< BYTE >( rNode.GetActualListLevel() ); + sal_uInt8 nLvl = static_cast< sal_uInt8 >( rNode.GetActualListLevel() ); const SwNumFmt* pFmt = pRule->GetNumFmt( nLvl ); if( !pFmt ) pFmt = &pRule->Get( nLvl ); @@ -2185,7 +2185,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode ) // create new LRSpace item, based on the current (if present) const SfxPoolItem* pPoolItem = NULL; - pTmpSet->GetItemState(RES_LR_SPACE, TRUE, &pPoolItem); + pTmpSet->GetItemState(RES_LR_SPACE, sal_True, &pPoolItem); SvxLRSpaceItem aLRSpace( ( pPoolItem == NULL ) ? SvxLRSpaceItem(0, 0, 0, 0, RES_LR_SPACE) @@ -2193,7 +2193,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode ) // new left margin = old left + label space const SwNumRule* pRule = rNode.GetNumRule(); - const SwNumFmt& rNumFmt = pRule->Get( static_cast< USHORT >(rNode.GetActualListLevel()) ); + const SwNumFmt& rNumFmt = pRule->Get( static_cast< sal_uInt16 >(rNode.GetActualListLevel()) ); // --> OD 2008-06-03 #i86652# if ( rNumFmt.GetPositionAndSpaceMode() == SvxNumberFormat::LABEL_WIDTH_AND_POSITION ) @@ -2290,7 +2290,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode ) if ( !pTmpSet ) pTmpSet = new SfxItemSet(rNode.GetSwAttrSet()); - const SvxFmtKeepItem aKeepItem( TRUE, RES_KEEP ); + const SvxFmtKeepItem aKeepItem( sal_True, RES_KEEP ); pTmpSet->Put( aKeepItem ); } } @@ -2344,7 +2344,7 @@ void WW8AttributeOutput::TableNodeInfo( ww8::WW8TableNodeInfo::Pointer_t pNodeIn { TableRowEnd( pInner->getDepth() ); - m_rWW8Export.pO->Insert( (BYTE*)&nSty, 2, m_rWW8Export.pO->Count() ); // Style # + m_rWW8Export.pO->Insert( (sal_uInt8*)&nSty, 2, m_rWW8Export.pO->Count() ); // Style # TableInfoRow( pInner ); m_rWW8Export.pPapPlc->AppendFkpEntry( m_rWW8Export.Strm().Tell(), m_rWW8Export.pO->Count(), m_rWW8Export.pO->GetData() ); @@ -2362,7 +2362,7 @@ void WW8AttributeOutput::TableNodeInfo( ww8::WW8TableNodeInfo::Pointer_t pNodeIn #if 0 /* */ -USHORT WW8Export::StartTableFromFrmFmt( WW8Bytes &rAt, const SwFrmFmt *pFmt ) +sal_uInt16 WW8Export::StartTableFromFrmFmt( WW8Bytes &rAt, const SwFrmFmt *pFmt ) { // Tell the undocumented table hack that everything between here and // the last table position is nontable text @@ -2372,7 +2372,7 @@ USHORT WW8Export::StartTableFromFrmFmt( WW8Bytes &rAt, const SwFrmFmt *pFmt ) // sprmPDxaFromText10 if( bWrtWW8 ) { - static BYTE __READONLY_DATA aTabLineAttr[] = { + static sal_uInt8 __READONLY_DATA aTabLineAttr[] = { 0, 0, // Sty # 0 0x16, 0x24, 1, // sprmPFInTable 0x17, 0x24, 1 }; // sprmPFTtp @@ -2380,7 +2380,7 @@ USHORT WW8Export::StartTableFromFrmFmt( WW8Bytes &rAt, const SwFrmFmt *pFmt ) } else { - static BYTE __READONLY_DATA aTabLineAttr[] = { + static sal_uInt8 __READONLY_DATA aTabLineAttr[] = { 0, 0, // Sty # 0 24, 1, // sprmPFInTable 25, 1 }; // sprmPFTtp @@ -2446,10 +2446,10 @@ static bool CellContainsProblematicGraphic( const SwWriteTableCell *pCell, } static bool RowContainsProblematicGraphic( const SwWriteTableCellPtr *pRow, - USHORT nCols, const MSWordExportBase &rExport ) + sal_uInt16 nCols, const MSWordExportBase &rExport ) { bool bHasGraphic = false; - for ( USHORT nI = 0; nI < nCols; ++nI ) + for ( sal_uInt16 nI = 0; nI < nCols; ++nI ) { if ( CellContainsProblematicGraphic( pRow[nI], rExport ) ) { @@ -2518,7 +2518,7 @@ void MSWordExportBase::OutputSectionNode( const SwSectionNode& rSectionNode ) // Bug 74245 - if the first Node inside the section has an own // PageDesc or PageBreak attribut, then dont write // here the section break - ULONG nRstLnNum = 0; + sal_uLong nRstLnNum = 0; const SfxItemSet* pSet; if ( rNd.IsTableNode() ) pSet = &rNd.GetTableNode()->GetTable().GetFrmFmt()->GetAttrSet(); @@ -2556,7 +2556,7 @@ void MSWordExportBase::OutputSectionNode( const SwSectionNode& rSectionNode ) } -void WW8Export::AppendSection( const SwPageDesc *pPageDesc, const SwSectionFmt* pFmt, ULONG nLnNum ) +void WW8Export::AppendSection( const SwPageDesc *pPageDesc, const SwSectionFmt* pFmt, sal_uLong nLnNum ) { pSepx->AppendSep(Fc2Cp(Strm().Tell()), pPageDesc, pFmt, nLnNum); } @@ -2575,7 +2575,7 @@ void WW8Export::OutWW6FlyFrmsInCntnt( const SwTxtNode& rNd ) if (const SwpHints* pTxtAttrs = rNd.GetpSwpHints()) { - for( USHORT n=0; n < pTxtAttrs->Count(); ++n ) + for( sal_uInt16 n=0; n < pTxtAttrs->Count(); ++n ) { const SwTxtAttr* pAttr = (*pTxtAttrs)[ n ]; if( RES_TXTATR_FLYCNT == pAttr->Which() ) @@ -2587,7 +2587,7 @@ void WW8Export::OutWW6FlyFrmsInCntnt( const SwTxtNode& rNd ) if( pNodeIndex ) { - ULONG nStt = pNodeIndex->GetIndex()+1, + sal_uLong nStt = pNodeIndex->GetIndex()+1, nEnd = pNodeIndex->GetNode().EndOfSectionIndex(); if( (nStt < nEnd) && !pDoc->GetNodes()[ nStt ]->IsNoTxtNode() ) @@ -2658,8 +2658,8 @@ void WW8AttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFmt, const Point // Hole vom Node und vom letzten Node die Position in der Section const SwNodeIndex* pNodeIndex = rFrmFmt.GetCntnt().GetCntntIdx(); - ULONG nStt = pNodeIndex ? pNodeIndex->GetIndex()+1 : 0; - ULONG nEnd = pNodeIndex ? pNodeIndex->GetNode().EndOfSectionIndex() : 0; + sal_uLong nStt = pNodeIndex ? pNodeIndex->GetIndex()+1 : 0; + sal_uLong nEnd = pNodeIndex ? pNodeIndex->GetNode().EndOfSectionIndex() : 0; if( nStt >= nEnd ) // kein Bereich, also kein gueltiger Node return; @@ -2692,7 +2692,7 @@ void WW8AttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFmt, const Point word 6 */ const SwTxtNode* pParTxtNode = rAnch.GetCntntAnchor()->nNode.GetNode().GetTxtNode(); - const SwRect aPageRect = pParTxtNode->FindPageFrmRect( FALSE, 0, FALSE ); + const SwRect aPageRect = pParTxtNode->FindPageFrmRect( sal_False, 0, sal_False ); aOffset = rFrmFmt.FindLayoutRect().Pos(); aOffset -= aPageRect.Pos(); @@ -2769,7 +2769,7 @@ void WW8AttributeOutput::Redline( const SwRedlineData* pRedline ) if ( pRedline->Next() ) Redline( pRedline->Next() ); - static USHORT __READONLY_DATA aSprmIds[ 2 * 2 * 3 ] = + static sal_uInt16 __READONLY_DATA aSprmIds[ 2 * 2 * 3 ] = { // Ids for insert NS_sprm::LN_CFRMark, NS_sprm::LN_CIbstRMark, NS_sprm::LN_CDttmRMark, // for WW8 @@ -2779,7 +2779,7 @@ void WW8AttributeOutput::Redline( const SwRedlineData* pRedline ) 0x0041, 0x0045, 0x0046 // for WW6 }; - const USHORT* pSprmIds = 0; + const sal_uInt16* pSprmIds = 0; switch( pRedline->GetType() ) { case nsRedlineType_t::REDLINE_INSERT: |