git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@49763 954022d7-b5bf-4e40-9824-e11837661b57

Common/commonDefines.js

@@ -24,22 +24,7 @@ var c_oAscNumFormatType = {
 	Fraction : 10
 }
 
-// Chart defines
-var c_oAscChartType = {
-	line: "Line",
-	bar: "Bar",
-	hbar: "HBar",
-	area: "Area",
-	pie: "Pie",
-	scatter: "Scatter",
-	stock: "Stock"
- };
 
- var c_oAscChartSubType = {
-	normal: "normal",
-	stacked: "stacked",
-	stackedPer: "stackedPer"
- };
 
  var c_oAscChartLegend = {
 	left: "left",
@@ -61,16 +46,7 @@ var c_oAscChartType = {
 	SendBackward: 3
  };
  
- var c_oAscChartStyle = {
-	Dark: 1,
-	Standart: 2,
-	Accent1: 3,
-	Accent2: 4,
-	Accent3: 5,
-	Accent4: 6,
-	Accent5: 7,
-	Accent6: 8
-};
+
 
 var	c_oAscTransactionState = { 
 	No: -1,
@@ -97,15 +73,3 @@ var c_oAscLineDrawingRule = {
     Bottom : 2
 };
 
-
-var c_oAscTypeSelectElement = {
-    Paragraph  : 0,
-    Table      : 1,
-    Image      : 2,
-    Header     : 3,
-    Hyperlink  : 4,
-    SpellCheck : 5,
-    Shape:6,
-    Slide:7,
-    Chart: 8
-};
\ No newline at end of file

Excel/apiDefines.js

@@ -369,6 +369,18 @@ var c_oAscLineBeginType = {
     Triangle: 5
 };
 
+var c_oAscTypeSelectElement = {
+    Paragraph  : 0,
+    Table      : 1,
+    Image      : 2,
+    Header     : 3,
+    Hyperlink  : 4,
+    SpellCheck : 5,
+    Shape:6,
+    Slide:7,
+    Chart: 8
+};
+
 var c_oAscLineBeginSize = {
     small_small : 0,
     small_mid : 1,
@@ -394,6 +406,35 @@ var c_oAscVerticalTextAlign = {
     TEXT_ALIGN_JUST : 3,// (Text Anchor Enum ( Justified ))
     TEXT_ALIGN_TOP : 4// Top
 };
+
+
+// Chart defines
+var c_oAscChartType = {
+    line: "Line",
+    bar: "Bar",
+    hbar: "HBar",
+    area: "Area",
+    pie: "Pie",
+    scatter: "Scatter",
+    stock: "Stock"
+};
+
+var c_oAscChartSubType = {
+    normal: "normal",
+    stacked: "stacked",
+    stackedPer: "stackedPer"
+};
+
+var c_oAscChartStyle = {
+    Dark: 1,
+    Standart: 2,
+    Accent1: 3,
+    Accent2: 4,
+    Accent3: 5,
+    Accent4: 6,
+    Accent5: 7,
+    Accent6: 8
+};
  
 var c_oAscCoAuthoringMeBorderColor					= "rgba(22,156,0,1)";
 var c_oAscCoAuthoringOtherBorderColor				= "rgba(238,53,37,1)";

PowerPoint/Editor/Format/CollaborativeEditing.js

@@ -1109,6 +1109,8 @@ var changestype_PresentationProps    = 63; // Изменение темы, цв
 var changestype_Theme                = 64; // Изменение темы;
 var changestype_SlideSize            = 65; // Изменение цветовой схемы;
 var changestype_SlideBg              = 66; // Изменение цветовой схемы;
+var changestype_SlideTiming          = 67; // Изменение цветовой схемы;
+
 
 
 

PowerPoint/Editor/Format/Presentation.js

@@ -6313,6 +6313,21 @@ CPresentation.prototype =
             }
         }
 
+        if(CheckType === changestype_SlideTiming)
+        {
+            var selected_slides = editor.WordControl.Thumbnails.GetSelectedArray();
+            for(var i = 0; i < selected_slides.length; ++i)
+            {
+                var check_obj =
+                {
+                    "type": c_oAscLockTypeElemPresentation.Slide,
+                    "val": this.Slides[selected_slides[i]].timingLock.Get_Id(),
+                    "guid": this.Slides[selected_slides[i]].timingLock.Get_Id()
+                };
+                this.Slides[selected_slides[i]].timingLock.Lock.Check(check_obj);
+            }
+        }
+
         if(CheckType === changestype_Text_Props)
         {
             if(cur_slide.deleteLock.Lock.Type !== locktype_Mine && cur_slide.deleteLock.Lock.Type !== locktype_None)

PowerPoint/Editor/Format/Slide.js

@@ -906,7 +906,7 @@ Slide.prototype =
     applyTiming: function(timing)
     {
         var oldTiming = this.timing.createDuplicate();
-        this.timing.applyProps(oTiming);
+        this.timing.applyProps(timing);
         History.Add(this, {Type: historyitem_ChangeTiming, oldTiming: oldTiming, newTiming: this.timing.createDuplicate()});
 
     },

PowerPoint/api.js

@@ -4180,16 +4180,17 @@ asc_docs_api.prototype.DemonstrationGoToSlide = function(slideNum)
 
 asc_docs_api.prototype.ApplySlideTiming = function(oTiming)
 {
-    var _count = this.WordControl.m_oDrawingDocument.SlidesCount;
-    var _cur = this.WordControl.m_oDrawingDocument.SlideCurrent;
-    if (_cur < 0 || _cur >= _count)
-        return;
-    var _curSlide = this.WordControl.m_oLogicDocument.Slides[_cur];
-    _curSlide.timing.applyProps(oTiming);
-
-    this.sync_BeginCatchSelectedElements();
-    this.sync_slidePropCallback(_curSlide);
-    this.sync_EndCatchSelectedElements();
+    if(this.WordControl.m_oLogicDocument.Document_Is_SelectionLocked(changestype_SlideTiming) === false)
+    {
+        History.Create_NewPoint();
+        var _count = this.WordControl.m_oDrawingDocument.SlidesCount;
+        var _cur = this.WordControl.m_oDrawingDocument.SlideCurrent;
+        if (_cur < 0 || _cur >= _count)
+            return;
+        var _curSlide = this.WordControl.m_oLogicDocument.Slides[_cur];
+        _curSlide.applyTiming(oTiming);
+    }
+    this.WordControl.m_oLogicDocument.Document_UpdateInterfaceState();
 }
 asc_docs_api.prototype.SlideTimingApplyToAll = function()
 {

PowerPoint/apiDefines.js

@@ -121,6 +121,18 @@ var c_oAscError = {
 	}
 };
 
+
+var c_oAscTypeSelectElement = {
+    Paragraph  : 0,
+    Table      : 1,
+    Image      : 2,
+    Header     : 3,
+    Hyperlink  : 4,
+    SpellCheck : 5,
+    Shape:6,
+    Slide:7,
+    Chart: 8
+};
 var c_oAscContextMenuTypes = {
     Main       : 0,
     Thumbnails : 1
@@ -137,6 +149,36 @@ var c_oAscTableBordersType = {
 	OUTSIDE:7,
 	ALL:8
 };
+
+
+// Chart defines
+var c_oAscChartType = {
+    line: "Line",
+    bar: "Bar",
+    hbar: "HBar",
+    area: "Area",
+    pie: "Pie",
+    scatter: "Scatter",
+    stock: "Stock"
+};
+
+var c_oAscChartSubType = {
+    normal: "normal",
+    stacked: "stacked",
+    stackedPer: "stackedPer"
+};
+
+var c_oAscChartStyle = {
+    Dark: 1,
+    Standart: 2,
+    Accent1: 3,
+    Accent2: 4,
+    Accent3: 5,
+    Accent4: 6,
+    Accent5: 7,
+    Accent6: 8
+};
+
 var FONT_THUMBNAIL_HEIGHT = (7 * 96.0 / 25.4) >> 0;
 
 var THEME_THUMBNAIL_WIDTH = 180;

Word/apiDefines.js

@@ -102,6 +102,17 @@ var c_oAscError = {
 	}
 };
 
+var c_oAscTypeSelectElement = {
+    Paragraph  : 0,
+    Table      : 1,
+    Image      : 2,
+    Header     : 3,
+    Hyperlink  : 4,
+    SpellCheck : 5,
+    Shape:6,
+    Slide:7,
+    Chart: 8
+};
 
 var c_oAscTableBordersType = {
 	LEFT:0,
@@ -129,6 +140,34 @@ var c_oAscLineDrawingRule = {
     Bottom : 2
 };
 
+// Chart defines
+var c_oAscChartType = {
+    line: "Line",
+    bar: "Bar",
+    hbar: "HBar",
+    area: "Area",
+    pie: "Pie",
+    scatter: "Scatter",
+    stock: "Stock"
+};
+
+var c_oAscChartSubType = {
+    normal: "normal",
+    stacked: "stacked",
+    stackedPer: "stackedPer"
+};
+
+var c_oAscChartStyle = {
+    Dark: 1,
+    Standart: 2,
+    Accent1: 3,
+    Accent2: 4,
+    Accent3: 5,
+    Accent4: 6,
+    Accent5: 7,
+    Accent6: 8
+};
+
 var align_Right   = 0;
 var align_Left    = 1;
 var align_Center  = 2;