commit 1cedd88d40a26a55ce433f8b742215aea83a5382
author Justin Luth <justin_luth@sil.org> Thu Jun 28 15:48:40 2018 +0300
committer Mike Kaganski <mike.kaganski@collabora.com> Fri Jun 29 07:43:40 2018 +0200
tree 2104981b42e82ef069992eb94a1cd71b4151e81e
parent e20b14e1e9f22a4ac55a7c9e6160f0b7665ff24d

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>

sw/qa/extras/ww8export/data/tdf70838b_verticalRotation.odt

diff --git a/sw/qa/extras/ww8export/data/tdf70838b_verticalRotation.odt b/sw/qa/extras/ww8export/data/tdf70838b_verticalRotation.odt
new file mode 100644
index 0000000..556f256
--- /dev/null
+++ b/sw/qa/extras/ww8export/data/tdf70838b_verticalRotation.odt
Binary files differ

sw/qa/extras/ww8export/ww8export2.cxx

diff --git a/sw/qa/extras/ww8export/ww8export2.cxx b/sw/qa/extras/ww8export/ww8export2.cxx
index e4e61cb..83eaac7 100644
--- a/sw/qa/extras/ww8export/ww8export2.cxx
+++ b/sw/qa/extras/ww8export/ww8export2.cxx
@@ -315,6 +315,18 @@ DECLARE_WW8EXPORT_TEST(testTdf70838, "tdf70838.odt")
    CPPUNIT_ASSERT(aRect.GetHeight() > aRect.GetWidth());
}

DECLARE_WW8EXPORT_TEST(testTdf70838b_verticalRotation, "tdf70838b_verticalRotation.odt")
{
    SwXTextDocument* pTextDoc = dynamic_cast<SwXTextDocument *>(mxComponent.get());
    SwDoc* pDoc = pTextDoc->GetDocShell()->GetDoc();
    SdrPage* pPage = pDoc->getIDocumentDrawModelAccess().GetDrawModel()->GetPage(0);
    tools::Rectangle aGroupShape = pPage->GetObj(0)->GetSnapRect();
    tools::Rectangle aLine = pPage->GetObj(2)->GetSnapRect();

    CPPUNIT_ASSERT_MESSAGE("Smiley faces are round", aGroupShape.GetHeight() > aGroupShape.GetWidth());
    CPPUNIT_ASSERT_MESSAGE("Line is taller, not wider", aLine.GetHeight() > aLine.GetWidth());
}

DECLARE_WW8EXPORT_TEST( testActiveXCheckbox, "checkbox_control.odt" )
{
    // First check box anchored as a floating object

sw/source/filter/ww8/wrtw8esh.cxx

diff --git a/sw/source/filter/ww8/wrtw8esh.cxx b/sw/source/filter/ww8/wrtw8esh.cxx
index 2949acc..34d3a65 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();