diff options
| author | Miklos Vajna <vmiklos@suse.cz> | 2013-04-10 17:55:22 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@suse.cz> | 2013-04-10 18:48:25 +0200 |
| commit | 24ee3df385cf2aa95cd888581c84fdf90cc682dc (patch) | |
| tree | 2bd76caaabfe5f30a2c9c630b15f9e95bc36b0ae /writerfilter | |
| parent | 36be517a07fe0f18490c6c81b74463364bad9416 (diff) | |
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
Diffstat (limited to 'writerfilter')
| -rw-r--r-- | writerfilter/source/rtftok/rtfsdrimport.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
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)); |