diff options
Diffstat (limited to 'sw/source/filter/ww8/rtfattributeoutput.hxx')
| -rw-r--r-- | sw/source/filter/ww8/rtfattributeoutput.hxx | 72 |
1 files changed, 36 insertions, 36 deletions
diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx b/sw/source/filter/ww8/rtfattributeoutput.hxx index df92c2248009..d58b2caeb70a 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.hxx +++ b/sw/source/filter/ww8/rtfattributeoutput.hxx @@ -33,7 +33,7 @@ class SwGrfNode; class SwOLENode; -class SwFlyFrmFmt; +class SwFlyFrameFormat; /// The class that has handlers for various resource types when exporting as RTF class RtfAttributeOutput : public AttributeOutputBase @@ -53,7 +53,7 @@ public: virtual void EmptyParagraph() SAL_OVERRIDE; /// Called in order to output section breaks. - virtual void SectionBreaks(const SwTxtNode& rNode) SAL_OVERRIDE; + virtual void SectionBreaks(const SwTextNode& rNode) SAL_OVERRIDE; /// Called before we start outputting the attributes. virtual void StartParagraphProperties() SAL_OVERRIDE; @@ -87,7 +87,7 @@ public: virtual void RawText(const OUString& rText, bool bForceUnicode, rtl_TextEncoding eCharSet) SAL_OVERRIDE; /// Output ruby start. - virtual void StartRuby(const SwTxtNode& rNode, sal_Int32 nPos, const SwFmtRuby& rRuby) SAL_OVERRIDE; + virtual void StartRuby(const SwTextNode& rNode, sal_Int32 nPos, const SwFormatRuby& rRuby) SAL_OVERRIDE; /// Output ruby end. virtual void EndRuby() SAL_OVERRIDE; @@ -98,14 +98,14 @@ public: /// Output URL end. virtual bool EndURL(bool isAtEndOfParagraph) SAL_OVERRIDE; - virtual void FieldVanish(const OUString& rTxt, ww::eField eType) SAL_OVERRIDE; + virtual void FieldVanish(const OUString& rText, ww::eField eType) SAL_OVERRIDE; /// Output redlining. /// /// The common attribute that can be among the run properties. virtual void Redline(const SwRedlineData* pRedline) SAL_OVERRIDE; - virtual void FormatDrop(const SwTxtNode& rNode, const SwFmtDrop& rSwFmtDrop, sal_uInt16 nStyle, ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo, ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner) SAL_OVERRIDE; + virtual void FormatDrop(const SwTextNode& rNode, const SwFormatDrop& rSwFormatDrop, sal_uInt16 nStyle, ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo, ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner) SAL_OVERRIDE; /// Output style. virtual void ParagraphStyle(sal_uInt16 nStyle) SAL_OVERRIDE; @@ -151,7 +151,7 @@ public: virtual void EndStyleProperties(bool bParProp) SAL_OVERRIDE; /// Numbering rule and Id. - virtual void OutlineNumbering(sal_uInt8 nLvl, const SwNumFmt& rNFmt, const SwFmt& rFmt) SAL_OVERRIDE; + virtual void OutlineNumbering(sal_uInt8 nLvl, const SwNumFormat& rNFormat, const SwFormat& rFormat) SAL_OVERRIDE; /// Page break /// As a paragraph property - the paragraph should be on the next page. @@ -177,7 +177,7 @@ public: virtual void SectionTitlePage() SAL_OVERRIDE; /// Description of the page borders. - virtual void SectionPageBorders(const SwFrmFmt* pFmt, const SwFrmFmt* pFirstPageFmt) SAL_OVERRIDE; + virtual void SectionPageBorders(const SwFrameFormat* pFormat, const SwFrameFormat* pFirstPageFormat) SAL_OVERRIDE; /// Columns populated from right/numbers on the right side? virtual void SectionBiDi(bool bBiDi) SAL_OVERRIDE; @@ -213,14 +213,14 @@ public: const OUString& rNumberingString, const SvxBrushItem* pBrush = 0) SAL_OVERRIDE;//For i120928,to export graphic of bullet - void WriteField_Impl(const SwField* pFld, ww::eField eType, const OUString& rFldCmd, sal_uInt8 nMode); + void WriteField_Impl(const SwField* pField, ww::eField eType, const OUString& rFieldCmd, sal_uInt8 nMode); void WriteBookmarks_Impl(std::vector< OUString >& rStarts, std::vector< OUString >& rEnds); void WriteAnnotationMarks_Impl(std::vector< OUString >& rStarts, std::vector< OUString >& rEnds); - void WriteHeaderFooter_Impl(const SwFrmFmt& rFmt, bool bHeader, const sal_Char* pStr, bool bTitlepg); + void WriteHeaderFooter_Impl(const SwFrameFormat& rFormat, bool bHeader, const sal_Char* pStr, bool bTitlepg); protected: /// Output frames - the implementation. - virtual void OutputFlyFrame_Impl(const sw::Frame& rFmt, const Point& rNdTopLeft) SAL_OVERRIDE; + virtual void OutputFlyFrame_Impl(const sw::Frame& rFormat, const Point& rNdTopLeft) SAL_OVERRIDE; /// Sfx item Sfx item RES_CHRATR_CASEMAP virtual void CharCaseMap(const SvxCaseMapItem& rCaseMap) SAL_OVERRIDE; @@ -331,13 +331,13 @@ protected: virtual void CharHighlight(const SvxBrushItem&) SAL_OVERRIDE; /// Sfx item RES_TXTATR_INETFMT - virtual void TextINetFormat(const SwFmtINetFmt&) SAL_OVERRIDE; + virtual void TextINetFormat(const SwFormatINetFormat&) SAL_OVERRIDE; /// Sfx item RES_TXTATR_CHARFMT - virtual void TextCharFormat(const SwFmtCharFmt&) SAL_OVERRIDE; + virtual void TextCharFormat(const SwFormatCharFormat&) SAL_OVERRIDE; /// Sfx item RES_TXTATR_FTN - virtual void TextFootnote_Impl(const SwFmtFtn&) SAL_OVERRIDE; + virtual void TextFootnote_Impl(const SwFormatFootnote&) SAL_OVERRIDE; /// Sfx item RES_PARATR_LINESPACING virtual void ParaLineSpacing_Impl(short nSpace, short nMulti) SAL_OVERRIDE; @@ -346,7 +346,7 @@ protected: virtual void ParaAdjust(const SvxAdjustItem& rAdjust) SAL_OVERRIDE; /// Sfx item RES_PARATR_SPLIT - virtual void ParaSplit(const SvxFmtSplitItem& rSplit) SAL_OVERRIDE; + virtual void ParaSplit(const SvxFormatSplitItem& rSplit) SAL_OVERRIDE; /// Sfx item RES_PARATR_WIDOWS virtual void ParaWidows(const SvxWidowsItem& rWidows) SAL_OVERRIDE; @@ -358,7 +358,7 @@ protected: virtual void ParaHyphenZone(const SvxHyphenZoneItem&) SAL_OVERRIDE; /// Sfx item RES_PARATR_NUMRULE - virtual void ParaNumRule_Impl(const SwTxtNode* pTxtNd, sal_Int32 nLvl, sal_Int32 nNumId) SAL_OVERRIDE; + virtual void ParaNumRule_Impl(const SwTextNode* pTextNd, sal_Int32 nLvl, sal_Int32 nNumId) SAL_OVERRIDE; /// Sfx item RES_PARATR_SCRIPTSPACE virtual void ParaScriptSpace(const SfxBoolItem&) SAL_OVERRIDE; @@ -376,7 +376,7 @@ protected: virtual void ParaSnapToGrid(const SvxParaGridItem&) SAL_OVERRIDE; /// Sfx item RES_FRM_SIZE - virtual void FormatFrameSize(const SwFmtFrmSize&) SAL_OVERRIDE; + virtual void FormatFrameSize(const SwFormatFrmSize&) SAL_OVERRIDE; /// Sfx item RES_PAPER_BIN virtual void FormatPaperBin(const SvxPaperBinItem&) SAL_OVERRIDE; @@ -388,16 +388,16 @@ protected: virtual void FormatULSpace(const SvxULSpaceItem& rULSpace) SAL_OVERRIDE; /// Sfx item RES_SURROUND - virtual void FormatSurround(const SwFmtSurround&) SAL_OVERRIDE; + virtual void FormatSurround(const SwFormatSurround&) SAL_OVERRIDE; /// Sfx item RES_VERT_ORIENT - virtual void FormatVertOrientation(const SwFmtVertOrient&) SAL_OVERRIDE; + virtual void FormatVertOrientation(const SwFormatVertOrient&) SAL_OVERRIDE; /// Sfx item RES_HORI_ORIENT - virtual void FormatHorizOrientation(const SwFmtHoriOrient&) SAL_OVERRIDE; + virtual void FormatHorizOrientation(const SwFormatHoriOrient&) SAL_OVERRIDE; /// Sfx item RES_ANCHOR - virtual void FormatAnchor(const SwFmtAnchor&) SAL_OVERRIDE; + virtual void FormatAnchor(const SwFormatAnchor&) SAL_OVERRIDE; /// Sfx item RES_BACKGROUND virtual void FormatBackground(const SvxBrushItem&) SAL_OVERRIDE; @@ -412,16 +412,16 @@ protected: virtual void FormatBox(const SvxBoxItem&) SAL_OVERRIDE; /// Sfx item RES_COL - virtual void FormatColumns_Impl(sal_uInt16 nCols, const SwFmtCol& rCol, bool bEven, SwTwips nPageSize) SAL_OVERRIDE; + virtual void FormatColumns_Impl(sal_uInt16 nCols, const SwFormatCol& rCol, bool bEven, SwTwips nPageSize) SAL_OVERRIDE; /// Sfx item RES_KEEP - virtual void FormatKeep(const SvxFmtKeepItem&) SAL_OVERRIDE; + virtual void FormatKeep(const SvxFormatKeepItem&) SAL_OVERRIDE; /// Sfx item RES_TEXTGRID virtual void FormatTextGrid(const SwTextGridItem&) SAL_OVERRIDE; /// Sfx item RES_LINENUMBER - virtual void FormatLineNumbering(const SwFmtLineNumber&) SAL_OVERRIDE; + virtual void FormatLineNumbering(const SwFormatLineNumber&) SAL_OVERRIDE; /// Sfx item RES_FRAMEDIR virtual void FormatFrameDirection(const SvxFrameDirectionItem&) SAL_OVERRIDE; @@ -436,14 +436,14 @@ protected: virtual void ParaOutlineLevel(const SfxUInt16Item&) SAL_OVERRIDE; /// Write the expanded field - virtual void WriteExpand(const SwField* pFld) SAL_OVERRIDE; + virtual void WriteExpand(const SwField* pField) SAL_OVERRIDE; - virtual void RefField(const SwField& rFld, const OUString& rRef) SAL_OVERRIDE; - virtual void HiddenField(const SwField& rFld) SAL_OVERRIDE; - virtual void SetField(const SwField& rFld, ww::eField eType, const OUString& rCmd) SAL_OVERRIDE; - virtual void PostitField(const SwField* pFld) SAL_OVERRIDE; - virtual bool DropdownField(const SwField* pFld) SAL_OVERRIDE; - virtual bool PlaceholderField(const SwField* pFld) SAL_OVERRIDE; + virtual void RefField(const SwField& rField, const OUString& rRef) SAL_OVERRIDE; + virtual void HiddenField(const SwField& rField) SAL_OVERRIDE; + virtual void SetField(const SwField& rField, ww::eField eType, const OUString& rCmd) SAL_OVERRIDE; + virtual void PostitField(const SwField* pField) SAL_OVERRIDE; + virtual bool DropdownField(const SwField* pField) SAL_OVERRIDE; + virtual bool PlaceholderField(const SwField* pField) SAL_OVERRIDE; /// Reference to the export, where to get the data from RtfExport& m_rExport; @@ -451,11 +451,11 @@ protected: private: /// Output graphic fly frames. - void FlyFrameGraphic(const SwFlyFrmFmt* pFlyFrmFmt, const SwGrfNode* pGrfNode); - void FlyFrameOLE(const SwFlyFrmFmt* pFlyFrmFmt, SwOLENode& rOLENode, const Size& rSize); - void FlyFrameOLEReplacement(const SwFlyFrmFmt* pFlyFrmFmt, SwOLENode& rOLENode, const Size& rSize); + void FlyFrameGraphic(const SwFlyFrameFormat* pFlyFrameFormat, const SwGrfNode* pGrfNode); + void FlyFrameOLE(const SwFlyFrameFormat* pFlyFrameFormat, SwOLENode& rOLENode, const Size& rSize); + void FlyFrameOLEReplacement(const SwFlyFrameFormat* pFlyFrameFormat, SwOLENode& rOLENode, const Size& rSize); /// Math export. - bool FlyFrameOLEMath(const SwFlyFrmFmt* pFlyFrmFmt, SwOLENode& rOLENode, const Size& rSize); + bool FlyFrameOLEMath(const SwFlyFrameFormat* pFlyFrameFormat, SwOLENode& rOLENode, const Size& rSize); /* * Table methods. @@ -472,7 +472,7 @@ private: /// End cell, row, and even the entire table if necessary. void FinishTableRowCell(ww8::WW8TableNodeInfoInner::Pointer_t pInner, bool bForceEmptyParagraph = false); - void WriteTextFootnoteNumStr(const SwFmtFtn& rFootnote); + void WriteTextFootnoteNumStr(const SwFormatFootnote& rFootnote); /* * Current style name and its ID. @@ -535,7 +535,7 @@ private: /* * Remember if we wrote a \cell or not. */ - bool m_bTblAfterCell; + bool m_bTableAfterCell; /* * For late output of row definitions. |