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

[Noel Grandin]

 sd/source/ui/animations/CustomAnimationCreateDialog.cxx |    8 ++++----
 sd/source/ui/animations/CustomAnimationPane.cxx         |    8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit 62aa0f83fa64c560e56f0af8629d81f327d39b5e
Author: Noel Grandin <n...@peralex.com>
Date:   Wed Oct 8 12:40:41 2014 +0200

    fix build after PathKind enum commit
    
    after my hasty commit
    bc00203  "convert PathKind enum in SD to enum class"
    
    Change-Id: I97263e907bf7363121dc1b437eaf564efdb66ad2

diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx 
b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
index 4be2448..6a68229 100644
--- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
+++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx
@@ -376,22 +376,22 @@ CustomAnimationPresetPtr 
CustomAnimationCreateTabPage::getSelectedPreset() const
 
 PathKind CustomAnimationCreateTabPage::getCreatePathKind() const
 {
-    PathKind eKind = NONE;
+    PathKind eKind = PathKind::NONE;
 
     if( mpLBEffects->GetSelectEntryCount() == 1 )
     {
         const sal_Int32 nPos = mpLBEffects->GetSelectEntryPos();
         if( nPos == mnCurvePathPos )
         {
-            eKind = CURVE;
+            eKind = PathKind::CURVE;
         }
         else if( nPos == mnPolygonPathPos )
         {
-            eKind = POLYGON;
+            eKind = PathKind::POLYGON;
         }
         else if( nPos == mnFreeformPathPos )
         {
-            eKind = FREEFORM;
+            eKind = PathKind::FREEFORM;
         }
     }
 
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx 
b/sd/source/ui/animations/CustomAnimationPane.cxx
index e457476..0c29199 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -1793,7 +1793,7 @@ void CustomAnimationPane::onChange( bool bCreate )
         else
         {
             PathKind eKind = pDlg->getCreatePathKind();
-            if( eKind != NONE )
+            if( eKind != PathKind::NONE )
                 createPath( eKind, aTargets, fDuration );
         }
         mrBase.GetDocShell()->SetModified();
@@ -1813,9 +1813,9 @@ void CustomAnimationPane::createPath( PathKind eKind, 
std::vector< Any >& rTarge
 
     switch( eKind )
     {
-    case CURVE:     nSID = SID_DRAW_BEZIER_NOFILL; break;
-    case POLYGON:   nSID = SID_DRAW_POLYGON_NOFILL; break;
-    case FREEFORM:  nSID = SID_DRAW_FREELINE_NOFILL; break;
+    case PathKind::CURVE:     nSID = SID_DRAW_BEZIER_NOFILL; break;
+    case PathKind::POLYGON:   nSID = SID_DRAW_POLYGON_NOFILL; break;
+    case PathKind::FREEFORM:  nSID = SID_DRAW_FREELINE_NOFILL; break;
     default: break;
     }
 
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits