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

fdo#58819 DOCX VML export: fix shape size for rotated shapes

Browse Source 
The problem is that we wrote the size of the shape itself, while VML wants the
bounding box here. The WW8 export ignores the rectangle given in
EscherEx::Commit(), uses SdrObject::GetSnapRect() instead and later refines the
position by using the point got in WW8AttributeOutput::OutputFlyFrame_Impl(),
see PlcDrawObj::WritePlc().

Do the same in the VML export, i.e. ignore the Rectangle we get in
VMLExport::Commit() and use SdrObject::GetSnapRect() + the point given
in DocxAttributeOutput::OutputFlyFrame_Impl() instead.

Change-Id: I5adbdf205792c87f92c1ddf1cf674f87e11eb54e
This commit is contained in:
Miklos Vajna 2013-06-14 11:23:13 +02:00
parent 4f4bc1ffc0
commit 559d194d80
3 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/oox/export/vmlexport.hxx
View File

@ -53,6 +53,9 @@ class OOX_DLLPUBLIC VMLExport : public EscherEx
/// Anchoring.
sal_Int16 m_eHOri, m_eVOri, m_eHRel, m_eVRel;
/// Parent position.
const Point* m_pNdTopLeft;
/// The object we're exporting.
const SdrObject* m_pSdrObject;
@ -83,7 +86,9 @@ public:
/// Export the sdr object as VML.
///
/// Call this when you need to export the object as VML.
sal_uInt32 AddSdrObject( const SdrObject& rObj, const sal_Int16 eHOri = -1, const sal_Int16 eVOri = -1, const sal_Int16 eHRel = -1, const sal_Int16 eVRel = -1 );
sal_uInt32 AddSdrObject( const SdrObject& rObj, const sal_Int16 eHOri = -1,
const sal_Int16 eVOri = -1, const sal_Int16 eHRel = -1, const
sal_Int16 eVRel = -1, const Point* pNdTopLeft = 0 );
protected:
/// Add an attribute to the generated <v:shape/> element.

14
oox/source/export/vmlexport.cxx
View File

@ -48,6 +48,7 @@ VMLExport::VMLExport( ::sax_fastparser::FSHelperPtr pSerializer, VMLTextExport*
, m_eVOri( 0 )
, m_eHRel( 0 )
, m_eVRel( 0 )
, m_pNdTopLeft( 0 )
, m_pSdrObject( 0 )
, m_pShapeAttrList( NULL )
, m_nShapeType( ESCHER_ShpInst_Nil )
@ -324,7 +325,15 @@ void VMLExport::Commit( EscherPropertyContainer& rProps, const Rectangle& rRect
if ( m_nShapeType == ESCHER_ShpInst_Line )
AddLineDimensions( rRect );
else
AddRectangleDimensions( *m_pShapeStyle, rRect );
{
Rectangle aRect(rRect);
if (m_pNdTopLeft)
{
aRect = m_pSdrObject->GetSnapRect();
aRect -= *m_pNdTopLeft;
}
AddRectangleDimensions( *m_pShapeStyle, aRect );
}
// properties
bool bAlreadyWritten[ 0xFFF ];
@ -1000,13 +1009,14 @@ void VMLExport::EndShape( sal_Int32 nShapeElement )
}
}
sal_uInt32 VMLExport::AddSdrObject( const SdrObject& rObj, const sal_Int16 eHOri, const sal_Int16 eVOri, const sal_Int16 eHRel, const sal_Int16 eVRel )
sal_uInt32 VMLExport::AddSdrObject( const SdrObject& rObj, const sal_Int16 eHOri, const sal_Int16 eVOri, const sal_Int16 eHRel, const sal_Int16 eVRel, const Point* pNdTopLeft )
{
m_pSdrObject = &rObj;
m_eHOri = eHOri;
m_eVOri = eVOri;
m_eHRel = eHRel;
m_eVRel = eVRel;
m_pNdTopLeft = pNdTopLeft;
return EscherEx::AddSdrObject(rObj);
}

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

@ -2689,7 +2689,7 @@ void DocxAttributeOutput::WritePostponedMath()
m_postponedMath = NULL;
}
void DocxAttributeOutput::OutputFlyFrame_Impl( const sw::Frame &rFrame, const Point& /*rNdTopLeft*/ )
void DocxAttributeOutput::OutputFlyFrame_Impl( const sw::Frame &rFrame, const Point& rNdTopLeft )
{
m_pSerializer->mark();
@ -2735,7 +2735,10 @@ void DocxAttributeOutput::OutputFlyFrame_Impl( const sw::Frame &rFrame, const Po
const SwFrmFmt& rFrmFmt = rFrame.GetFrmFmt();
SwFmtHoriOrient rHoriOri = rFrmFmt.GetHoriOrient();
SwFmtVertOrient rVertOri = rFrmFmt.GetVertOrient();
m_rExport.VMLExporter().AddSdrObject( *pSdrObj, rHoriOri.GetHoriOrient(), rVertOri.GetVertOrient(), rHoriOri.GetRelationOrient(), rVertOri.GetRelationOrient() );
m_rExport.VMLExporter().AddSdrObject( *pSdrObj,
rHoriOri.GetHoriOrient(), rVertOri.GetVertOrient(),
rHoriOri.GetRelationOrient(),
rVertOri.GetRelationOrient(), &rNdTopLeft );
m_pSerializer->endElementNS( XML_w, XML_pict );