From a297df5f9df973205e50f908f60e231af4d12823 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Sat, 20 Jun 2015 00:49:05 +0200 Subject: sw: WW8 export: remove WW6 export, partB: newly dead functions Change-Id: I3531ca574239ee9e47a111d1a1d73b623292c80f --- sw/source/filter/ww8/wrtw8nds.cxx | 49 ----------------------------- sw/source/filter/ww8/wrtw8num.cxx | 31 ------------------ sw/source/filter/ww8/wrtw8sty.cxx | 30 ------------------ sw/source/filter/ww8/wrtww8.hxx | 7 ----- sw/source/filter/ww8/ww8attributeoutput.hxx | 3 -- 5 files changed, 120 deletions(-) diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx index c7062baf3cb9..cc0bf535e901 100644 --- a/sw/source/filter/ww8/wrtw8nds.cxx +++ b/sw/source/filter/ww8/wrtw8nds.cxx @@ -2845,55 +2845,6 @@ void WW8Export::AppendSection( const SwPageDesc *pPageDesc, const SwSectionForma // Flys -void WW8Export::OutWW6FlyFrmsInContent( const SwTextNode& rNd ) -{ - assert(false); // TODO - - if (const SwpHints* pTextAttrs = rNd.GetpSwpHints()) - { - for( size_t n=0; n < pTextAttrs->Count(); ++n ) - { - const SwTextAttr* pAttr = (*pTextAttrs)[ n ]; - if( RES_TXTATR_FLYCNT == pAttr->Which() ) - { - // attribute bound to a character - const SwFormatFlyCnt& rFlyContent = pAttr->GetFlyCnt(); - const SwFlyFrameFormat& rFlyFrameFormat = *static_cast(rFlyContent.GetFrameFormat()); - const SwNodeIndex* pNodeIndex = rFlyFrameFormat.GetContent().GetContentIdx(); - - if( pNodeIndex ) - { - sal_uLong nStt = pNodeIndex->GetIndex()+1, - nEnd = pNodeIndex->GetNode().EndOfSectionIndex(); - - if( (nStt < nEnd) && !m_pDoc->GetNodes()[ nStt ]->IsNoTextNode() ) - { - Point aOffset; - // get rectangle (bounding box?) of Fly and paragraph - SwRect aParentRect(rNd.FindLayoutRect(false, &aOffset)), - aFlyRect(rFlyFrameFormat.FindLayoutRect(false, &aOffset ) ); - - aOffset = aFlyRect.Pos() - aParentRect.Pos(); - - // let PaM point to content of Fly-frame format - SaveData( nStt, nEnd ); - - // is analysed in OutputFormat() - m_pFlyOffset = &aOffset; - m_eNewAnchorType = rFlyFrameFormat.GetAnchor().GetAnchorId(); - sw::Frame aFrm(rFlyFrameFormat, SwPosition(rNd)); - m_pParentFrame = &aFrm; - // Ok, write it out: - WriteText(); - - RestoreData(); - } - } - } - } - } -} - void WW8AttributeOutput::OutputFlyFrame_Impl( const sw::Frame& rFormat, const Point& rNdTopLeft ) { const SwFrameFormat &rFrameFormat = rFormat.GetFrameFormat(); diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx index ddc6bc6a6f2d..09366bc794e9 100644 --- a/sw/source/filter/ww8/wrtw8num.cxx +++ b/sw/source/filter/ww8/wrtw8num.cxx @@ -597,37 +597,6 @@ void WW8Export::OutListNamesTab() // old WW95-Code -void WW8Export::OutputOlst( const SwNumRule& rRule ) -{ - assert(false); // TODO - - static const sal_uInt8 aAnlvBase[] = { // Defaults - 1,0,0, // Upper Roman - 0x0C, // Hanging Indent, fPrev - 0,0,1,0x80,0,0,1,0,0x1b,1,0,0 }; - - static const sal_uInt8 aSprmOlstHdr[] = { 133, 212 }; - - pO->insert( pO->end(), aSprmOlstHdr, aSprmOlstHdr+sizeof( aSprmOlstHdr ) ); - WW8_OLST aOlst; - memset( &aOlst, 0, sizeof(aOlst) ); - sal_uInt8* pC = aOlst.rgch; - sal_uInt8* pChars = pC; - sal_uInt16 nCharLen = 64; - - for (sal_uInt16 j = 0; j < WW8ListManager::nMaxLevel; j++ ) // 9 variable ANLVs - { - memcpy( &aOlst.rganlv[j], aAnlvBase, sizeof( WW8_ANLV ) ); // Defaults - - const SwNumFormat* pFormat = rRule.GetNumFormat( j ); - if( pFormat ) - BuildAnlvBase( aOlst.rganlv[j], pChars, nCharLen, rRule, - *pFormat, (sal_uInt8)j ); - } - - pO->insert( pO->end(), reinterpret_cast(&aOlst), reinterpret_cast(&aOlst)+sizeof( aOlst ) ); -} - void WW8Export::Out_WwNumLvl( sal_uInt8 nWwLevel ) { pO->push_back( 13 ); diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index 14989271aa6e..202cd607386c 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -1438,27 +1438,6 @@ void WW8AttributeOutput::SectionType( sal_uInt8 nBreakCode ) } } -// TODO -void WW8AttributeOutput::SectionWW6HeaderFooterFlags( sal_uInt8 nHeadFootFlags ) -{ - if (nHeadFootFlags && false) - { - sal_uInt8 nTmpFlags = nHeadFootFlags; - if ( m_rWW8Export.pDop->fFacingPages ) - { - if ( !(nTmpFlags & WW8_FOOTER_EVEN) && (nTmpFlags & WW8_FOOTER_ODD ) ) - nTmpFlags |= WW8_FOOTER_EVEN; - - if ( !(nTmpFlags & WW8_HEADER_EVEN) && (nTmpFlags & WW8_HEADER_ODD ) ) - nTmpFlags |= WW8_HEADER_EVEN; - } - - // sprmSGprfIhdt, is only needed in WW95 - m_rWW8Export.pO->push_back( 153 ); - m_rWW8Export.pO->push_back( nTmpFlags ); - } -} - void WW8Export::SetupSectionPositions( WW8_PdAttrDesc* pA ) { if ( !pA ) @@ -1705,14 +1684,6 @@ void MSWordExportBase::SectionProperties( const WW8_SepInfo& rSepInfo, WW8_PdAtt AttrOutput().SectionType( nBreakCode ); - const SwTextNode* pNd = rSepInfo.pNumNd; - if ( pNd ) - { - const SwNumRule* pRule = pNd->GetNumRule(); - if ( pRule ) - OutputOlst( *pRule ); - } - // Header or Footer sal_uInt8 nHeadFootFlags = 0; @@ -1737,7 +1708,6 @@ void MSWordExportBase::SectionProperties( const WW8_SepInfo& rSepInfo, WW8_PdAtt if ( !pPd->IsFooterShared() || bLeftRightPgChain ) MSWordSections::SetFooterFlag( nHeadFootFlags, *pPdLeftFormat, WW8_FOOTER_EVEN ); - AttrOutput().SectionWW6HeaderFooterFlags( nHeadFootFlags ); } // binary filters only diff --git a/sw/source/filter/ww8/wrtww8.hxx b/sw/source/filter/ww8/wrtww8.hxx index 78eb471861ae..756074623aa7 100644 --- a/sw/source/filter/ww8/wrtww8.hxx +++ b/sw/source/filter/ww8/wrtww8.hxx @@ -731,9 +731,6 @@ public: void SubstituteBullet( OUString& rNumStr, rtl_TextEncoding& rChrSet, OUString& rFontName ) const; - /// No-op for the newer WW versions. - virtual void OutputOlst( const SwNumRule& /*rRule*/ ) {} - /// Setup the pA's info. virtual void SetupSectionPositions( WW8_PdAttrDesc* /*pA*/ ) {} @@ -999,7 +996,6 @@ private: void DoCheckBox(com::sun::star::uno::Reference xPropSet); public: - virtual void OutputOlst( const SwNumRule& rRule ) SAL_OVERRIDE; /// Setup the pA's info. virtual void SetupSectionPositions( WW8_PdAttrDesc* pA ) SAL_OVERRIDE; @@ -1022,9 +1018,6 @@ public: const SvxBrushItem* GetCurrentPageBgBrush() const; SvxBrushItem TrueFrameBgBrush(const SwFrameFormat &rFlyFormat) const; - /// Output all textframes anchored as character for the winword 7- format. - void OutWW6FlyFrmsInContent( const SwTextNode& rNd ); - void AppendFlyInFlys(const sw::Frame& rFrameFormat, const Point& rNdTopLeft); void WriteOutliner(const OutlinerParaObject& rOutliner, sal_uInt8 nTyp); void WriteSdrTextObj(const SdrTextObj& rObj, sal_uInt8 nTyp); diff --git a/sw/source/filter/ww8/ww8attributeoutput.hxx b/sw/source/filter/ww8/ww8attributeoutput.hxx index 8a7ef8322be7..761755c7d9f6 100644 --- a/sw/source/filter/ww8/ww8attributeoutput.hxx +++ b/sw/source/filter/ww8/ww8attributeoutput.hxx @@ -178,9 +178,6 @@ public: /// The type of breaking. virtual void SectionType( sal_uInt8 nBreakCode ) SAL_OVERRIDE; - /// Special header/footer flags, needed for old versions only. - virtual void SectionWW6HeaderFooterFlags( sal_uInt8 nHeadFootFlags ) SAL_OVERRIDE; - /// Definition of a numbering instance. virtual void NumberingDefinition( sal_uInt16 nId, const SwNumRule &rRule ) SAL_OVERRIDE; -- cgit