[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sd/source

Zolnai Tamás tamas.zolnai at collabora.com
Wed Apr 16 05:16:45 PDT 2014


 sd/source/ui/animations/CustomAnimationCreateDialog.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c78962970b81ea9db925075c94db13b8c0d42a79
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Mon Apr 14 12:14:48 2014 +0200

    Slideshow: Fix regression related to media animations
    
    Misc effects tab page animations were lost.
    Regression from
    9695f38ca4ab26b40524f2eade98c45f0360131d.
    
    Change-Id: I81f7321d7dd87f5b0f6b4acbecbd60241ab1e430
    (cherry picked from commit 81e98150cc04ad764abc668dc12b91d3de90369e)
    Reviewed-on: https://gerrit.libreoffice.org/9054
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
index 257d7fe..0eb084a 100644
--- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
@@ -569,7 +569,7 @@ CustomAnimationCreateTabPage* CustomAnimationCreateDialog::getCurrentPage() cons
 {
     sal_Int16 curPageId = mpTabControl->GetCurPageId();
 
-    for( sal_uInt16 i = ENTRANCE; i <= MOTIONPATH; i++ )
+    for( sal_uInt16 i = ENTRANCE; i <= MISCEFFECTS; i++ )
     {
         if( mpTabPages[i]->getId() == curPageId )
             return mpTabPages[i];


More information about the Libreoffice-commits mailing list