diff options
-rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 25 | ||||
-rw-r--r-- | sw/source/filter/ww8/rtfattributeoutput.cxx | 5 |
2 files changed, 30 insertions, 0 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 9a17f98eb637..ddad77684409 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -890,6 +890,9 @@ void DocxAttributeOutput::WriteCollectedParagraphProperties() } } +namespace +{ + /// Outputs an item set, that contains the formatting of the paragraph marker. void lcl_writeParagraphMarkerProperties(DocxAttributeOutput& rAttributeOutput, const SfxItemSet& rParagraphMarkerProperties) { @@ -921,6 +924,8 @@ void lcl_writeParagraphMarkerProperties(DocxAttributeOutput& rAttributeOutput, c } } +} + void DocxAttributeOutput::EndParagraphProperties(const SfxItemSet& rParagraphMarkerProperties, const SwRedlineData* pRedlineData, const SwRedlineData* pRedlineParagraphMarkerDeleted, const SwRedlineData* pRedlineParagraphMarkerInserted) { // Call the 'Redline' function. This will add redline (change-tracking) information that regards to paragraph properties. @@ -3086,6 +3091,9 @@ void DocxAttributeOutput::TableInfoRow( ww8::WW8TableNodeInfoInner::Pointer_t /* { } +namespace +{ + /// Does the same as comphelper::string::padToLength(), but extends the start, not the end. OString lcl_padStartToLength(OString const & aString, sal_Int32 nLen, sal_Char cFill) { @@ -3101,6 +3109,8 @@ OString lcl_padStartToLength(OString const & aString, sal_Int32 nLen, sal_Char c return aString; } +} + void DocxAttributeOutput::TableDefinition( ww8::WW8TableNodeInfoInner::Pointer_t pTableTextNodeInfoInner ) { bool bEcma = GetExport().GetFilter().getVersion( ) == oox::core::ECMA_DIALECT; @@ -3715,6 +3725,9 @@ sal_Int32 DocxStringGetToken(DocxStringTokenMap const * pMap, const OUString& rN return 0; } +namespace +{ + DocxStringTokenMap const aDefaultTokens[] = { {"defQFormat", XML_defQFormat}, {"defUnhideWhenUsed", XML_defUnhideWhenUsed}, @@ -3735,6 +3748,8 @@ DocxStringTokenMap const aExceptionTokens[] = { {0, 0} }; +} + void DocxAttributeOutput::LatentStyles() { // Do we have latent styles available? @@ -3787,6 +3802,9 @@ void DocxAttributeOutput::LatentStyles() m_pSerializer->endElementNS(XML_w, XML_latentStyles); } +namespace +{ + /// Should the font size we have written out as a default one? bool lcl_isDefaultFontSize(const SvxFontHeightItem& rFontHeight, SwDoc* pDoc) { @@ -3802,6 +3820,8 @@ bool lcl_isDefaultFontSize(const SvxFontHeightItem& rFontHeight, SwDoc* pDoc) return bRet; } +} + void DocxAttributeOutput::OutputDefaultItem(const SfxPoolItem& rHt) { bool bMustWrite = true; @@ -5319,6 +5339,9 @@ void DocxAttributeOutput::EndStyleProperties( bool bParProp ) } } +namespace +{ + void lcl_OutlineLevel(sax_fastparser::FSHelperPtr pSerializer, sal_uInt16 nLevel) { if (nLevel >= WW8ListManager::nMaxLevel) @@ -5329,6 +5352,8 @@ void lcl_OutlineLevel(sax_fastparser::FSHelperPtr pSerializer, sal_uInt16 nLevel FSEND); } +} + void DocxAttributeOutput::OutlineNumbering(sal_uInt8 const nLvl) { lcl_OutlineLevel(m_pSerializer, nLvl); diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 9d164f88b203..7ba1699d4798 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -1547,6 +1547,9 @@ void RtfAttributeOutput::WriteHeaderFooter_Impl(const SwFrameFormat& rFormat, bo m_aRun = aRun; } +namespace +{ + void lcl_TextFrameShadow(std::vector< std::pair<OString, OString> >& rFlyProperties, const SwFrameFormat& rFrameFormat) { SvxShadowItem aShadowItem = rFrameFormat.GetShadow(); @@ -1630,6 +1633,8 @@ void lcl_TextFrameRelativeSize(std::vector< std::pair<OString, OString> >& rFlyP } } +} + void RtfAttributeOutput::writeTextFrame(const sw::Frame& rFrame, bool bTextBox) { RtfStringBuffer aRunText; |