sw/source/filter/ww8/rtfattributeoutput.hxx | 310 ++++++++++++++--------------
sw/source/filter/ww8/rtfexport.hxx | 90 ++++----
sw/source/filter/ww8/rtfsdrexport.hxx | 14 -
3 files changed, 207 insertions(+), 207 deletions(-)
New commits:
commit 9b2aeefa48a245b11b499401276263e3a9241325
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Thu Jun 1 09:04:56 2017 +0200
sw RTF export: remove redundant virtual keywords
Change-Id: Iabc62f8166cb4f2013fc6c2908c8172f9acb0336
Reviewed-on: https://gerrit.libreoffice.org/38294
Tested-by: Jenkins <c...@libreoffice.org>
Reviewed-by: Miklos Vajna <vmik...@collabora.co.uk>
diff --git a/sw/source/filter/ww8/rtfattributeoutput.hxx
b/sw/source/filter/ww8/rtfattributeoutput.hxx
index 23e8466681da..fe790f91a497 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.hxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.hxx
@@ -42,40 +42,40 @@ class RtfAttributeOutput : public AttributeOutputBase
friend class RtfStringBufferValue;
public:
/// Export the state of RTL/CJK.
- virtual void RTLAndCJKState(bool bIsRTL, sal_uInt16 nScript) override;
+ void RTLAndCJKState(bool bIsRTL, sal_uInt16 nScript) override;
/// Start of the paragraph.
- virtual void StartParagraph(ww8::WW8TableNodeInfo::Pointer_t
pTextNodeInfo) override;
+ void StartParagraph(ww8::WW8TableNodeInfo::Pointer_t pTextNodeInfo)
override;
/// End of the paragraph.
- virtual void EndParagraph(ww8::WW8TableNodeInfoInner::Pointer_t
pTextNodeInfoInner) override;
+ void EndParagraph(ww8::WW8TableNodeInfoInner::Pointer_t
pTextNodeInfoInner) override;
/// Empty paragraph.
- virtual void EmptyParagraph() override;
+ void EmptyParagraph() override;
/// Called in order to output section breaks.
- virtual void SectionBreaks(const SwNode& rNode) override;
+ void SectionBreaks(const SwNode& rNode) override;
/// Called before we start outputting the attributes.
- virtual void StartParagraphProperties() override;
+ void StartParagraphProperties() override;
/// Called after we end outputting the attributes.
- virtual void EndParagraphProperties(const SfxItemSet&
rParagraphMarkerProperties, const SwRedlineData* pRedlineData, const
SwRedlineData* pRedlineParagraphMarkerDeleted, const SwRedlineData*
pRedlineParagraphMarkerInserted) override;
+ void EndParagraphProperties(const SfxItemSet& rParagraphMarkerProperties,
const SwRedlineData* pRedlineData, const SwRedlineData*
pRedlineParagraphMarkerDeleted, const SwRedlineData*
pRedlineParagraphMarkerInserted) override;
/// Start of the text run.
- virtual void StartRun(const SwRedlineData* pRedlineData, bool
bSingleEmptyRun = false) override;
+ void StartRun(const SwRedlineData* pRedlineData, bool bSingleEmptyRun =
false) override;
/// End of the text run.
- virtual void EndRun() override;
+ void EndRun() override;
/// Called before we start outputting the attributes.
- virtual void StartRunProperties() override;
+ void StartRunProperties() override;
/// Called after we end outputting the attributes.
- virtual void EndRunProperties(const SwRedlineData* pRedlineData) override;
+ void EndRunProperties(const SwRedlineData* pRedlineData) override;
/// Output text (inside a run).
- virtual void RunText(const OUString& rText, rtl_TextEncoding eCharSet =
RTL_TEXTENCODING_UTF8) override;
+ void RunText(const OUString& rText, rtl_TextEncoding eCharSet =
RTL_TEXTENCODING_UTF8) override;
// Access to (anyway) private buffers, used by the sdr exporter
OStringBuffer& RunText();
@@ -86,133 +86,133 @@ public:
OStringBuffer& StylesEnd();
/// Output text (without markup).
- virtual void RawText(const OUString& rText, rtl_TextEncoding eCharSet)
override;
+ void RawText(const OUString& rText, rtl_TextEncoding eCharSet) override;
/// Output ruby start.
- virtual void StartRuby(const SwTextNode& rNode, sal_Int32 nPos, const
SwFormatRuby& rRuby) override;
+ void StartRuby(const SwTextNode& rNode, sal_Int32 nPos, const
SwFormatRuby& rRuby) override;
/// Output ruby end.
- virtual void EndRuby() override;
+ void EndRuby() override;
/// Output URL start.
- virtual bool StartURL(const OUString& rUrl, const OUString& rTarget)
override;
+ bool StartURL(const OUString& rUrl, const OUString& rTarget) override;
/// Output URL end.
- virtual bool EndURL(bool isAtEndOfParagraph) override;
+ bool EndURL(bool isAtEndOfParagraph) override;
- virtual void FieldVanish(const OUString& rText, ww::eField eType) override;
+ void FieldVanish(const OUString& rText, ww::eField eType) override;
/// Output redlining.
///
/// The common attribute that can be among the run properties.
- virtual void Redline(const SwRedlineData* pRedline) override;
+ void Redline(const SwRedlineData* pRedline) override;
- virtual void FormatDrop(const SwTextNode& rNode, const SwFormatDrop&
rSwFormatDrop, sal_uInt16 nStyle, ww8::WW8TableNodeInfo::Pointer_t
pTextNodeInfo, ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner)
override;
+ void FormatDrop(const SwTextNode& rNode, const SwFormatDrop&
rSwFormatDrop, sal_uInt16 nStyle, ww8::WW8TableNodeInfo::Pointer_t
pTextNodeInfo, ww8::WW8TableNodeInfoInner::Pointer_t pTextNodeInfoInner)
override;
/// Output style.
- virtual void ParagraphStyle(sal_uInt16 nStyle) override;
-
- virtual void TableInfoCell(ww8::WW8TableNodeInfoInner::Pointer_t
pTableTextNodeInfoInner) override;
- virtual void TableInfoRow(ww8::WW8TableNodeInfoInner::Pointer_t
pTableTextNodeInfoInner) override;
- virtual void TableDefinition(ww8::WW8TableNodeInfoInner::Pointer_t
pTableTextNodeInfoInner) override;
- virtual void TableDefaultBorders(ww8::WW8TableNodeInfoInner::Pointer_t
pTableTextNodeInfoInner) override;
- virtual void TableBackgrounds(ww8::WW8TableNodeInfoInner::Pointer_t
pTableTextNodeInfoInner) override;
- virtual void TableRowRedline(ww8::WW8TableNodeInfoInner::Pointer_t
pTableTextNodeInfoInner) override;
- virtual void TableCellRedline(ww8::WW8TableNodeInfoInner::Pointer_t
pTableTextNodeInfoInner) override;
- virtual void TableHeight(ww8::WW8TableNodeInfoInner::Pointer_t
pTableTextNodeInfoInner) override;
- virtual void TableCanSplit(ww8::WW8TableNodeInfoInner::Pointer_t
pTableTextNodeInfoInner) override;
- virtual void TableBidi(ww8::WW8TableNodeInfoInner::Pointer_t
pTableTextNodeInfoInner) override;
- virtual void TableVerticalCell(ww8::WW8TableNodeInfoInner::Pointer_t
pTableTextNodeInfoInner) override;
- virtual void TableNodeInfoInner(ww8::WW8TableNodeInfoInner::Pointer_t
pNodeInfoInner) override;
- virtual void TableOrientation(ww8::WW8TableNodeInfoInner::Pointer_t
pTableTextNodeInfoInner) override;
- virtual void TableSpacing(ww8::WW8TableNodeInfoInner::Pointer_t
pTableTextNodeInfoInner) override;
- virtual void TableRowEnd(sal_uInt32 nDepth) override;
+ void ParagraphStyle(sal_uInt16 nStyle) override;
+
+ void TableInfoCell(ww8::WW8TableNodeInfoInner::Pointer_t
pTableTextNodeInfoInner) override;
+ void TableInfoRow(ww8::WW8TableNodeInfoInner::Pointer_t
pTableTextNodeInfoInner) override;
+ void TableDefinition(ww8::WW8TableNodeInfoInner::Pointer_t
pTableTextNodeInfoInner) override;
+ void TableDefaultBorders(ww8::WW8TableNodeInfoInner::Pointer_t
pTableTextNodeInfoInner) override;
+ void TableBackgrounds(ww8::WW8TableNodeInfoInner::Pointer_t
pTableTextNodeInfoInner) override;
+ void TableRowRedline(ww8::WW8TableNodeInfoInner::Pointer_t
pTableTextNodeInfoInner) override;
+ void TableCellRedline(ww8::WW8TableNodeInfoInner::Pointer_t
pTableTextNodeInfoInner) override;
+ void TableHeight(ww8::WW8TableNodeInfoInner::Pointer_t
pTableTextNodeInfoInner) override;
+ void TableCanSplit(ww8::WW8TableNodeInfoInner::Pointer_t
pTableTextNodeInfoInner) override;
+ void TableBidi(ww8::WW8TableNodeInfoInner::Pointer_t
pTableTextNodeInfoInner) override;
+ void TableVerticalCell(ww8::WW8TableNodeInfoInner::Pointer_t
pTableTextNodeInfoInner) override;
+ void TableNodeInfoInner(ww8::WW8TableNodeInfoInner::Pointer_t
pNodeInfoInner) override;
+ void TableOrientation(ww8::WW8TableNodeInfoInner::Pointer_t
pTableTextNodeInfoInner) override;
+ void TableSpacing(ww8::WW8TableNodeInfoInner::Pointer_t
pTableTextNodeInfoInner) override;
+ void TableRowEnd(sal_uInt32 nDepth) override;
/// Start of the styles table.
- virtual void StartStyles() override;
+ void StartStyles() override;
/// End of the styles table.
- virtual void EndStyles(sal_uInt16 nNumberOfStyles) override;
+ void EndStyles(sal_uInt16 nNumberOfStyles) override;
/// Write default style.
- virtual void DefaultStyle() override;
+ void DefaultStyle() override;
/// Start of a style in the styles table.
- virtual void StartStyle(const OUString& rName, StyleType eType,
- sal_uInt16 nBase, sal_uInt16 nNext, sal_uInt16
nWwId, sal_uInt16 nId,
- bool bAutoUpdate) override;
+ void StartStyle(const OUString& rName, StyleType eType,
+ sal_uInt16 nBase, sal_uInt16 nNext, sal_uInt16 nWwId,
sal_uInt16 nId,
+ bool bAutoUpdate) override;
/// End of a style in the styles table.
- virtual void EndStyle() override;
+ void EndStyle() override;
/// Start of (paragraph or run) properties of a style.
- virtual void StartStyleProperties(bool bParProp, sal_uInt16 nStyle)
override;
+ void StartStyleProperties(bool bParProp, sal_uInt16 nStyle) override;
/// End of (paragraph or run) properties of a style.
- virtual void EndStyleProperties(bool bParProp) override;
+ void EndStyleProperties(bool bParProp) override;
/// Numbering rule and Id.
- virtual void OutlineNumbering(sal_uInt8 nLvl) override;
+ void OutlineNumbering(sal_uInt8 nLvl) override;
/// Page break
/// As a paragraph property - the paragraph should be on the next page.
- virtual void PageBreakBefore(bool bBreak) override;
+ void PageBreakBefore(bool bBreak) override;
/// Write a section break
/// msword::ColumnBreak or msword::PageBreak
- virtual void SectionBreak(sal_uInt8 nC, const WW8_SepInfo* pSectionInfo =
nullptr) override;
+ void SectionBreak(sal_uInt8 nC, const WW8_SepInfo* pSectionInfo = nullptr)
override;
/// Start of the section properties.
- virtual void StartSection() override;
+ void StartSection() override;
/// End of the section properties.
- virtual void EndSection() override;
+ void EndSection() override;
/// Protection of forms.
- virtual void SectionFormProtection(bool bProtected) override;
+ void SectionFormProtection(bool bProtected) override;
/// Numbering of the lines in the document.
- virtual void SectionLineNumbering(sal_uLong nRestartNo, const
SwLineNumberInfo& rLnNumInfo) override;
+ void SectionLineNumbering(sal_uLong nRestartNo, const SwLineNumberInfo&
rLnNumInfo) override;
/// Has different headers/footers for the title page.
- virtual void SectionTitlePage() override;
+ void SectionTitlePage() override;
/// Description of the page borders.
- virtual void SectionPageBorders(const SwFrameFormat* pFormat, const
SwFrameFormat* pFirstPageFormat) override;
+ void SectionPageBorders(const SwFrameFormat* pFormat, const SwFrameFormat*
pFirstPageFormat) override;
/// Columns populated from right/numbers on the right side?
- virtual void SectionBiDi(bool bBiDi) override;
+ void SectionBiDi(bool bBiDi) override;
/// The style of the page numbers.
///
- virtual void SectionPageNumbering(sal_uInt16 nNumType, const
::boost::optional<sal_uInt16>& oPageRestartNumber) override;
+ void SectionPageNumbering(sal_uInt16 nNumType, const
::boost::optional<sal_uInt16>& oPageRestartNumber) override;
/// The type of breaking.
- virtual void SectionType(sal_uInt8 nBreakCode) override;
+ void SectionType(sal_uInt8 nBreakCode) override;
/// Definition of a numbering instance.
- virtual void NumberingDefinition(sal_uInt16 nId, const SwNumRule& rRule)
override;
+ void NumberingDefinition(sal_uInt16 nId, const SwNumRule& rRule) override;
/// Start of the abstract numbering definition instance.
- virtual void StartAbstractNumbering(sal_uInt16 nId) override;
+ void StartAbstractNumbering(sal_uInt16 nId) override;
/// End of the abstract numbering definition instance.
- virtual void EndAbstractNumbering() override;
+ void EndAbstractNumbering() override;
/// All the numbering level information.
- virtual void NumberingLevel(sal_uInt8 nLevel,
- sal_uInt16 nStart,
- sal_uInt16 nNumberingType,
- SvxAdjust eAdjust,
- const sal_uInt8* pNumLvlPos,
- sal_uInt8 nFollow,
- const wwFont* pFont,
- const SfxItemSet* pOutSet,
- sal_Int16 nIndentAt,
- sal_Int16 nFirstLineIndex,
- sal_Int16 nListTabPos,
- const OUString& rNumberingString,
- const SvxBrushItem* pBrush) override;//For
i120928,to export graphic of bullet
+ void NumberingLevel(sal_uInt8 nLevel,
+ sal_uInt16 nStart,
+ sal_uInt16 nNumberingType,
+ SvxAdjust eAdjust,
+ const sal_uInt8* pNumLvlPos,
+ sal_uInt8 nFollow,
+ const wwFont* pFont,
+ const SfxItemSet* pOutSet,
+ sal_Int16 nIndentAt,
+ sal_Int16 nFirstLineIndex,
+ sal_Int16 nListTabPos,
+ const OUString& rNumberingString,
+ const SvxBrushItem* pBrush) override;//For i120928,to
export graphic of bullet
void WriteField_Impl(const SwField* pField, ww::eField eType, const
OUString& rFieldCmd, FieldFlags nMode);
void WriteBookmarks_Impl(std::vector< OUString >& rStarts, std::vector<
OUString >& rEnds);
@@ -221,230 +221,230 @@ public:
protected:
/// Output frames - the implementation.
- virtual void OutputFlyFrame_Impl(const ww8::Frame& rFormat, const Point&
rNdTopLeft) override;
+ void OutputFlyFrame_Impl(const ww8::Frame& rFormat, const Point&
rNdTopLeft) override;
/// Sfx item Sfx item RES_CHRATR_CASEMAP
- virtual void CharCaseMap(const SvxCaseMapItem& rCaseMap) override;
+ void CharCaseMap(const SvxCaseMapItem& rCaseMap) override;
/// Sfx item Sfx item RES_CHRATR_COLOR
- virtual void CharColor(const SvxColorItem& rColor) override;
+ void CharColor(const SvxColorItem& rColor) override;
/// Sfx item Sfx item RES_CHRATR_CONTOUR
- virtual void CharContour(const SvxContourItem& rContour) override;
+ void CharContour(const SvxContourItem& rContour) override;
/// Sfx item RES_CHRATR_CROSSEDOUT
- virtual void CharCrossedOut(const SvxCrossedOutItem& rCrossedOut) override;
+ void CharCrossedOut(const SvxCrossedOutItem& rCrossedOut) override;
/// Sfx item RES_CHRATR_ESCAPEMENT
- virtual void CharEscapement(const SvxEscapementItem& rEscapement) override;
+ void CharEscapement(const SvxEscapementItem& rEscapement) override;
/// Sfx item RES_CHRATR_FONT
- virtual void CharFont(const SvxFontItem& rFont) override;
+ void CharFont(const SvxFontItem& rFont) override;
/// Sfx item RES_CHRATR_FONTSIZE
- virtual void CharFontSize(const SvxFontHeightItem& rFontSize) override;
+ void CharFontSize(const SvxFontHeightItem& rFontSize) override;
/// Sfx item RES_CHRATR_KERNING
- virtual void CharKerning(const SvxKerningItem& rKerning) override;
+ void CharKerning(const SvxKerningItem& rKerning) override;
/// Sfx item RES_CHRATR_LANGUAGE
- virtual void CharLanguage(const SvxLanguageItem& rLanguage) override;
+ void CharLanguage(const SvxLanguageItem& rLanguage) override;
/// Sfx item RES_CHRATR_POSTURE
- virtual void CharPosture(const SvxPostureItem& rPosture) override;
+ void CharPosture(const SvxPostureItem& rPosture) override;
/// Sfx item RES_CHRATR_SHADOWED
- virtual void CharShadow(const SvxShadowedItem& rShadow) override;
+ void CharShadow(const SvxShadowedItem& rShadow) override;
/// Sfx item RES_CHRATR_UNDERLINE
- virtual void CharUnderline(const SvxUnderlineItem& rUnderline) override;
+ void CharUnderline(const SvxUnderlineItem& rUnderline) override;
/// Sfx item RES_CHRATR_WEIGHT
- virtual void CharWeight(const SvxWeightItem& rWeight) override;
+ void CharWeight(const SvxWeightItem& rWeight) override;
/// Sfx item RES_CHRATR_AUTOKERN
- virtual void CharAutoKern(const SvxAutoKernItem&) override;
+ void CharAutoKern(const SvxAutoKernItem&) override;
/// Sfx item RES_CHRATR_BLINK
- virtual void CharAnimatedText(const SvxBlinkItem& rBlink) override;
+ void CharAnimatedText(const SvxBlinkItem& rBlink) override;
/// Sfx item RES_CHRATR_BACKGROUND
- virtual void CharBackground(const SvxBrushItem& rBrush) override;
+ void CharBackground(const SvxBrushItem& rBrush) override;
/// Sfx item RES_CHRATR_CJK_FONT
- virtual void CharFontCJK(const SvxFontItem& rFont) override;
+ void CharFontCJK(const SvxFontItem& rFont) override;
/// Sfx item RES_CHRATR_CJK_FONTSIZE
- virtual void CharFontSizeCJK(const SvxFontHeightItem& rFontSize) override;
+ void CharFontSizeCJK(const SvxFontHeightItem& rFontSize) override;
/// Sfx item RES_CHRATR_CJK_LANGUAGE
- virtual void CharLanguageCJK(const SvxLanguageItem& rLanguageItem)
override;
+ void CharLanguageCJK(const SvxLanguageItem& rLanguageItem) override;
/// Sfx item RES_CHRATR_CJK_POSTURE
- virtual void CharPostureCJK(const SvxPostureItem& rPosture) override;
+ void CharPostureCJK(const SvxPostureItem& rPosture) override;
/// Sfx item RES_CHRATR_CJK_WEIGHT
- virtual void CharWeightCJK(const SvxWeightItem& rWeight) override;
+ void CharWeightCJK(const SvxWeightItem& rWeight) override;
/// Sfx item RES_CHRATR_CTL_FONT
- virtual void CharFontCTL(const SvxFontItem& rFont) override;
+ void CharFontCTL(const SvxFontItem& rFont) override;
/// Sfx item RES_CHRATR_CTL_FONTSIZE
- virtual void CharFontSizeCTL(const SvxFontHeightItem& rFontSize) override;
+ void CharFontSizeCTL(const SvxFontHeightItem& rFontSize) override;
/// Sfx item RES_CHRATR_CTL_LANGUAGE
- virtual void CharLanguageCTL(const SvxLanguageItem& rLanguageItem)
override;
+ void CharLanguageCTL(const SvxLanguageItem& rLanguageItem) override;
/// Sfx item RES_CHRATR_CTL_POSTURE
- virtual void CharPostureCTL(const SvxPostureItem& rWeight) override;
+ void CharPostureCTL(const SvxPostureItem& rWeight) override;
/// Sfx item RES_CHRATR_CTL_WEIGHT
- virtual void CharWeightCTL(const SvxWeightItem& rWeight) override;
+ void CharWeightCTL(const SvxWeightItem& rWeight) override;
/// Sfx item RES_CHRATR_BidiRTL
- virtual void CharBidiRTL(const SfxPoolItem&) override;
+ void CharBidiRTL(const SfxPoolItem&) override;
/// Sfx item RES_CHRATR_IdctHint
- virtual void CharIdctHint(const SfxPoolItem&) override;
+ void CharIdctHint(const SfxPoolItem&) override;
/// Sfx item RES_CHRATR_ROTATE
- virtual void CharRotate(const SvxCharRotateItem& rRotate) override;
+ void CharRotate(const SvxCharRotateItem& rRotate) override;
/// Sfx item RES_CHRATR_EMPHASIS_MARK
- virtual void CharEmphasisMark(const SvxEmphasisMarkItem& rEmphasisMark)
override;
+ void CharEmphasisMark(const SvxEmphasisMarkItem& rEmphasisMark) override;
/// Sfx item RES_CHRATR_TWO_LINES
- virtual void CharTwoLines(const SvxTwoLinesItem& rTwoLines) override;
+ void CharTwoLines(const SvxTwoLinesItem& rTwoLines) override;
/// Sfx item RES_CHRATR_SCALEW
- virtual void CharScaleWidth(const SvxCharScaleWidthItem& rScaleWidth)
override;
+ void CharScaleWidth(const SvxCharScaleWidthItem& rScaleWidth) override;
/// Sfx item RES_CHRATR_RELIEF
- virtual void CharRelief(const SvxCharReliefItem& rRelief) override;
+ void CharRelief(const SvxCharReliefItem& rRelief) override;
/// Sfx item RES_CHRATR_HIDDEN
- virtual void CharHidden(const SvxCharHiddenItem& rHidden) override;
+ void CharHidden(const SvxCharHiddenItem& rHidden) override;
/// Sfx item RES_CHRATR_BOX
- virtual void CharBorder(const ::editeng::SvxBorderLine* pAllBorder, const
sal_uInt16 nDist, const bool bShadow) override;
+ void CharBorder(const ::editeng::SvxBorderLine* pAllBorder, const
sal_uInt16 nDist, const bool bShadow) override;
/// Sfx item RES_CHRATR_HIGHLIGHT
- virtual void CharHighlight(const SvxBrushItem&) override;
+ void CharHighlight(const SvxBrushItem&) override;
/// Sfx item RES_TXTATR_INETFMT
- virtual void TextINetFormat(const SwFormatINetFormat&) override;
+ void TextINetFormat(const SwFormatINetFormat&) override;
/// Sfx item RES_TXTATR_CHARFMT
- virtual void TextCharFormat(const SwFormatCharFormat&) override;
+ void TextCharFormat(const SwFormatCharFormat&) override;
/// Sfx item RES_TXTATR_FTN
- virtual void TextFootnote_Impl(const SwFormatFootnote&) override;
+ void TextFootnote_Impl(const SwFormatFootnote&) override;
/// Sfx item RES_PARATR_LINESPACING
- virtual void ParaLineSpacing_Impl(short nSpace, short nMulti) override;
+ void ParaLineSpacing_Impl(short nSpace, short nMulti) override;
/// Sfx item RES_PARATR_ADJUST
- virtual void ParaAdjust(const SvxAdjustItem& rAdjust) override;
+ void ParaAdjust(const SvxAdjustItem& rAdjust) override;
/// Sfx item RES_PARATR_SPLIT
- virtual void ParaSplit(const SvxFormatSplitItem& rSplit) override;
+ void ParaSplit(const SvxFormatSplitItem& rSplit) override;
/// Sfx item RES_PARATR_WIDOWS
- virtual void ParaWidows(const SvxWidowsItem& rWidows) override;
+ void ParaWidows(const SvxWidowsItem& rWidows) override;
/// Sfx item RES_PARATR_TABSTOP
- virtual void ParaTabStop(const SvxTabStopItem& rTabStop) override;
+ void ParaTabStop(const SvxTabStopItem& rTabStop) override;
/// Sfx item RES_PARATR_HYPHENZONE
- virtual void ParaHyphenZone(const SvxHyphenZoneItem&) override;
+ void ParaHyphenZone(const SvxHyphenZoneItem&) override;
/// Sfx item RES_PARATR_NUMRULE
- virtual void ParaNumRule_Impl(const SwTextNode* pTextNd, sal_Int32 nLvl,
sal_Int32 nNumId) override;
+ void ParaNumRule_Impl(const SwTextNode* pTextNd, sal_Int32 nLvl, sal_Int32
nNumId) override;
/// Sfx item RES_PARATR_SCRIPTSPACE
- virtual void ParaScriptSpace(const SfxBoolItem&) override;
+ void ParaScriptSpace(const SfxBoolItem&) override;
/// Sfx item RES_PARATR_HANGINGPUNCTUATION
- virtual void ParaHangingPunctuation(const SfxBoolItem&) override;
+ void ParaHangingPunctuation(const SfxBoolItem&) override;
/// Sfx item RES_PARATR_FORBIDDEN_RULES
- virtual void ParaForbiddenRules(const SfxBoolItem&) override;
+ void ParaForbiddenRules(const SfxBoolItem&) override;
/// Sfx item RES_PARATR_VERTALIGN
- virtual void ParaVerticalAlign(const SvxParaVertAlignItem& rAlign)
override;
+ void ParaVerticalAlign(const SvxParaVertAlignItem& rAlign) override;
/// Sfx item RES_PARATR_SNAPTOGRID
- virtual void ParaSnapToGrid(const SvxParaGridItem&) override;
+ void ParaSnapToGrid(const SvxParaGridItem&) override;
/// Sfx item RES_FRM_SIZE
- virtual void FormatFrameSize(const SwFormatFrameSize&) override;
+ void FormatFrameSize(const SwFormatFrameSize&) override;
/// Sfx item RES_PAPER_BIN
- virtual void FormatPaperBin(const SvxPaperBinItem&) override;
+ void FormatPaperBin(const SvxPaperBinItem&) override;
/// Sfx item RES_LR_SPACE
- virtual void FormatLRSpace(const SvxLRSpaceItem& rLRSpace) override;
+ void FormatLRSpace(const SvxLRSpaceItem& rLRSpace) override;
/// Sfx item RES_UL_SPACE
- virtual void FormatULSpace(const SvxULSpaceItem& rULSpace) override;
+ void FormatULSpace(const SvxULSpaceItem& rULSpace) override;
/// Sfx item RES_SURROUND
- virtual void FormatSurround(const SwFormatSurround&) override;
+ void FormatSurround(const SwFormatSurround&) override;
/// Sfx item RES_VERT_ORIENT
- virtual void FormatVertOrientation(const SwFormatVertOrient&) override;
+ void FormatVertOrientation(const SwFormatVertOrient&) override;
/// Sfx item RES_HORI_ORIENT
- virtual void FormatHorizOrientation(const SwFormatHoriOrient&) override;
+ void FormatHorizOrientation(const SwFormatHoriOrient&) override;
/// Sfx item RES_ANCHOR
- virtual void FormatAnchor(const SwFormatAnchor&) override;
+ void FormatAnchor(const SwFormatAnchor&) override;
/// Sfx item RES_BACKGROUND
- virtual void FormatBackground(const SvxBrushItem&) override;
+ void FormatBackground(const SvxBrushItem&) override;
/// Sfx item RES_FILL_STYLE
- virtual void FormatFillStyle(const XFillStyleItem&) override;
+ void FormatFillStyle(const XFillStyleItem&) override;
/// Sfx item RES_FILL_GRADIENT
- virtual void FormatFillGradient(const XFillGradientItem&) override;
+ void FormatFillGradient(const XFillGradientItem&) override;
/// Sfx item RES_BOX
- virtual void FormatBox(const SvxBoxItem&) override;
+ void FormatBox(const SvxBoxItem&) override;
/// Sfx item RES_COL
- virtual void FormatColumns_Impl(sal_uInt16 nCols, const SwFormatCol& rCol,
bool bEven, SwTwips nPageSize) override;
+ void FormatColumns_Impl(sal_uInt16 nCols, const SwFormatCol& rCol, bool
bEven, SwTwips nPageSize) override;
/// Sfx item RES_KEEP
- virtual void FormatKeep(const SvxFormatKeepItem&) override;
+ void FormatKeep(const SvxFormatKeepItem&) override;
/// Sfx item RES_TEXTGRID
- virtual void FormatTextGrid(const SwTextGridItem&) override;
+ void FormatTextGrid(const SwTextGridItem&) override;
/// Sfx item RES_LINENUMBER
- virtual void FormatLineNumbering(const SwFormatLineNumber&) override;
+ void FormatLineNumbering(const SwFormatLineNumber&) override;
/// Sfx item RES_FRAMEDIR
- virtual void FormatFrameDirection(const SvxFrameDirectionItem&) override;
+ void FormatFrameDirection(const SvxFrameDirectionItem&) override;
/// Sfx item RES_PARATR_GRABBAG
- virtual void ParaGrabBag(const SfxGrabBagItem&) override;
+ void ParaGrabBag(const SfxGrabBagItem&) override;
/// Sfx item RES_CHRATR_GRABBAG
- virtual void CharGrabBag(const SfxGrabBagItem&) override;
+ void CharGrabBag(const SfxGrabBagItem&) override;
/// Sfx item RES_PARATR_OUTLINELEVEL
- virtual void ParaOutlineLevel(const SfxUInt16Item&) override;
+ void ParaOutlineLevel(const SfxUInt16Item&) override;
/// Write the expanded field
- virtual void WriteExpand(const SwField* pField) override;
+ void WriteExpand(const SwField* pField) override;
- virtual void RefField(const SwField& rField, const OUString& rRef)
override;
- virtual void HiddenField(const SwField& rField) override;
- virtual void SetField(const SwField& rField, ww::eField eType, const
OUString& rCmd) override;
- virtual void PostitField(const SwField* pField) override;
- virtual bool DropdownField(const SwField* pField) override;
- virtual bool PlaceholderField(const SwField* pField) override;
+ void RefField(const SwField& rField, const OUString& rRef) override;
+ void HiddenField(const SwField& rField) override;
+ void SetField(const SwField& rField, ww::eField eType, const OUString&
rCmd) override;
+ void PostitField(const SwField* pField) override;
+ bool DropdownField(const SwField* pField) override;
+ bool PlaceholderField(const SwField* pField) override;
/// Reference to the export, where to get the data from
RtfExport& m_rExport;
@@ -607,10 +607,10 @@ private:
public:
explicit RtfAttributeOutput(RtfExport& rExport);
- virtual ~RtfAttributeOutput() override;
+ ~RtfAttributeOutput() override;
/// Return the right export class.
- virtual MSWordExportBase& GetExport() override;
+ MSWordExportBase& GetExport() override;
OStringBuffer m_aTabStop;
diff --git a/sw/source/filter/ww8/rtfexport.hxx
b/sw/source/filter/ww8/rtfexport.hxx
index 106d615d3ae2..0cda386b7736 100644
--- a/sw/source/filter/ww8/rtfexport.hxx
+++ b/sw/source/filter/ww8/rtfexport.hxx
@@ -50,110 +50,110 @@ class RtfExport : public MSWordExportBase
public:
/// Access to the attribute output class.
- virtual AttributeOutputBase& AttrOutput() const override;
+ AttributeOutputBase& AttrOutput() const override;
/// Access to the sections/headers/footres.
- virtual MSWordSections& Sections() const override;
+ MSWordSections& Sections() const override;
/// Access to the Rtf Sdr exporter.
RtfSdrExport& SdrExporter() const;
- virtual bool SupportsOneColumnBreak() const override
+ bool SupportsOneColumnBreak() const override
{
return false;
}
- virtual bool FieldsQuoted() const override
+ bool FieldsQuoted() const override
{
return true;
}
- virtual bool AddSectionBreaksForTOX() const override
+ bool AddSectionBreaksForTOX() const override
{
return false;
}
- virtual bool PreferPageBreakBefore() const override
+ bool PreferPageBreakBefore() const override
{
return true;
}
/// Guess the script (asian/western).
- virtual bool CollapseScriptsforWordOk(sal_uInt16 nScript, sal_uInt16
nWhich) override;
+ bool CollapseScriptsforWordOk(sal_uInt16 nScript, sal_uInt16 nWhich)
override;
- virtual void AppendBookmarks(const SwTextNode& rNode, sal_Int32 nAktPos,
sal_Int32 nLen) override;
+ void AppendBookmarks(const SwTextNode& rNode, sal_Int32 nAktPos, sal_Int32
nLen) override;
- virtual void AppendBookmark(const OUString& rName) override;
+ void AppendBookmark(const OUString& rName) override;
- virtual void AppendAnnotationMarks(const SwTextNode& rNode, sal_Int32
nAktPos, sal_Int32 nLen) override;
+ void AppendAnnotationMarks(const SwTextNode& rNode, sal_Int32 nAktPos,
sal_Int32 nLen) override;
//For i120928,add an interface to export graphic of bullet
- virtual void ExportGrfBullet(const SwTextNode& rNd) override;
+ void ExportGrfBullet(const SwTextNode& rNd) override;
- virtual void WriteCR(ww8::WW8TableNodeInfoInner::Pointer_t
/*pTableTextNodeInfoInner = ww8::WW8TableNodeInfoInner::Pointer_t()*/) override
+ void WriteCR(ww8::WW8TableNodeInfoInner::Pointer_t
/*pTableTextNodeInfoInner = ww8::WW8TableNodeInfoInner::Pointer_t()*/) override
{
/* no-op for rtf, most probably should not even be in MSWordExportBase
*/
}
- virtual void WriteChar(sal_Unicode) override;
+ void WriteChar(sal_Unicode) override;
/// Write the numbering table.
- virtual void WriteNumbering() override;
+ void WriteNumbering() override;
/// Write the revision table.
void WriteRevTab();
/// Output the actual headers and footers.
- virtual void WriteHeadersFooters(sal_uInt8 nHeadFootFlags,
- const SwFrameFormat& rFormat, const
SwFrameFormat& rLeftFormat, const SwFrameFormat& rFirstPageFormat, sal_uInt8
nBreakCode) override;
+ void WriteHeadersFooters(sal_uInt8 nHeadFootFlags,
+ const SwFrameFormat& rFormat, const
SwFrameFormat& rLeftFormat, const SwFrameFormat& rFirstPageFormat, sal_uInt8
nBreakCode) override;
/// Write the field
- virtual void OutputField(const SwField* pField, ww::eField eFieldType,
- const OUString& rFieldCmd, FieldFlags nMode =
FieldFlags::All) override;
+ void OutputField(const SwField* pField, ww::eField eFieldType,
+ const OUString& rFieldCmd, FieldFlags nMode =
FieldFlags::All) override;
/// Write the data of the form field
- virtual void WriteFormData(const ::sw::mark::IFieldmark& rFieldmark)
override;
- virtual void WriteHyperlinkData(const ::sw::mark::IFieldmark& rFieldmark)
override;
+ void WriteFormData(const ::sw::mark::IFieldmark& rFieldmark) override;
+ void WriteHyperlinkData(const ::sw::mark::IFieldmark& rFieldmark) override;
- virtual void DoComboBox(const OUString& rName,
- const OUString& rHelp,
- const OUString& ToolTip,
- const OUString& rSelected,
- css::uno::Sequence<OUString>& rListItems) override;
+ void DoComboBox(const OUString& rName,
+ const OUString& rHelp,
+ const OUString& ToolTip,
+ const OUString& rSelected,
+ css::uno::Sequence<OUString>& rListItems) override;
- virtual void DoFormText(const SwInputField* pField) override;
+ void DoFormText(const SwInputField* pField) override;
- virtual sal_uLong ReplaceCr(sal_uInt8 nChar) override;
+ sal_uLong ReplaceCr(sal_uInt8 nChar) override;
protected:
/// Format-dependent part of the actual export.
- virtual void ExportDocument_Impl() override;
+ void ExportDocument_Impl() override;
- virtual void SectionBreaksAndFrames(const SwTextNode& /*rNode*/) override
{}
+ void SectionBreaksAndFrames(const SwTextNode& /*rNode*/) override {}
/// Get ready for a new section.
- virtual void PrepareNewPageDesc(const SfxItemSet* pSet,
- const SwNode& rNd,
- const SwFormatPageDesc* pNewPgDescFormat,
- const SwPageDesc* pNewPgDesc) override;
+ void PrepareNewPageDesc(const SfxItemSet* pSet,
+ const SwNode& rNd,
+ const SwFormatPageDesc* pNewPgDescFormat,
+ const SwPageDesc* pNewPgDesc) override;
/// Return value indicates if an inherited outline numbering is suppressed.
- virtual bool DisallowInheritingOutlineNumbering(const SwFormat& rFormat)
override;
+ bool DisallowInheritingOutlineNumbering(const SwFormat& rFormat) override;
/// Output SwTextNode is depending on outline export mode
- virtual void OutputTextNode(const SwTextNode&) override;
+ void OutputTextNode(const SwTextNode&) override;
/// Output SwEndNode
- virtual void OutputEndNode(const SwEndNode&) override;
+ void OutputEndNode(const SwEndNode&) override;
/// Output SwGrfNode
- virtual void OutputGrfNode(const SwGrfNode&) override;
+ void OutputGrfNode(const SwGrfNode&) override;
/// Output SwOLENode
- virtual void OutputOLENode(const SwOLENode&) override;
+ void OutputOLENode(const SwOLENode&) override;
- virtual void OutputLinkedOLE(const OUString&) override;
+ void OutputLinkedOLE(const OUString&) override;
- virtual void AppendSection(const SwPageDesc* pPageDesc, const
SwSectionFormat* pFormat, sal_uLong nLnNum) override;
+ void AppendSection(const SwPageDesc* pPageDesc, const SwSectionFormat*
pFormat, sal_uLong nLnNum) override;
public:
/// Pass the pDocument, pCurrentPam and pOriginalPam to the base class.
@@ -161,8 +161,12 @@ public:
SwPaM* pCurrentPam, SwPaM* pOriginalPam, Writer* pWriter,
bool bOutOutlineOnly = false);
+ RtfExport(const RtfExport&) = delete;
+
+ RtfExport& operator=(const RtfExport&) = delete;
+
/// Destructor.
- virtual ~RtfExport() override;
+ ~RtfExport() override;
rtl_TextEncoding m_eDefaultEncoding;
rtl_TextEncoding m_eCurrentEncoding;
@@ -195,10 +199,6 @@ public:
OString* GetStyle(sal_uInt16 nId);
private:
- RtfExport(const RtfExport&) = delete;
-
- RtfExport& operator=(const RtfExport&) = delete;
-
void WriteFonts();
void WriteStyles();
void WriteFootnoteSettings();
diff --git a/sw/source/filter/ww8/rtfsdrexport.hxx
b/sw/source/filter/ww8/rtfsdrexport.hxx
index 0f060d1dafff..ec3167394430 100644
--- a/sw/source/filter/ww8/rtfsdrexport.hxx
+++ b/sw/source/filter/ww8/rtfsdrexport.hxx
@@ -58,7 +58,7 @@ class RtfSdrExport : public EscherEx
public:
explicit RtfSdrExport(RtfExport& rExport);
- virtual ~RtfSdrExport() override;
+ ~RtfSdrExport() override;
/// Export the sdr object as Sdr.
///
@@ -83,17 +83,17 @@ protected:
using EscherEx::EndShape;
void EndShape(sal_Int32 nShapeElement);
- virtual void Commit(EscherPropertyContainer& rProps, const
tools::Rectangle& rRect) override;
+ void Commit(EscherPropertyContainer& rProps, const tools::Rectangle&
rRect) override;
private:
- virtual void OpenContainer(sal_uInt16 nEscherContainer, int nRecInstance =
0) override;
- virtual void CloseContainer() override;
+ void OpenContainer(sal_uInt16 nEscherContainer, int nRecInstance = 0)
override;
+ void CloseContainer() override;
- virtual sal_uInt32 EnterGroup(const OUString& rShapeName, const
tools::Rectangle* pBoundRect) override;
- virtual void LeaveGroup() override;
+ sal_uInt32 EnterGroup(const OUString& rShapeName, const tools::Rectangle*
pBoundRect) override;
+ void LeaveGroup() override;
- virtual void AddShape(sal_uInt32 nShapeType, sal_uInt32 nShapeFlags,
sal_uInt32 nShapeId = 0) override;
+ void AddShape(sal_uInt32 nShapeType, sal_uInt32 nShapeFlags, sal_uInt32
nShapeId = 0) override;
private:
/// Add starting and ending point of a line to the m_pShapeAttrList.
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
