git-svn-id:...

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@53310 954022d7-b5bf-4e40-9824-e11837661b57

DoctRenderer/COMMON/native.js

@@ -166,6 +166,8 @@ _null_object.css = function() { return this; };
 _null_object.width = function() { return 0; };
 _null_object.height = function() { return 0; };
 _null_object.attr = function() { return this; };
+_null_object.prop = function() { return this; };
+_null_object.val = function() { return this; };
 _null_object.remove = function() {};
 
 document.createElement = function(type)
@@ -240,6 +242,7 @@ function NativeOpenFile()
         var doc_bin = window.native.GetFileString(g_file_path);
         oBinaryFileReader.Read(doc_bin, window.asc_wb);
         
+        _api._coAuthoringInit();
         _api.wb = new Asc["WorkbookView"](
 					_api.wbModel,
 					_api.controller,
@@ -302,7 +305,6 @@ function NativeApplyChanges()
             }
         }
         
-        _api._coAuthoringInit();
         _api.CoAuthoringApi.onSaveChanges(__changes, false);
         _api.collaborativeEditing.applyChanges();
     }    

DoctRenderer/COMMON/native_xls/corrector.js

@@ -125,4 +125,6 @@ Asc["WorkbookView"].prototype.init = function (fontRenderingMode) {
 Asc["spreadsheet_api"].prototype._loadFonts = function(_fonts, callback)
 {
     return callback();
-};
\ No newline at end of file
+};
+
+Asc["asc_CEventsController"].prototype.reinitializeScroll = function() {};
\ No newline at end of file

DoctRenderer/DoctRenderer.h

@@ -380,6 +380,7 @@ private:
 		
 		if (try_catch.HasCaught()) 
 		{
+			int nLineError = try_catch.Message()->GetLineNumber();
 			strException = to_cstring(try_catch.Message()->Get());
 			return FALSE;
 		}
@@ -414,6 +415,7 @@ private:
 			
 			if (try_catch.HasCaught()) 
 			{
+				int nLineError = try_catch.Message()->GetLineNumber();
 				strException = to_cstring(try_catch.Message()->Get()); //  ?  
 				return FALSE;
 			}
@@ -434,6 +436,7 @@ private:
 			
 			if (try_catch.HasCaught()) 
 			{
+				int nLineError = try_catch.Message()->GetLineNumber();
 				strException = to_cstring(try_catch.Message()->Get()); //  ?  
 				return FALSE;
 			}
@@ -448,6 +451,8 @@ private:
 				
 				if (try_catch.HasCaught()) 
 				{
+					int nLineError = try_catch.Message()->GetLineNumber();
+					CString strCode = to_cstring(try_catch.Message()->GetSourceLine());
 					strException = to_cstring(try_catch.Message()->Get()); //  ?  
 					return FALSE;
 				}
@@ -467,6 +472,7 @@ private:
 					
 					if (try_catch.HasCaught()) 
 					{
+						int nLineError = try_catch.Message()->GetLineNumber();
 						strException = to_cstring(try_catch.Message()->Get()); //  ?  
 						return FALSE;
 					}
@@ -491,6 +497,7 @@ private:
 					
 					if (try_catch.HasCaught()) 
 					{
+						int nLineError = try_catch.Message()->GetLineNumber();
 						strException = to_cstring(try_catch.Message()->Get()); //  ?  
 						return FALSE;
 					}
@@ -536,6 +543,7 @@ private:
 
 						if (try_catch.HasCaught()) 
 						{
+							int nLineError = try_catch.Message()->GetLineNumber();
 							strException = to_cstring(try_catch.Message()->Get()); //  ?  
 							return FALSE;
 						}

DoctRenderer/Resources/xls_editor.js

@@ -166,6 +166,8 @@ _null_object.css = function() { return this; };
 _null_object.width = function() { return 0; };
 _null_object.height = function() { return 0; };
 _null_object.attr = function() { return this; };
+_null_object.prop = function() { return this; };
+_null_object.val = function() { return this; };
 _null_object.remove = function() {};
 
 document.createElement = function(type)
@@ -240,6 +242,7 @@ function NativeOpenFile()
         var doc_bin = window.native.GetFileString(g_file_path);
         oBinaryFileReader.Read(doc_bin, window.asc_wb);
         
+        _api._coAuthoringInit();
         _api.wb = new Asc["WorkbookView"](
 					_api.wbModel,
 					_api.controller,
@@ -302,7 +305,6 @@ function NativeApplyChanges()
             }
         }
         
-        _api._coAuthoringInit();
         _api.CoAuthoringApi.onSaveChanges(__changes, false);
         _api.collaborativeEditing.applyChanges();
     }    
@@ -290465,5 +290467,7 @@ Asc["WorkbookView"].prototype.init = function (fontRenderingMode) {
 Asc["spreadsheet_api"].prototype._loadFonts = function(_fonts, callback)
 {
     return callback();
-};
+};
+
+Asc["asc_CEventsController"].prototype.reinitializeScroll = function() {};