git-svn-id:...

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

PowerPoint/Editor/Format/Presentation.js

@@ -1191,9 +1191,9 @@ CPresentation.prototype =
                     return true;
                 }
             }
-            for(slide_num = 0; slide_num < this.CurPage; ++slide_num)
+            for(slide_num = 0; slide_num <= this.CurPage; ++slide_num)
             {
-                search_select_data = this.Slides[slide_num].graphicObjects.startSearchText(text, scanForward);
+                search_select_data = this.Slides[slide_num].graphicObjects.startSearchText(text, scanForward, true);
                 if(search_select_data != null)
                 {
                     this.DrawingDocument.m_oWordControl.GoToPage(slide_num);
@@ -1216,9 +1216,9 @@ CPresentation.prototype =
                     return true;
                 }
             }
-            for(slide_num = this.Slides.length - 1; slide_num > this.CurPage; --slide_num)
+            for(slide_num = this.Slides.length - 1; slide_num >= this.CurPage; --slide_num)
             {
-                search_select_data = this.Slides[slide_num].graphicObjects.startSearchText(text, scanForward);
+                search_select_data = this.Slides[slide_num].graphicObjects.startSearchText(text, scanForward, true);
                 if(search_select_data != null)
                 {
                     this.DrawingDocument.m_oWordControl.GoToPage(slide_num);
@@ -1228,6 +1228,7 @@ CPresentation.prototype =
                 }
             }
         }
+
         return false;
     },
 

PowerPoint/Editor/GraphicObjects.js

@@ -2025,7 +2025,7 @@ CGraphicObjects.prototype = {
         }
     },
 
-    startSearchText : function(str, scanForward) //
+    startSearchText : function(str, scanForward, bNullState) //
     {
         if(typeof(str) != "string")
             return null;
@@ -2038,9 +2038,9 @@ CGraphicObjects.prototype = {
         var _arr_sel_states = null;
         var NumSelected = this.selectedObjects.length;
         var ArrGlyph = this.slide.cSld.spTree;
-        if(this.State.id == STATES_ID_NULL)
+        if(this.State.id == STATES_ID_NULL || bNullState === true)
         {
-            if(NumSelected == 0 || NumSelected == ArrGlyph.length)
+            if(NumSelected == 0 || NumSelected == ArrGlyph.length || bNullState)
             {
                 if(scanForward == true)
                 {