pptx: "fall" transition, which needed p15 namespace

Added p15 namespace which is present in MSO 2013+ documents. It
adds a "prstTrans" element with a string "prst" attribute which
is a name of the transition to be performed.

This was added to support "fall" transition which translates to
"fallOver" preset transition.

Change-Id: I429bb106a12c1b99cce756502508e917720daef3

2 files changed, 34 insertions, 9 deletions

diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index f16e9e9547fc..7b078aad1899 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -1415,6 +1415,9 @@ void SdExportTest::testExportTransitionsPPTX()
     // INSIDE TURNING CUBE
     CPPUNIT_ASSERT(checkTransitionOnPage(xDoc, 60, TransitionType::MISCSHAPEWIPE, TransitionSubType::CORNERSIN));
 
+    // FALL
+    CPPUNIT_ASSERT(checkTransitionOnPage(xDoc, 61, TransitionType::MISCSHAPEWIPE, TransitionSubType::LEFTTORIGHT));
+
     // VORTEX
     CPPUNIT_ASSERT(checkTransitionOnPage(xDoc, 70, TransitionType::MISCSHAPEWIPE, TransitionSubType::VERTICAL));
 
diff --git a/sd/source/filter/eppt/pptx-epptooxml.cxx b/sd/source/filter/eppt/pptx-epptooxml.cxx
index 9d412f79a696..4d10949a3d8a 100644
--- a/sd/source/filter/eppt/pptx-epptooxml.cxx
+++ b/sd/source/filter/eppt/pptx-epptooxml.cxx
@@ -70,6 +70,7 @@
                       FSNS(XML_xmlns, XML_p),   "http://schemas.openxmlformats.org/presentationml/2006/main", \
                       FSNS(XML_xmlns, XML_r),   "http://schemas.openxmlformats.org/officeDocument/2006/relationships", \
                       FSNS(XML_xmlns, XML_p14), "http://schemas.microsoft.com/office/powerpoint/2010/main", \
+                      FSNS(XML_xmlns, XML_p15), "http://schemas.microsoft.com/office/powerpoint/2012/main", \
                       FSNS(XML_xmlns, XML_mc),  "http://schemas.openxmlformats.org/markup-compatibility/2006"
 
 
@@ -521,16 +522,20 @@ void PowerPointExport::WriteTransition( FSHelperPtr pFS )
     bool bOOXmlSpecificTransition = false;
 
     sal_Int32 nTransition = 0;
-    sal_Int32 nTransition14 = 0;
-
     const char* pDirection = NULL;
     const char* pDirection14 = NULL;
     const char* pOrientation = NULL;
     const char* pThruBlk = NULL;
     const char* pSpokes = NULL;
     char pSpokesTmp[2] = "0";
+
+    // p14
+    sal_Int32 nTransition14 = 0;
     const char* pInverted = nullptr;
 
+    //p15
+    const char* pPresetTransition = nullptr;
+
     if (!nPPTTransitionType)
     {
         switch(nTransitionType)
@@ -570,6 +575,11 @@ void PowerPointExport::WriteTransition( FSHelperPtr pFS )
                         nTransition14 = XML_ripple;
                         bOOXmlSpecificTransition = true;
                         break;
+                    case animations::TransitionSubType::LEFTTORIGHT: // Fall
+                        nTransition = XML_fade;
+                        pPresetTransition = "fallOver";
+                        bOOXmlSpecificTransition = true;
+                        break;
                     case animations::TransitionSubType::CORNERSIN:
                         pInverted = "true";
                     case animations::TransitionSubType::CORNERSOUT:
@@ -615,20 +625,32 @@ void PowerPointExport::WriteTransition( FSHelperPtr pFS )
     if( changeType == 1 && GETA( Duration ) )
         mAny >>= advanceTiming;
 
-    if (nTransition14)
+    if (nTransition14 || pPresetTransition)
     {
+        const char* pRequiresNS = nTransition14 ? "p14" : "p15";
+
         pFS->startElement(FSNS(XML_mc, XML_AlternateContent), FSEND);
-        pFS->startElement(FSNS(XML_mc, XML_Choice), XML_Requires, "p14", FSEND);
+        pFS->startElement(FSNS(XML_mc, XML_Choice), XML_Requires, pRequiresNS, FSEND);
+
 
         pFS->startElementNS(XML_p, XML_transition,
                             XML_spd, speed,
                             XML_advTm, advanceTiming != -1 ? I32S( advanceTiming*1000 ) : NULL,
                             FSEND );
 
-        pFS->singleElementNS(XML_p14, nTransition14,
-                             XML_isInverted, pInverted,
-                             XML_dir, pDirection14,
-                             FSEND );
+        if (nTransition14)
+        {
+            pFS->singleElementNS(XML_p14, nTransition14,
+                                 XML_isInverted, pInverted,
+                                 XML_dir, pDirection14,
+                                 FSEND );
+        }
+        else if (pPresetTransition)
+        {
+            pFS->singleElementNS(XML_p15, XML_prstTrans,
+                                 XML_prst, pPresetTransition,
+                                 FSEND );
+        }
 
         pFS->endElement(FSNS(XML_p, XML_transition));
 
@@ -745,7 +767,7 @@ void PowerPointExport::WriteTransition( FSHelperPtr pFS )
 
     pFS->endElementNS(XML_p, XML_transition);
 
-    if (nTransition14)
+    if (nTransition14 || pPresetTransition)
     {
         pFS->endElement(FSNS(XML_mc, XML_Fallback));
         pFS->endElement(FSNS(XML_mc, XML_AlternateContent));