summaryrefslogtreecommitdiff
path: root/oox
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2013-11-26 16:24:13 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2013-11-26 16:33:16 +0100
commit0205f0a2712f0bbc3629b1cc8590105d5dcf11db (patch)
tree39b36bba2abbb77676b1705d83230ccb39039ac4 /oox
parent1f1fa03f4f902254f73cc15a3f44c23d489933bb (diff)
DOCX drawingML shape import: initial wps:txbx positioning
Change-Id: Id779ed88d657257b614d910a2191ed4974612c8f
Diffstat (limited to 'oox')
-rw-r--r--oox/source/drawingml/shape.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/oox/source/drawingml/shape.cxx b/oox/source/drawingml/shape.cxx
index aaf71285a090..1f7d559da968 100644
--- a/oox/source/drawingml/shape.cxx
+++ b/oox/source/drawingml/shape.cxx
@@ -623,7 +623,7 @@ Reference< XShape > Shape::createAndInsert(
// These can have a custom geometry, so position should be set here,
// after creation but before custom shape handling, using the position
// we got from the caller.
- if (mbWps)
+ if (mbWps && aServiceName != "com.sun.star.text.TextFrame")
mxShape->setPosition(maPosition);
if( bIsCustomShape )