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

[Julien Nabet]

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

New commits:
commit 236819ecfa38360aa72d1061808b20204a0af594
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
    
    Change-Id: Id6bbd113630348493ed1e67da72c7a42c5188b44
    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>

diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx
index 82dd8a7..1da5de8 100644
--- a/sd/source/ui/animations/CustomAnimationDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationDialog.cxx
@@ -1811,6 +1811,7 @@ void CustomAnimationDurationTabPage::update( STLPropertySet* pSet )
         {
         case 0:
             break;
+
         case 6:
             {
                 Event aEvent;
@@ -1824,7 +1825,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 8f0d8ae..b7087f9 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -131,19 +131,18 @@ void fillDurationComboBox( ListBox* pBox )
 void fillRepeatComboBox( ListBox* pBox )
 {
     OUString aNone( SD_RESSTR( STR_CUSTOMANIMATION_REPEAT_NONE ) );
-    pBox->SetEntryData( pBox->InsertEntry( aNone ), reinterpret_cast<void*>((sal_Int32)0) );
-
-    pBox->SetEntryData( pBox->InsertEntry( OUString::number( 2 ) ), reinterpret_cast<void*>((sal_Int32)1) );
-    pBox->SetEntryData( pBox->InsertEntry( OUString::number( 3 ) ), reinterpret_cast<void*>((sal_Int32)3) );
-    pBox->SetEntryData( pBox->InsertEntry( OUString::number( 4 ) ), reinterpret_cast<void*>((sal_Int32)4) );
-    pBox->SetEntryData( pBox->InsertEntry( OUString::number( 5 ) ), reinterpret_cast<void*>((sal_Int32)5) );
-    pBox->SetEntryData( pBox->InsertEntry( OUString::number( 10 ) ), reinterpret_cast<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 ), reinterpret_cast<void*>((sal_Int32)-1) );
+    pBox->InsertEntry(aUntilClick);
 
     OUString aEndOfSlide( SD_RESSTR( STR_CUSTOMANIMATION_REPEAT_UNTIL_END_OF_SLIDE ) );
-    pBox->SetEntryData( pBox->InsertEntry( aEndOfSlide ), reinterpret_cast<void*>((sal_Int32)-2) );
+    pBox->InsertEntry(aEndOfSlide);
 }
 
 CustomAnimationPane::CustomAnimationPane( Window* pParent, ViewShellBase& rBase,