[Libreoffice-commits] core.git: oox/source

[Luboš Luňák (via logerrit)]

 oox/source/ppt/slidetransition.cxx        |    4 ++++
 oox/source/ppt/slidetransitioncontext.cxx |    7 +++++++
 2 files changed, 11 insertions(+)

New commits:
commit c69e5e3cc08bfbb4a5f6c756c523e4016c8fd1dd
Author:     Luboš Luňák <l.lunak at collabora.com>
AuthorDate: Fri May 8 12:28:36 2020 +0200
Commit:     Luboš Luňák <l.lunak at collabora.com>
CommitDate: Fri May 8 17:37:41 2020 +0200

    read properly OOXML 'strips' slide transition as our SLIDEWIPE
    
    Change-Id: I584c66008e40d692021be5298cb9cdcc492eea05
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93716
    Reviewed-by: Luboš Luňák <l.lunak at collabora.com>
    Tested-by: Jenkins

diff --git a/oox/source/ppt/slidetransition.cxx b/oox/source/ppt/slidetransition.cxx
index 63d746fa6747..e65959634161 100644
--- a/oox/source/ppt/slidetransition.cxx
+++ b/oox/source/ppt/slidetransition.cxx
@@ -439,6 +439,10 @@ namespace oox::ppt {
             mnTransitionSubType = TransitionSubType::FADEOVERCOLOR;
             mnTransitionFadeColor = static_cast<sal_Int32>(COL_WHITE);
             break;
+        case PPT_TOKEN(strips):
+            mnTransitionType = TransitionType::SLIDEWIPE;
+            mnTransitionSubType = ooxToOdpCornerDirections( param1 );
+            break;
         default:
             mnTransitionType = 0;
             break;
diff --git a/oox/source/ppt/slidetransitioncontext.cxx b/oox/source/ppt/slidetransitioncontext.cxx
index 7a5f11b0cca2..dfd34a272147 100644
--- a/oox/source/ppt/slidetransitioncontext.cxx
+++ b/oox/source/ppt/slidetransitioncontext.cxx
@@ -167,6 +167,13 @@ SlideTransitionContext::~SlideTransitionContext() throw()
             maTransition.setPresetTransition(rAttribs.getString(XML_prst, ""));
         }
         return this;
+    case PPT_TOKEN( strips ):
+        if (!mbHasTransition)
+        {
+            mbHasTransition = true;
+            maTransition.setOoxTransitionType( aElementToken, rAttribs.getToken( XML_dir, XML_ld ), 0 );
+        }
+        return this;
 
 
     default: