summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorJustin Luth <justin_luth@sil.org>2018-06-28 15:48:40 +0300
committerMike Kaganski <mike.kaganski@collabora.com>2018-06-29 07:43:40 +0200
commit1cedd88d40a26a55ce433f8b742215aea83a5382 (patch)
tree2104981b42e82ef069992eb94a1cd71b4151e81e /sw/source
parente20b14e1e9f22a4ac55a7c9e6160f0b7665ff24d (diff)
tdf#118421 ww8export: rotate vertically: not Lines or groups
Lines and Groups often are exceptions. Normally, the import code swaps vertical rotations also. In the case of lines (from the tests that I observed) lines don't have a rotation value at that point during import, so no correction is made. Grouping always messes things up. Change-Id: I344c5a29f887294b751ffc87c01b30e472cfb4c2 Reviewed-on: https://gerrit.libreoffice.org/56595 Reviewed-by: Justin Luth <justin_luth@sil.org> Tested-by: Justin Luth <justin_luth@sil.org>
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/filter/ww8/wrtw8esh.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index 2949accdce54..34d3a650ecc6 100644
--- a/sw/source/filter/ww8/wrtw8esh.cxx
+++ b/sw/source/filter/ww8/wrtw8esh.cxx
@@ -692,7 +692,8 @@ void PlcDrawObj::WritePlc( WW8Export& rWrt ) const
// rotating to vertical means swapping height and width as seen in SvxMSDffManager::ImportShape
const long nAngle = NormAngle360( pObj->GetRotateAngle() );
- if ( ( nAngle > 4500 && nAngle <= 13500 ) || ( nAngle > 22500 && nAngle <= 31500 ) )
+ const bool bAllowSwap = pObj->GetObjIdentifier() != OBJ_LINE && pObj->GetObjIdentifier() != OBJ_GRUP;
+ if ( bAllowSwap && (( nAngle > 4500 && nAngle <= 13500 ) || ( nAngle > 22500 && nAngle <= 31500 )) )
{
const long nWidth = aRect.getWidth();
const long nHeight = aRect.getHeight();