mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

DocxAttributeOutput::FlyFrameGraphic: avoid <a:ln> when there is no border

Browse Source 
Change-Id: Ia94f490c0ad8c392bd8bbfbe889f5333c13e0022
This commit is contained in:
Miklos Vajna
2014-12-10 17:06:28 +01:00
parent a645c82894
commit dbbfad3dfb
3 changed files with 28 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
sw/qa/extras/ooxmlexport/data/image-noborder.docx Normal file
View File

Binary file not shown.

6
sw/qa/extras/ooxmlexport/ooxmlexport5.cxx
View File

@@ -721,6 +721,12 @@ DECLARE_OOXMLEXPORT_TEST(testTblpprShape, "tblppr-shape.docx")
CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(2540), getProperty<sal_Int32>(xPageStyle, "LeftMargin")); CPPUNIT_ASSERT_EQUAL(static_cast<sal_Int32>(2540), getProperty<sal_Int32>(xPageStyle, "LeftMargin"));
} }
DECLARE_OOXMLEXPORT_TEST(testImageNoborder, "image-noborder.docx")
{
// This was 26; we exported border for an image that had no border.
CPPUNIT_ASSERT_EQUAL(static_cast<sal_uInt32>(0), getProperty<table::BorderLine2>(getShape(1), "TopBorder").LineWidth);
}
CPPUNIT_PLUGIN_IMPLEMENT(); CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

37
sw/source/filter/ww8/docxattributeoutput.cxx
View File

@@ -4215,21 +4215,28 @@ void DocxAttributeOutput::FlyFrameGraphic( const SwGrfNode* pGrfNode, const Size
m_pSerializer->singleElementNS( XML_a, XML_avLst, m_pSerializer->singleElementNS( XML_a, XML_avLst,
FSEND ); FSEND );
m_pSerializer->endElementNS( XML_a, XML_prstGeom ); m_pSerializer->endElementNS( XML_a, XML_prstGeom );
m_pSerializer->singleElementNS( XML_a, XML_noFill,
FSEND ); const SvxBoxItem& rBoxItem = pFrmFmt->GetBox();
m_pSerializer->startElementNS( XML_a, XML_ln, const SvxBorderLine* pLeft = rBoxItem.GetLine(BOX_LINE_LEFT);
XML_w, "9525", const SvxBorderLine* pRight = rBoxItem.GetLine(BOX_LINE_RIGHT);
FSEND ); const SvxBorderLine* pTop = rBoxItem.GetLine(BOX_LINE_TOP);
m_pSerializer->singleElementNS( XML_a, XML_noFill, const SvxBorderLine* pBottom = rBoxItem.GetLine(BOX_LINE_BOTTOM);
FSEND ); if (pLeft || pRight || pTop || pBottom)
m_pSerializer->singleElementNS( XML_a, XML_miter, {
XML_lim, "800000", m_pSerializer->startElementNS( XML_a, XML_ln,
FSEND ); XML_w, "9525",
m_pSerializer->singleElementNS( XML_a, XML_headEnd, FSEND );
FSEND ); m_pSerializer->singleElementNS( XML_a, XML_noFill,
m_pSerializer->singleElementNS( XML_a, XML_tailEnd, FSEND );
FSEND ); m_pSerializer->singleElementNS( XML_a, XML_miter,
m_pSerializer->endElementNS( XML_a, XML_ln ); XML_lim, "800000",
FSEND );
m_pSerializer->singleElementNS( XML_a, XML_headEnd,
FSEND );
m_pSerializer->singleElementNS( XML_a, XML_tailEnd,
FSEND );
m_pSerializer->endElementNS( XML_a, XML_ln );
}
m_rExport.SdrExporter().writeDMLEffectLst(*pFrmFmt); m_rExport.SdrExporter().writeDMLEffectLst(*pFrmFmt);