git-svn-id:...

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

PowerPoint/api.js

@@ -4317,7 +4317,11 @@ asc_docs_api.prototype.asyncImageEndLoaded2 = null;
 
 asc_docs_api.prototype.ChangeTheme = function(indexTheme)
 {
-    this.ThemeLoader.StartLoadTheme(indexTheme);
+    if (!this.isViewMode && this.WordControl.m_oLogicDocument.Document_Is_SelectionLocked(changestype_Theme) === false)
+    {
+        this.WordControl.m_oLogicDocument.Create_NewHistoryPoint();
+        this.ThemeLoader.StartLoadTheme(indexTheme);
+    }
 }
 
 asc_docs_api.prototype.StartLoadTheme = function()

Word/index.html

@@ -169,7 +169,6 @@
     <script type="text/javascript" src="../../../../OfficeWeb/Word/Editor/GraphicObjects/ObjectTypes/ChartTitle.js"></script>
     <script type="text/javascript" src="../../../../OfficeWeb/Word/Editor/GraphicObjects/ObjectTypes/TextBody.js"></script>
 
-    <script type="text/javascript" src="../../../../OfficeWeb/Word/Editor/CollaborativeEditing.js"></script>
     <script type="text/javascript" src="../../../../OfficeWeb/Word/Editor/Comments.js"></script>
     <script type="text/javascript" src="../../../../OfficeWeb/Word/Editor/History.js"></script>
     <script type="text/javascript" src="../../../../OfficeWeb/Word/Editor/Styles.js"></script>
@@ -210,6 +209,8 @@
     <script type="text/javascript" src="../../../../OfficeWeb/Word/apiCommon.js"></script>
 	<script type="text/javascript" src="../../../../OfficeWeb/Word/api.js"></script>
     <script type="text/javascript" src="../../../../OfficeWeb/Word/Drawing/scrolls/scroll.js"></script>
+	
+	<script type="text/javascript" src="../../../../OfficeWeb/Word/Editor/CollaborativeEditing.js"></script>
 
     <script type="text/javascript" src="../../../../OfficeWeb/Common/Shapes/EditorSettings.js"></script>
     <script type="text/javascript" src="../../../../OfficeWeb/Common/Shapes/Serialize.js"></script>