diff options
Diffstat (limited to 'sw/source/filter/ww8/ww8attributeoutput.hxx')
-rw-r--r-- | sw/source/filter/ww8/ww8attributeoutput.hxx | 50 |
1 files changed, 25 insertions, 25 deletions
diff --git a/sw/source/filter/ww8/ww8attributeoutput.hxx b/sw/source/filter/ww8/ww8attributeoutput.hxx index b9d9ba38c246..e8013f9d450d 100644 --- a/sw/source/filter/ww8/ww8attributeoutput.hxx +++ b/sw/source/filter/ww8/ww8attributeoutput.hxx @@ -90,7 +90,7 @@ public: /// Output redlining. virtual void Redline( const SwRedlineData* pRedline ); - virtual void FormatDrop( const SwTxtNode& rNode, const SwFmtDrop &rSwFmtDrop, USHORT nStyle, ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo, ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner ); + virtual void FormatDrop( const SwTxtNode& rNode, const SwFmtDrop &rSwFmtDrop, sal_uInt16 nStyle, ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo, ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner ); /// Output FKP (Formatted disK Page) - necessary for binary formats only. /// FIXME having it in AttributeOutputBase is probably a hack, it @@ -98,7 +98,7 @@ public: virtual void OutputFKP(); /// Output style. - virtual void ParagraphStyle( USHORT nStyle ); + virtual void ParagraphStyle( sal_uInt16 nStyle ); virtual void TableInfoCell( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfo ); @@ -132,26 +132,26 @@ public: virtual void StartStyles(); /// End of the styles table. - virtual void EndStyles( USHORT nNumberOfStyles ); + virtual void EndStyles( sal_uInt16 nNumberOfStyles ); /// Write default style. - virtual void DefaultStyle( USHORT nStyle ); + virtual void DefaultStyle( sal_uInt16 nStyle ); /// Start of a style in the styles table. virtual void StartStyle( const String& rName, bool bPapFmt, - USHORT nBase, USHORT nNext, USHORT nWwIdi, USHORT nId ); + sal_uInt16 nBase, sal_uInt16 nNext, sal_uInt16 nWwIdi, sal_uInt16 nId ); /// End of a style in the styles table. virtual void EndStyle(); /// Start of (paragraph or run) properties of a style. - virtual void StartStyleProperties( bool bParProp, USHORT nStyle ); + virtual void StartStyleProperties( bool bParProp, sal_uInt16 nStyle ); /// End of (paragraph or run) properties of a style. virtual void EndStyleProperties( bool bParProp ); /// Numbering rule and Id. - virtual void OutlineNumbering( BYTE nLvl, const SwNumFmt &rNFmt, const SwFmt &rFmt ); + virtual void OutlineNumbering( sal_uInt8 nLvl, const SwNumFmt &rNFmt, const SwFmt &rFmt ); /// Page break /// As a paragraph property - the paragraph should be on the next page. @@ -159,7 +159,7 @@ public: /// Write a section break /// msword::ColumnBreak or msword::PageBreak - virtual void SectionBreak( BYTE nC, const WW8_SepInfo* pSectionInfo = NULL ); + virtual void SectionBreak( sal_uInt8 nC, const WW8_SepInfo* pSectionInfo = NULL ); /// Start of the section properties. virtual void StartSection(); @@ -173,7 +173,7 @@ public: virtual void SectionFormProtection( bool bProtected ); /// Numbering of the lines in the document. - virtual void SectionLineNumbering( ULONG nRestartNo, const SwLineNumberInfo& rLnNumInfo ); + virtual void SectionLineNumbering( sal_uLong nRestartNo, const SwLineNumberInfo& rLnNumInfo ); /// Has different headers/footers for the title page. virtual void SectionTitlePage(); @@ -187,24 +187,24 @@ public: /// The style of the page numbers. /// /// nPageRestartNumberr being 0 means no restart. - virtual void SectionPageNumbering( USHORT nNumType, USHORT nPageRestartNumber ); + virtual void SectionPageNumbering( sal_uInt16 nNumType, sal_uInt16 nPageRestartNumber ); /// The type of breaking. - virtual void SectionType( BYTE nBreakCode ); + virtual void SectionType( sal_uInt8 nBreakCode ); /// Special header/footer flags, needed for old versions only. - virtual void SectionWW6HeaderFooterFlags( BYTE nHeadFootFlags ); + virtual void SectionWW6HeaderFooterFlags( sal_uInt8 nHeadFootFlags ); /// Definition of a numbering instance. - virtual void NumberingDefinition( USHORT nId, const SwNumRule &rRule ); + virtual void NumberingDefinition( sal_uInt16 nId, const SwNumRule &rRule ); /// All the numbering level information. - virtual void NumberingLevel( BYTE nLevel, - USHORT nStart, - USHORT nNumberingType, + virtual void NumberingLevel( sal_uInt8 nLevel, + sal_uInt16 nStart, + sal_uInt16 nNumberingType, SvxAdjust eAdjust, - const BYTE *pNumLvlPos, - BYTE nFollow, + const sal_uInt8 *pNumLvlPos, + sal_uInt8 nFollow, const wwFont *pFont, const SfxItemSet *pOutSet, sal_Int16 nIndentAt, @@ -382,7 +382,7 @@ protected: virtual void FormatBox( const SvxBoxItem& ); /// Sfx item RES_COL - virtual void FormatColumns_Impl( USHORT nCols, const SwFmtCol & rCol, bool bEven, SwTwips nPageSize ); + virtual void FormatColumns_Impl( sal_uInt16 nCols, const SwFmtCol & rCol, bool bEven, SwTwips nPageSize ); /// Sfx item RES_KEEP virtual void FormatKeep( const SvxFmtKeepItem& ); @@ -414,24 +414,24 @@ protected: /// /// We have to remember these positions between the StartStyle() and /// EndStyle(). - USHORT nPOPosStdLen1, nPOPosStdLen2; + sal_uInt16 nPOPosStdLen1, nPOPosStdLen2; /// For output of styles. /// /// We have to remember this position between StartStyleProperties() and /// EndStyleProperties(). - USHORT m_nStyleStartSize, m_nStyleLenPos; + sal_uInt16 m_nStyleStartSize, m_nStyleLenPos; /// For output of styles. /// /// Used between StartStyles() and EndStyles(). - ULONG m_nStyAnzPos; + sal_uLong m_nStyAnzPos; /// For output of run properties. /// /// We have to remember the number of field results, and do not export end /// of the field results if we were forced to split text. - USHORT m_nFieldResults; + sal_uInt16 m_nFieldResults; public: WW8AttributeOutput( WW8Export &rWW8Export ) : AttributeOutputBase(), m_rWW8Export( rWW8Export ) {} @@ -442,10 +442,10 @@ public: protected: /// Output the bold etc. attributes - void OutputWW8Attribute( BYTE nId, bool bVal ); + void OutputWW8Attribute( sal_uInt8 nId, bool bVal ); /// Output the bold etc. attributes, the Complex Text Layout version - void OutputWW8AttributeCTL( BYTE nId, bool bVal ); + void OutputWW8AttributeCTL( sal_uInt8 nId, bool bVal ); }; |