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

drawingML import: handle RelativeWidth/Height for drawinglayer shapes

Browse Source 
This was already handled in the VML importer previously.

Change-Id: Ie04ed0cec632222c5f6481943ad7f4db66a752e5
This commit is contained in:
Miklos Vajna
2014-02-10 11:55:01 +01:00
parent ea3074e0be
commit e86a602df7
4 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
sw/qa/extras/ooxmlexport/data/dml-rectangle-relsize.docx Normal file
View File

Binary file not shown.

7
sw/qa/extras/ooxmlexport/ooxmlexport.cxx
View File

@@ -2808,6 +2808,13 @@ DECLARE_OOXMLEXPORT_TEST(testDMLCustomGeometry, "dml-customgeometry-cubicbezier.
} }
} }
DECLARE_OOXMLEXPORT_TEST(testDmlRectangleRelsize, "dml-rectangle-relsize.docx")
{
// This was around 19560, as we did not read wp14:pctHeight for
// drawinglayer shapes and the fallback data was invalid.
CPPUNIT_ASSERT(21000 < getShape(1)->getSize().Height);
}
DECLARE_OOXMLEXPORT_TEST(testGradientFillPreservation, "gradient-fill-preservation.docx") DECLARE_OOXMLEXPORT_TEST(testGradientFillPreservation, "gradient-fill-preservation.docx")
{ {
xmlDocPtr pXmlDocument = parseExport("word/document.xml"); xmlDocPtr pXmlDocument = parseExport("word/document.xml");

2
sw/source/core/layout/anchoreddrawobject.cxx
View File

@@ -642,7 +642,7 @@ const SwRect SwAnchoredDrawObject::GetObjRect() const
const SwRect SwAnchoredDrawObject::GetObjBoundRect() const const SwRect SwAnchoredDrawObject::GetObjBoundRect() const
{ {
// Resize objects with relative width or height // Resize objects with relative width or height
if ( GetDrawObj( )->GetRelativeWidth( ) || GetDrawObj()->GetRelativeHeight( ) ) if ( GetPageFrm( ) && ( GetDrawObj( )->GetRelativeWidth( ) || GetDrawObj()->GetRelativeHeight( ) ) )
{ {
Rectangle aPageRect = GetPageFrm( )->GetBoundRect( ).SVRect(); Rectangle aPageRect = GetPageFrm( )->GetBoundRect( ).SVRect();
Rectangle aCurrObjRect = GetDrawObj()->GetCurrentBoundRect(); Rectangle aCurrObjRect = GetDrawObj()->GetCurrentBoundRect();

7
writerfilter/source/dmapper/GraphicImport.cxx
View File

@@ -44,6 +44,7 @@
#include <cppuhelper/implbase1.hxx> #include <cppuhelper/implbase1.hxx>
#include <rtl/ustrbuf.hxx> #include <rtl/ustrbuf.hxx>
#include <rtl/math.hxx> #include <rtl/math.hxx>
#include <oox/drawingml/drawingmltypes.hxx>
#include <dmapper/DomainMapper.hxx> #include <dmapper/DomainMapper.hxx>
#include <ooxml/resourceids.hxx> #include <ooxml/resourceids.hxx>
@@ -951,17 +952,13 @@ void GraphicImport::lcl_sprm(Sprm & rSprm)
case NS_ooxml::LN_CT_SizeRelV_pctHeight: case NS_ooxml::LN_CT_SizeRelV_pctHeight:
if (m_xShape.is() && !m_pImpl->m_rPositivePercentages.empty()) if (m_xShape.is() && !m_pImpl->m_rPositivePercentages.empty())
{ {
sal_Int16 nPositivePercentage = rtl::math::round(m_pImpl->m_rPositivePercentages.front().toDouble() / 1000); sal_Int16 nPositivePercentage = rtl::math::round(m_pImpl->m_rPositivePercentages.front().toDouble() / oox::drawingml::PER_PERCENT);
m_pImpl->m_rPositivePercentages.pop(); m_pImpl->m_rPositivePercentages.pop();
uno::Reference<lang::XServiceInfo> xServiceInfo(m_xShape, uno::UNO_QUERY_THROW);
if (xServiceInfo->supportsService("com.sun.star.text.TextFrame"))
{
uno::Reference<beans::XPropertySet> xPropertySet(m_xShape, uno::UNO_QUERY); uno::Reference<beans::XPropertySet> xPropertySet(m_xShape, uno::UNO_QUERY);
OUString aProperty = nSprmId == NS_ooxml::LN_CT_SizeRelH_pctWidth ? OUString("RelativeWidth") : OUString("RelativeHeight"); OUString aProperty = nSprmId == NS_ooxml::LN_CT_SizeRelH_pctWidth ? OUString("RelativeWidth") : OUString("RelativeHeight");
xPropertySet->setPropertyValue(aProperty, uno::makeAny(nPositivePercentage)); xPropertySet->setPropertyValue(aProperty, uno::makeAny(nPositivePercentage));
} }
}
break; break;
case 0x271b: case 0x271b:
case 0x271c: case 0x271c: