diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-04-16 20:24:33 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-04-16 20:26:43 +0100 |
| commit | 8b9858b0aeae8bfb3af6dd8fcfce6cecdb9b8fab (patch) | |
| tree | df001b97d543d0965d696cf600f0d402b2d47738 /sd | |
| parent | b5fd106f93321fb79e74a4cbcd0ea9a62b6f4474 (diff) | |
Resolves: fdo#76916 'User paths' is missing in tab MotionMotion Paths tab
Change-Id: I38deeae3135badde23b9d454d548193af654caab
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/animations/CustomAnimationCreateDialog.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx index 97d7aaa66ac9..1e6580367152 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx @@ -175,7 +175,7 @@ void CategoryListBox::MouseButtonUp( const MouseEvent& rMEvt ) class CustomAnimationCreateTabPage : public TabPage { public: - CustomAnimationCreateTabPage( Window* pParent, CustomAnimationCreateDialog* pDialogParent, sal_uInt16 nTabId, const PresetCategoryList& rCategoryList, bool bHasText ); + CustomAnimationCreateTabPage( Window* pParent, CustomAnimationCreateDialog* pDialogParent, sal_uInt16 nTabId, const PresetCategoryList& rCategoryList, bool bHasText, bool bIsMotionPath = false ); virtual ~CustomAnimationCreateTabPage(); PathKind getCreatePathKind() const; @@ -236,7 +236,7 @@ bool ImplStlEffectCategorySortHelper::operator()( const CustomAnimationPresetPtr return mxCollator->compareString(p1->getLabel(), p2->getLabel()) == -1; } -CustomAnimationCreateTabPage::CustomAnimationCreateTabPage( Window* pParent, CustomAnimationCreateDialog* pDialogParent, sal_uInt16 nTabId, const PresetCategoryList& rCategoryList, bool bHasText ) +CustomAnimationCreateTabPage::CustomAnimationCreateTabPage( Window* pParent, CustomAnimationCreateDialog* pDialogParent, sal_uInt16 nTabId, const PresetCategoryList& rCategoryList, bool bHasText, bool bIsMotionPath ) : TabPage( pParent, "CustomAnimationCreateTab", "modules/simpress/ui/customanimationcreatetab.ui" ) , mpParent( pDialogParent ) , mnId( nTabId ) @@ -257,7 +257,7 @@ CustomAnimationCreateTabPage::CustomAnimationCreateTabPage( Window* pParent, Cus sal_Int32 nFirstEffect = LISTBOX_ENTRY_NOTFOUND; - if( nTabId == MOTIONPATH ) + if( bIsMotionPath ) { mpLBEffects->InsertCategory( sMotionPathLabel ); @@ -524,7 +524,7 @@ CustomAnimationCreateDialog::CustomAnimationCreateDialog( Window* pParent, Custo mpTabControl->SetTabPage( mnEmphasisId, mpTabPages[EMPHASIS] ); mpTabPages[EXIT] = new CustomAnimationCreateTabPage( mpTabControl, this, mnExitId, rPresets.getExitPresets(), bHasText ); mpTabControl->SetTabPage( mnExitId, mpTabPages[EXIT] ); - mpTabPages[MOTIONPATH] = new CustomAnimationCreateTabPage( mpTabControl, this, mnMPathId, rPresets.getMotionPathsPresets(), bHasText ); + mpTabPages[MOTIONPATH] = new CustomAnimationCreateTabPage( mpTabControl, this, mnMPathId, rPresets.getMotionPathsPresets(), bHasText, true ); mpTabControl->SetTabPage( mnMPathId, mpTabPages[MOTIONPATH] ); mpTabPages[MISCEFFECTS] = new CustomAnimationCreateTabPage( mpTabControl, this, mnMiscId, rPresets.getMiscPresets(), bHasText ); mpTabControl->SetTabPage( mnMiscId, mpTabPages[MISCEFFECTS] ); |