diff options
| author | Andras Timar <andras.timar@collabora.com> | 2015-09-01 10:46:42 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-09-28 10:18:42 +0200 |
| commit | abe62e4d15862b5c7fa55051d562600e4d7429ca (patch) | |
| tree | 82834fc6016bee8494d68186e4e7a2e1f82ec590 /oox | |
| parent | 1f05e16a2cbeac406deb042249b2a7ca3d154c82 (diff) | |
tdf#93830 txXfrm offset workaround works in rounded rectangle case as well
Reviewed-on: https://gerrit.libreoffice.org/18226
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit cc88a88caad591270760d947848ad0a032d32bdb)
Conflicts:
sd/qa/unit/import-tests.cxx
(cherry picked from commit ce4a43f6be7ad71acc9ab513cc5db20d5cf5f36a)
Conflicts:
sd/qa/unit/import-tests.cxx
Change-Id: I5d8df5c0d55e8dfd7c978b16b2b220c127f3dac9
Diffstat (limited to 'oox')
| -rw-r--r-- | oox/source/drawingml/transform2dcontext.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/oox/source/drawingml/transform2dcontext.cxx b/oox/source/drawingml/transform2dcontext.cxx index 97015f395418..ffb41fbdc3dd 100644 --- a/oox/source/drawingml/transform2dcontext.cxx +++ b/oox/source/drawingml/transform2dcontext.cxx @@ -65,7 +65,8 @@ ContextHandlerRef Transform2DContext::onCreateContext( sal_Int32 aElementToken, { const OUString sXValue = rAttribs.getString( XML_x ).get(); const OUString sYValue = rAttribs.getString( XML_y ).get(); - if( !sXValue.isEmpty() && nType == XML_rect ) + + if( !sXValue.isEmpty() ) mrShape.getTextBody()->getTextProperties().moTextOffLeft = GetCoordinate( sXValue.toInt32() - mrShape.getPosition().X ); if( !sYValue.isEmpty() ) mrShape.getTextBody()->getTextProperties().moTextOffUpper = GetCoordinate( sYValue.toInt32() - mrShape.getPosition().Y ); |