bnc#902652 OOXML: fix import of insets when shape and/or shape text is rotated

5ac575ee did not get it right, the vert attribute (i.e. the
rotation of text) is relevant, not the rotation of the shape. In
that case both text and shape rotation were 270 degrees. I checked
that the bugdoc of bnc#773048 looked good after this.

Change-Id: I6e0401cd138a82040df82d7da1a47311db7771e4
Reviewed-on: https://gerrit.libreoffice.org/15076Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Andras Timar <andras.timar@collabora.com>

oox/inc/drawingml/textbodyproperties.hxx

@@ -45,7 +45,7 @@ struct TextBodyProperties
 
     explicit            TextBodyProperties();
 
-    void                pushRotationAdjustments( sal_Int32 nRotation );
+    void                pushRotationAdjustments();
     void                pushVertSimulation();
 };
 

oox/source/drawingml/shape.cxx

@@ -652,7 +652,7 @@ Reference< XShape > Shape::createAndInsert(
         // add properties from textbody to shape properties
         if( mpTextBody.get() )
         {
-            mpTextBody->getTextProperties().pushRotationAdjustments( mnRotation );
+            mpTextBody->getTextProperties().pushRotationAdjustments();
             aShapeProps.assignUsed( mpTextBody->getTextProperties().maPropertyMap );
             // Push char properties as well - specifically useful when this is a placeholder
             if( mpMasterTextListStyle &&  mpMasterTextListStyle->getListStyle()[0]->getTextCharacterProperties().moHeight.has() )

oox/source/drawingml/textbodyproperties.cxx

@@ -58,17 +58,17 @@ void TextBodyProperties::pushVertSimulation()
 }
 
 /* Push adjusted values, taking into consideration Shape Rotation */
-void TextBodyProperties::pushRotationAdjustments( sal_Int32 nRotation )
+void TextBodyProperties::pushRotationAdjustments()
 {
     sal_Int32 nOff      = 0;
     sal_Int32 aProps[]  = { PROP_TextLeftDistance, PROP_TextUpperDistance, PROP_TextRightDistance, PROP_TextLowerDistance };
     sal_Int32 n         = ( sal_Int32 )( sizeof( aProps ) / sizeof( sal_Int32 ) );
 
-    switch( nRotation ) // TODO: What happens for part rotations ?
+    switch( moRotation.get(0) )
     {
-        case (90*1*60000): nOff = 1; break;
+        case (90*1*60000): nOff = 3; break;
         case (90*2*60000): nOff = 2; break;
-        case (90*3*60000): nOff = 3; break;
+        case (90*3*60000): nOff = 1; break;
         default: break;
     }
 

sd/qa/unit/import-tests.cxx

@@ -179,6 +179,7 @@ void SdImportTest::testDocumentLayout()
         { "n762695.pptx", "xml/n762695_", PPTX, -1 },
         { "n593612.pptx", "xml/n593612_", PPTX, -1 },
         { "fdo71434.pptx", "xml/fdo71434_", PPTX, -1 },
+        { "n902652.pptx", "xml/n902652_", PPTX, -1 },
         // { "pptx/n828390.pptx", "pptx/xml/n828390_", PPTX, PPTX }, // Example
     };