diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-11-27 20:26:04 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2014-11-27 20:26:04 +0100 |
| commit | b97600ff196f620145d0b56dbb589238bc6a9cbd (patch) | |
| tree | 68fb8f73742b5fe0fe4bb5919a490d97a23c5221 | |
| parent | Put the KernelEnv struct inside the opencl namespace, too (diff) | |
| download | core-b97600ff196f620145d0b56dbb589238bc6a9cbd.tar.gz core-b97600ff196f620145d0b56dbb589238bc6a9cbd.zip | |
WW8_WrPlcSubDoc::WriteGenericTxt: fix missing indentation
Change-Id: I21e47d004e011c706a1e7e591f9204beb9b6f70f
| -rw-r--r-- | sw/source/filter/ww8/wrtw8sty.cxx | 78 |
1 files changed, 39 insertions, 39 deletions
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx index 7593e992a86a..cd6b3e926cc8 100644 --- a/sw/source/filter/ww8/wrtw8sty.cxx +++ b/sw/source/filter/ww8/wrtw8sty.cxx @@ -2158,53 +2158,53 @@ bool WW8_WrPlcSubDoc::WriteGenericTxt( WW8Export& rWrt, sal_uInt8 nTTyp, if( aCntnt[ i ] != NULL ) { - // is it an writer or sdr - textbox? - const SdrObject& rObj = *(SdrObject*)aCntnt[ i ]; - if (rObj.GetObjInventor() == FmFormInventor) - { - sal_uInt8 nOldTyp = rWrt.nTxtTyp; - rWrt.nTxtTyp = nTTyp; - rWrt.GetOCXExp().ExportControl(rWrt,&rObj); - rWrt.nTxtTyp = nOldTyp; - } - else if( rObj.ISA( SdrTextObj ) ) - rWrt.WriteSdrTextObj(rObj, nTTyp); - else - { - const SwFrmFmt* pFmt = ::FindFrmFmt( &rObj ); - OSL_ENSURE( pFmt, "where is the format?" ); - - const SwNodeIndex* pNdIdx = pFmt->GetCntnt().GetCntntIdx(); - OSL_ENSURE( pNdIdx, "where is the StartNode of the Textbox?" ); - rWrt.WriteSpecialText( pNdIdx->GetIndex() + 1, - pNdIdx->GetNode().EndOfSectionIndex(), - nTTyp ); + // is it an writer or sdr - textbox? + const SdrObject& rObj = *(SdrObject*)aCntnt[ i ]; + if (rObj.GetObjInventor() == FmFormInventor) + { + sal_uInt8 nOldTyp = rWrt.nTxtTyp; + rWrt.nTxtTyp = nTTyp; + rWrt.GetOCXExp().ExportControl(rWrt,&rObj); + rWrt.nTxtTyp = nOldTyp; + } + else if( rObj.ISA( SdrTextObj ) ) + rWrt.WriteSdrTextObj(rObj, nTTyp); + else { - SwNodeIndex aContentIdx = *pNdIdx; - ++aContentIdx; - if ( aContentIdx.GetNode().IsTableNode() ) + const SwFrmFmt* pFmt = ::FindFrmFmt( &rObj ); + OSL_ENSURE( pFmt, "where is the format?" ); + + const SwNodeIndex* pNdIdx = pFmt->GetCntnt().GetCntntIdx(); + OSL_ENSURE( pNdIdx, "where is the StartNode of the Textbox?" ); + rWrt.WriteSpecialText( pNdIdx->GetIndex() + 1, + pNdIdx->GetNode().EndOfSectionIndex(), + nTTyp ); { - bool bContainsOnlyTables = true; - do { - aContentIdx = *(aContentIdx.GetNode().EndOfSectionNode()); - ++aContentIdx; - if ( !aContentIdx.GetNode().IsTableNode() && - aContentIdx.GetIndex() != pNdIdx->GetNode().EndOfSectionIndex() ) + SwNodeIndex aContentIdx = *pNdIdx; + ++aContentIdx; + if ( aContentIdx.GetNode().IsTableNode() ) + { + bool bContainsOnlyTables = true; + do { + aContentIdx = *(aContentIdx.GetNode().EndOfSectionNode()); + ++aContentIdx; + if ( !aContentIdx.GetNode().IsTableNode() && + aContentIdx.GetIndex() != pNdIdx->GetNode().EndOfSectionIndex() ) + { + bContainsOnlyTables = false; + } + } while ( aContentIdx.GetNode().IsTableNode() ); + if ( bContainsOnlyTables ) { - bContainsOnlyTables = false; + // Additional paragraph containing a space to + // assure that by WW created RTF from written WW8 + // does not crash WW. + rWrt.WriteStringAsPara( OUString(" ") ); } - } while ( aContentIdx.GetNode().IsTableNode() ); - if ( bContainsOnlyTables ) - { - // Additional paragraph containing a space to - // assure that by WW created RTF from written WW8 - // does not crash WW. - rWrt.WriteStringAsPara( OUString(" ") ); } } } } - } else if( i < aSpareFmts.size() ) { if( const SwFrmFmt* pFmt = (const SwFrmFmt*)aSpareFmts[ i ] ) |