From 24ee3df385cf2aa95cd888581c84fdf90cc682dc Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Wed, 10 Apr 2013 17:55:22 +0200 Subject: RTF import: fix priority handling of shpz vs dhgt \shpz is the older markup, dhgt shape property is the newer one. When having both, dhgt should have priority. Change-Id: I11904315d13fa23999badad26be26852719dbb3b --- writerfilter/source/rtftok/rtfsdrimport.cxx | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'writerfilter') diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx index 9af90c4137c0..a85cb500fe4f 100644 --- a/writerfilter/source/rtftok/rtfsdrimport.cxx +++ b/writerfilter/source/rtftok/rtfsdrimport.cxx @@ -373,7 +373,11 @@ void RTFSdrImport::resolve(RTFShape& rShape) else if ( i->first == "geoBottom" ) aViewBox.Height = i->second.toInt32(); else if ( i->first == "dhgt" ) + { resolveDhgt(xPropertySet, i->second.toInt32()); + // dhgt is Word 2007, \shpz is Word 97-2003, the previous has priority. + rShape.oZ.reset(); + } // These are in EMU, convert to mm100. else if (i->first == "dxTextLeft") xPropertySet->setPropertyValue("LeftBorderDistance", uno::makeAny(i->second.toInt32() / 360)); -- cgit