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

[Julien Nabet]

 sd/source/ui/animations/CustomAnimationDialog.cxx |    3 ++-
 sd/source/ui/animations/CustomAnimationPane.cxx   |   20 ++++++++------------
 2 files changed, 10 insertions(+), 13 deletions(-)

New commits:
commit 685b6922351756b8caabcf4648fc3d7b274d398c
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Mon Nov 3 23:28:43 2014 +0100

    Resolves fdo#85750: Custom Animation timeing does not retain settings
    
    Conflicts:
    	sd/source/ui/animations/CustomAnimationPane.cxx
    
    Reviewed-on: https://gerrit.libreoffice.org/12236
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit 236819ecfa38360aa72d1061808b20204a0af594)
    
    Conflicts:
    	sd/source/ui/animations/CustomAnimationPane.cxx
    
    Change-Id: Id6bbd113630348493ed1e67da72c7a42c5188b44
    Reviewed-on: https://gerrit.libreoffice.org/12410
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index ae0fea1..76bb6b5 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -1955,6 +1955,7 @@ void CustomAnimationDurationTabPage::update( STLPropertySet* pSet )
         {
         case 0:
             break;
+
         case 6:
             {
                 Event aEvent;
@@ -1968,7 +1969,7 @@ void CustomAnimationDurationTabPage::update( STLPropertySet* pSet )
             break;
         default:
             {
-                OUString aText( mpCBRepeat->GetText() );
+                OUString aText(mpCBRepeat->GetEntry(nPos));
                 if( !aText.isEmpty() )
                     aRepeatCount <<= aText.toDouble();
             }
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 775c8e2..ff3b2ba 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -134,24 +134,20 @@ void fillDurationComboBox( ListBox* pBox )
 void fillRepeatComboBox( ListBox* pBox )
 {
     OUString aNone( SD_RESSTR( STR_CUSTOMANIMATION_REPEAT_NONE ) );
-    pBox->SetEntryData( pBox->InsertEntry( aNone ), (void*)((sal_Int32)0) );
-
-    pBox->SetEntryData( pBox->InsertEntry( OUString::number( 2 ) ), (void*)((sal_Int32)1) );
-    pBox->SetEntryData( pBox->InsertEntry( OUString::number( 3 ) ), (void*)((sal_Int32)3) );
-    pBox->SetEntryData( pBox->InsertEntry( OUString::number( 4 ) ), (void*)((sal_Int32)4) );
-    pBox->SetEntryData( pBox->InsertEntry( OUString::number( 5 ) ), (void*)((sal_Int32)5) );
-    pBox->SetEntryData( pBox->InsertEntry( OUString::number( 10 ) ), (void*)((sal_Int32)10) );
+    pBox->InsertEntry(aNone);
+    pBox->InsertEntry(OUString::number(2));
+    pBox->InsertEntry(OUString::number(3));
+    pBox->InsertEntry(OUString::number(4));
+    pBox->InsertEntry(OUString::number(5));
+    pBox->InsertEntry(OUString::number(10));
 
     OUString aUntilClick( SD_RESSTR( STR_CUSTOMANIMATION_REPEAT_UNTIL_NEXT_CLICK ) );
-    pBox->SetEntryData( pBox->InsertEntry( aUntilClick ), (void*)((sal_Int32)-1) );
+    pBox->InsertEntry(aUntilClick);
 
     OUString aEndOfSlide( SD_RESSTR( STR_CUSTOMANIMATION_REPEAT_UNTIL_END_OF_SLIDE ) );
-    pBox->SetEntryData( pBox->InsertEntry( aEndOfSlide ), (void*)((sal_Int32)-2) );
+    pBox->InsertEntry(aEndOfSlide);
 }
 
-
-
-
 CustomAnimationPane::CustomAnimationPane( ::Window* pParent, ViewShellBase& rBase,
                                           const cssu::Reference<css::frame::XFrame>& rxFrame,
                                           const Size& rMinSize )