diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-01-22 11:03:36 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-01-22 16:13:25 +0100 |
| commit | 6eb6fc826e54d4464ecc56911a9cb192382319ea (patch) | |
| tree | 686fe3a5d626b1f6bf21e3e3b4015712ad487ce8 /sw | |
| parent | 4ad425818402e96e526010ae00ee9a26d21c9ec3 (diff) | |
sw: DOCX export of TextFrame background color
Change-Id: If488129c8b563b82932b58e16328922cc2653da8
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/docxattributeoutput.cxx | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx index 416063ae38c5..a6b7dffd2369 100644 --- a/sw/source/filter/ww8/docxattributeoutput.cxx +++ b/sw/source/filter/ww8/docxattributeoutput.cxx @@ -273,13 +273,17 @@ void DocxAttributeOutput::EndParagraph( ww8::WW8TableNodeInfoInner::Pointer_t pT m_rExport.mpParentFrame = pParentFrame; m_bTextFrameSyntax = true; + m_pFlyAttrList = m_pSerializer->createAttrList( ); m_aTextFrameStyle = "position:absolute"; m_rExport.OutputFormat( pParentFrame->GetFrmFmt(), false, false, true ); + m_pFlyAttrList->add(XML_style, m_aTextFrameStyle.makeStringAndClear()); + XFastAttributeListRef xFlyAttrList( m_pFlyAttrList ); + m_pFlyAttrList = NULL; m_bTextFrameSyntax = false; m_pSerializer->startElementNS( XML_w, XML_r, FSEND ); m_pSerializer->startElementNS( XML_w, XML_pict, FSEND ); - m_pSerializer->startElementNS( XML_v, XML_rect, XML_style, m_aTextFrameStyle.makeStringAndClear(), FSEND ); + m_pSerializer->startElementNS( XML_v, XML_rect, xFlyAttrList ); m_pSerializer->startElementNS( XML_v, XML_textbox, FSEND ); m_pSerializer->startElementNS( XML_w, XML_txbxContent, FSEND ); m_rExport.WriteText( ); @@ -4493,9 +4497,11 @@ void DocxAttributeOutput::FormatAnchor( const SwFmtAnchor& ) void DocxAttributeOutput::FormatBackground( const SvxBrushItem& rBrush ) { - if ( !m_rExport.bOutPageDescs ) + OString sColor = impl_ConvertColor( rBrush.GetColor( ) ); + if (m_bTextFrameSyntax) + m_pFlyAttrList->add(XML_fillcolor, "#" + sColor); + else if ( !m_rExport.bOutPageDescs ) { - OString sColor = impl_ConvertColor( rBrush.GetColor( ) ); m_pSerializer->singleElementNS( XML_w, XML_shd, FSNS( XML_w, XML_fill ), sColor.getStr( ), FSNS( XML_w, XML_val ), "clear", |