diff options
6 files changed, 9 insertions, 25 deletions
diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx index e9d70792a4f8..813ff4e1a69c 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx @@ -66,6 +66,8 @@ const int MISCEFFECTS = 4; // -------------------------------------------------------------------- +extern void fillDurationComboBox( ListBox* pBox ); + class CategoryListBox : public ListBox { public: @@ -248,6 +250,8 @@ CustomAnimationCreateTabPage::CustomAnimationCreateTabPage( Window* pParent, Cus get( mpCBSpeed, "effect_speed_list" ); get( mpCBXPReview, "auto_preview" ); + fillDurationComboBox(mpCBSpeed); + String sMotionPathLabel( SdResId( STR_CUSTOMANIMATION_USERPATH ) ); sal_uInt16 nFirstEffect = LISTBOX_ENTRY_NOTFOUND; diff --git a/sd/source/ui/animations/CustomAnimationDialog.cxx b/sd/source/ui/animations/CustomAnimationDialog.cxx index bcf2e7bcee28..53574e8686a4 100644 --- a/sd/source/ui/animations/CustomAnimationDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationDialog.cxx @@ -92,8 +92,8 @@ using ::com::sun::star::beans::XPropertySet; namespace sd { -extern void fillRepeatComboBox( ComboBox* pBox ); -extern void fillDurationComboBox( ComboBox* pBox ); +extern void fillRepeatComboBox( ListBox* pBox ); +extern void fillDurationComboBox( ListBox* pBox ); extern OUString getShapeDescription( const Reference< XShape >& xShape, bool bWithText = true ); extern OUString getPropertyName( sal_Int32 nPropertyType ); @@ -1746,8 +1746,8 @@ CustomAnimationDurationTabPage::CustomAnimationDurationTabPage(Window* pParent, get(mpRBInteractive, "rb_interactive" ); get(mpLBTrigger, "trigger_list"); - //fillRepeatComboBox( mpCBRepeat.get() ); - //fillDurationComboBox( mpCBDuration.get() ); + fillRepeatComboBox( mpCBRepeat ); + fillDurationComboBox( mpCBDuration ); mpRBClickSequence->SetClickHdl( LINK( this, CustomAnimationDurationTabPage, implControlHdl ) ); mpLBTrigger->SetSelectHdl( LINK( this, CustomAnimationDurationTabPage, implControlHdl ) ); diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx index 1fa17539c27f..58ef5c6cf017 100644 --- a/sd/source/ui/animations/CustomAnimationPane.cxx +++ b/sd/source/ui/animations/CustomAnimationPane.cxx @@ -195,6 +195,7 @@ CustomAnimationPane::CustomAnimationPane( ::Window* pParent, ViewShellBase& rBas maStrProperty = mpFTProperty->GetText(); + fillDurationComboBox( mpCBSpeed ); mpPBMoveUp->SetSymbol( SYMBOL_ARROW_UP ); mpPBMoveDown->SetSymbol( SYMBOL_ARROW_DOWN ); diff --git a/sd/uiconfig/simpress/ui/customanimationcreatetab.ui b/sd/uiconfig/simpress/ui/customanimationcreatetab.ui index 4de5a0de66c4..c51a92658868 100644 --- a/sd/uiconfig/simpress/ui/customanimationcreatetab.ui +++ b/sd/uiconfig/simpress/ui/customanimationcreatetab.ui @@ -44,13 +44,6 @@ <object class="GtkComboBoxText" id="effect_speed_list"> <property name="visible">True</property> <property name="can_focus">False</property> - <items> - <item translatable="yes">Very slow</item> - <item translatable="yes">Slow</item> - <item translatable="yes">Normal</item> - <item translatable="yes">Fast</item> - <item translatable="yes">Very fast</item> - </items> </object> <packing> <property name="expand">False</property> diff --git a/sd/uiconfig/simpress/ui/customanimationspanel.ui b/sd/uiconfig/simpress/ui/customanimationspanel.ui index eb887ef29c8b..635070376492 100644 --- a/sd/uiconfig/simpress/ui/customanimationspanel.ui +++ b/sd/uiconfig/simpress/ui/customanimationspanel.ui @@ -215,13 +215,6 @@ <property name="entry_text_column">0</property> <property name="id_column">1</property> <property name="hexpand">True</property> - <items> - <item translatable="yes">Very slow</item> - <item translatable="yes">Slow</item> - <item translatable="yes">Normal</item> - <item translatable="yes">Fast</item> - <item translatable="yes">Very fast</item> - </items> </object> <packing> <property name="left_attach">1</property> diff --git a/sd/uiconfig/simpress/ui/customanimationtimingtab.ui b/sd/uiconfig/simpress/ui/customanimationtimingtab.ui index a5305705278e..d5f38929d2bc 100644 --- a/sd/uiconfig/simpress/ui/customanimationtimingtab.ui +++ b/sd/uiconfig/simpress/ui/customanimationtimingtab.ui @@ -110,13 +110,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="hexpand">True</property> - <items> - <item translatable="yes">Very slow</item> - <item translatable="yes">Slow</item> - <item translatable="yes">Normal</item> - <item translatable="yes">Fast</item> - <item translatable="yes">Very fast</item> - </items> </object> <packing> <property name="left_attach">1</property> |