diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-04-16 20:24:33 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2014-04-22 21:25:30 +0000 |
| commit | 60929c3ff6b39d40a9ad81f3fd13ea0ea3ae78e2 (patch) | |
| tree | 169df87425c6dabea9b977cc54b999b5a1f94bfc | |
| parent | e04b47ef73247607aa05d1c875557f0cce896df7 (diff) | |
Resolves: fdo#76916 'User paths' is missing in tab MotionMotion Paths tab
(cherry picked from commit 8b9858b0aeae8bfb3af6dd8fcfce6cecdb9b8fab)
Conflicts:
sd/source/ui/animations/CustomAnimationCreateDialog.cxx
Change-Id: I38deeae3135badde23b9d454d548193af654caab
Reviewed-on: https://gerrit.libreoffice.org/9076
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
(cherry picked from commit 8a42ecdaa6bf1c5d0c4749e3178daf2c3dc34ff3)
Reviewed-on: https://gerrit.libreoffice.org/9081
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Reviewed-by: Andrzej Hunt <andrzej.hunt@collabora.com>
| -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 257d7fe67cc8..178504f133ac 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx @@ -174,7 +174,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 ); ~CustomAnimationCreateTabPage(); PathKind getCreatePathKind() const; @@ -235,7 +235,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 ) @@ -256,7 +256,7 @@ CustomAnimationCreateTabPage::CustomAnimationCreateTabPage( Window* pParent, Cus sal_uInt16 nFirstEffect = LISTBOX_ENTRY_NOTFOUND; - if( nTabId == MOTIONPATH ) + if( bIsMotionPath ) { mpLBEffects->InsertCategory( sMotionPathLabel ); @@ -523,7 +523,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] ); |