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

xmloff: import style:rel-width/height for drawinglayer shapes

Browse Source 
In case the underlying UNO object supports that, which is the case for
Writer. Export was already working before.

Change-Id: I4676c8349ebe1959da004d6e1a024a342da45049
This commit is contained in:
Miklos Vajna
2014-02-25 11:47:32 +01:00
parent ea7685ce69
commit 4da81e4a0b
4 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
sw/qa/extras/odfexport/data/shape-relsize.odt Executable file
View File

Binary file not shown.

8
sw/qa/extras/odfexport/odfexport.cxx
View File

@@ -350,6 +350,14 @@ DECLARE_ODFEXPORT_TEST(testTextFrameVertAdjust, "textframe-vertadjust.odt")
xFrame.set(getTextFrameByName("Rectangle 3"), uno::UNO_QUERY); xFrame.set(getTextFrameByName("Rectangle 3"), uno::UNO_QUERY);
CPPUNIT_ASSERT_EQUAL(drawing::TextVerticalAdjust_BOTTOM, getProperty<drawing::TextVerticalAdjust>(xFrame, "TextVerticalAdjust")); CPPUNIT_ASSERT_EQUAL(drawing::TextVerticalAdjust_BOTTOM, getProperty<drawing::TextVerticalAdjust>(xFrame, "TextVerticalAdjust"));
} }
DECLARE_ODFEXPORT_TEST(testShapeRelsize, "shape-relsize.odt")
{
// These were all 0, as style:rel-width/height was ignored on import for shapes.
CPPUNIT_ASSERT_EQUAL(sal_Int16(40), getProperty<sal_Int16>(getShape(1), "RelativeWidth"));
CPPUNIT_ASSERT_EQUAL(sal_Int16(20), getProperty<sal_Int16>(getShape(1), "RelativeHeight"));
}
#endif #endif
CPPUNIT_PLUGIN_IMPLEMENT(); CPPUNIT_PLUGIN_IMPLEMENT();

26
xmloff/source/draw/ximpshap.cxx
View File

@@ -151,6 +151,8 @@ SdXMLShapeContext::SdXMLShapeContext(
, mbIsUserTransformed(sal_False) , mbIsUserTransformed(sal_False)
, mnZOrder(-1) , mnZOrder(-1)
, maSize(1, 1) , maSize(1, 1)
, mnRelWidth(0)
, mnRelHeight(0)
, maPosition(0, 0) , maPosition(0, 0)
, maUsedTransformation() , maUsedTransformation()
, mbVisible(true) , mbVisible(true)
@@ -454,6 +456,16 @@ void SdXMLShapeContext::AddShape(uno::Reference< drawing::XShape >& xShape)
xImp->shapeWithZIndexAdded( xShape, mnZOrder ); xImp->shapeWithZIndexAdded( xShape, mnZOrder );
} }
if (mnRelWidth || mnRelHeight)
{
uno::Reference<beans::XPropertySet> xPropertySet(xShape, uno::UNO_QUERY);
uno::Reference<beans::XPropertySetInfo> xPropertySetInfo = xPropertySet->getPropertySetInfo();
if (mnRelWidth && xPropertySetInfo->hasPropertyByName("RelativeWidth"))
xPropertySet->setPropertyValue("RelativeWidth", uno::makeAny(mnRelWidth));
if (mnRelHeight && xPropertySetInfo->hasPropertyByName("RelativeHeight"))
xPropertySet->setPropertyValue("RelativeHeight", uno::makeAny(mnRelHeight));
}
if( !maShapeId.isEmpty() ) if( !maShapeId.isEmpty() )
{ {
uno::Reference< uno::XInterface > xRef( static_cast<uno::XInterface *>(xShape.get()) ); uno::Reference< uno::XInterface > xRef( static_cast<uno::XInterface *>(xShape.get()) );
@@ -888,6 +900,20 @@ void SdXMLShapeContext::processAttribute( sal_uInt16 nPrefix, const OUString& rL
maShapeDescription = rValue; maShapeDescription = rValue;
} }
} }
else if (nPrefix == XML_NAMESPACE_STYLE)
{
sal_Int32 nTmp;
if (IsXMLToken(rLocalName, XML_REL_WIDTH))
{
if (sax::Converter::convertPercent(nTmp, rValue))
mnRelWidth = static_cast<sal_Int16>(nTmp);
}
else if (IsXMLToken(rLocalName, XML_REL_HEIGHT))
{
if (sax::Converter::convertPercent(nTmp, rValue))
mnRelHeight = static_cast<sal_Int16>(nTmp);
}
}
else if( (XML_NAMESPACE_NONE == nPrefix) || (XML_NAMESPACE_XML == nPrefix) ) else if( (XML_NAMESPACE_NONE == nPrefix) || (XML_NAMESPACE_XML == nPrefix) )
{ {
if( IsXMLToken( rLocalName, XML_ID ) ) if( IsXMLToken( rLocalName, XML_ID ) )

2
xmloff/source/draw/ximpshap.hxx
View File

@@ -73,6 +73,8 @@ protected:
SdXMLImExTransform2D mnTransform; SdXMLImExTransform2D mnTransform;
com::sun::star::awt::Size maSize; com::sun::star::awt::Size maSize;
sal_Int16 mnRelWidth;
sal_Int16 mnRelHeight;
com::sun::star::awt::Point maPosition; com::sun::star::awt::Point maPosition;
basegfx::B2DHomMatrix maUsedTransformation; basegfx::B2DHomMatrix maUsedTransformation;