From 0205f0a2712f0bbc3629b1cc8590105d5dcf11db Mon Sep 17 00:00:00 2001
From: Miklos Vajna <vmiklos@collabora.co.uk>
Date: Tue, 26 Nov 2013 16:24:13 +0100
Subject: DOCX drawingML shape import: initial wps:txbx positioning

Change-Id: Id779ed88d657257b614d910a2191ed4974612c8f
---
 oox/source/drawingml/shape.cxx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'oox')

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 )
-- 
cgit