+ к rev.64371

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

Excel/model/clipboard.js

@@ -19,140 +19,6 @@
 		var isOnlyLocalBufferSafari = false;
 		var copyPasteUseBinary = true;
 		var copyPasteFromWordUseBinary = true;
-		
-		var Base64 = {
-		 
-			 // private property
-			 _keyStr : "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",
-			 
-			 // public method for encoding
-			 encode : function (input) {
-			  var output = "";
-			  var chr1, chr2, chr3, enc1, enc2, enc3, enc4;
-			  var i = 0;
-			 
-			  input = Base64._utf8_encode(input);
-			 
-			  while (i < input.length) {
-			 
-			   chr1 = input.charCodeAt(i++);
-			   chr2 = input.charCodeAt(i++);
-			   chr3 = input.charCodeAt(i++);
-			 
-			   enc1 = chr1 >> 2;
-			   enc2 = ((chr1 & 3) << 4) | (chr2 >> 4);
-			   enc3 = ((chr2 & 15) << 2) | (chr3 >> 6);
-			   enc4 = chr3 & 63;
-			 
-			   if (isNaN(chr2)) {
-				enc3 = enc4 = 64;
-			   } else if (isNaN(chr3)) {
-				enc4 = 64;
-			   }
-			 
-			   output = output +
-			   this._keyStr.charAt(enc1) + this._keyStr.charAt(enc2) +
-			   this._keyStr.charAt(enc3) + this._keyStr.charAt(enc4);
-			 
-			  }
-			 
-			  return output;
-			 },
-			 
-			 // public method for decoding
-			 decode : function (input) {
-			  var output = "";
-			  var chr1, chr2, chr3;
-			  var enc1, enc2, enc3, enc4;
-			  var i = 0;
-			 
-			  input = input.replace(/[^A-Za-z0-9\+\/\=]/g, "");
-			 
-			  while (i < input.length) {
-			 
-			   enc1 = this._keyStr.indexOf(input.charAt(i++));
-			   enc2 = this._keyStr.indexOf(input.charAt(i++));
-			   enc3 = this._keyStr.indexOf(input.charAt(i++));
-			   enc4 = this._keyStr.indexOf(input.charAt(i++));
-			 
-			   chr1 = (enc1 << 2) | (enc2 >> 4);
-			   chr2 = ((enc2 & 15) << 4) | (enc3 >> 2);
-			   chr3 = ((enc3 & 3) << 6) | enc4;
-			 
-			   output = output + String.fromCharCode(chr1);
-			 
-			   if (enc3 != 64) {
-				output = output + String.fromCharCode(chr2);
-			   }
-			   if (enc4 != 64) {
-				output = output + String.fromCharCode(chr3);
-			   }
-			 
-			  }
-			 
-			  output = Base64._utf8_decode(output);
-			 
-			  return output;
-			 
-			 },
-			 
-			 // private method for UTF-8 encoding
-			 _utf8_encode : function (string) {
-			  string = string.replace(/\r\n/g,"\n");
-			  var utftext = "";
-			 
-			  for (var n = 0; n < string.length; n++) {
-			 
-			   var c = string.charCodeAt(n);
-			 
-			   if (c < 128) {
-				utftext += String.fromCharCode(c);
-			   }
-			   else if((c > 127) && (c < 2048)) {
-				utftext += String.fromCharCode((c >> 6) | 192);
-				utftext += String.fromCharCode((c & 63) | 128);
-			   }
-			   else {
-				utftext += String.fromCharCode((c >> 12) | 224);
-				utftext += String.fromCharCode(((c >> 6) & 63) | 128);
-				utftext += String.fromCharCode((c & 63) | 128);
-			   }
-			 
-			  }
-			 
-			  return utftext;
-			 },
-			 
-			 // private method for UTF-8 decoding
-			 _utf8_decode : function (utftext) {
-			  var string = "";
-			  var i = 0;
-			  var c1, c2, c3;
-			 
-			  while ( i < utftext.length ) {
-			 
-			   c1 = utftext.charCodeAt(i);
-			 
-			   if (c1 < 128) {
-				string += String.fromCharCode(c1);
-				i++;
-			   } else if((c1 > 191) && (c1 < 224)) {
-				c2 = utftext.charCodeAt(i+1);
-				string += String.fromCharCode(((c1 & 31) << 6) | (c2 & 63));
-				i += 2;
-			   } else {
-				c2 = utftext.charCodeAt(i+1);
-				c3 = utftext.charCodeAt(i+2);
-				string += String.fromCharCode(((c1 & 15) << 12) | ((c2 & 63) << 6) | (c3 & 63));
-				i += 3;
-			   }
-			 
-			  }
-			 
-			  return string;
-			 }
-
-		};
 
 		function number2color(n) {
 			if( typeof(n)=="string" && n.indexOf("rgb")>-1)
@@ -2924,7 +2790,7 @@
 						time_interval);
 			},
 
-			_makeNodesFromCellValue: function (val, defFN, defFS,isQPrefix,isFormat,cell) {
+			_makeNodesFromCellValue: function (val, defFN, defFS, cell) {
 				var i, res, span, f;
 
 				function getTextDecoration(format) {
@@ -2957,18 +2823,8 @@
 					}
 					else{
 						span.textContent = val[i].text;
-						if(isQPrefix)
-							$(span).addClass("qPrefix");
-						else if(isFormat && isFormat.f && isFormat.wFormat)
-						{
-							var text = '';
-							for (var k = 0; k < val.length; ++k) {
-								text += val[k].text;
-							}
-							span.textContent = text;
-							i = val.length - 1;
-						}
 					}
+					
 					f = val[i].format;
 					if (f.c) 
 					{
@@ -3221,28 +3077,13 @@
 							}	
 							td.style.borderLeft = makeBorder(b.l);
 							td.style.borderTop = makeBorder(b.t);
-
-							
-							var isFormat = {};
-							isFormat.f = false;
-							isFormat.wFormat = false;
-							//add format
-							if(cell.getNumFormat() != null && cell.getNumFormat() != undefined && cell.getNumFormat().oTextFormat.formatString != '' && cell.getNumFormat().oTextFormat.formatString != null && (cell.getType() == 'n' || cell.getType() == null || cell.getType() == 0) && cell.getNumFormatStr() != 'General')
-							{
-								var formatStr = t._encode(cell.getNumFormatStr());
-								var valStr = t._encode(cell.getValueWithoutFormat());
-								$(td).addClass("nFormat" + formatStr + ';' + valStr);
-								isFormat.f = cell.getValueWithoutFormat();
-								isFormat.wFormat = true;
-							}
 								
 							
 							b = cell.getFill();
 							// если b==0 мы не зайдем в if, хотя b==0 это ни что иное, как черный цвет заливки.
 							if (b!=null) {td.style.backgroundColor = number2color(b.getRgb());}
 
-							var isQPrefix = cell.getQuotePrefix();
-							this._makeNodesFromCellValue(cell.getValue2(), fn ,fs,isQPrefix,isFormat,cell).forEach(
+							this._makeNodesFromCellValue(cell.getValue2(), fn ,fs, cell).forEach(
 									function(node){
 										td.appendChild(node);
 									});
@@ -3400,14 +3241,6 @@
 				return res;
 			},
 			
-			_encode : function (input) {
-				return Base64.encode(input).replace(/\//g, "_s").replace(/\+/g, "_p").replace(/=/g, "_e");
-			},
-
-			_decode : function (input) {
-				return Base64.decode(input.replace(/_s/g, "/").replace(/_p/g, "+").replace(/_e/g, "="));
-			},
-			
 			_getSelectedDrawingIndex : function(worksheet) {
 				if(!worksheet)
 					return false;

Excel/view/WorksheetView.js

@@ -8533,11 +8533,6 @@
 					var valFormat = '';
 					if(currentObj[0] !== undefined)
 						valFormat = currentObj[0].text;
-					if(currentObj.format !== null && currentObj.format !== '' && currentObj.format !== undefined)
-					{
-						var nameFormat = clipboard._decode(currentObj.format.split(';')[0]);
-						valFormat = clipboard._decode(currentObj.format.split(';')[1]);
-					}
 				}
 			}
 			for (var autoR = 0;autoR < maxARow; ++autoR) {
@@ -8554,11 +8549,6 @@
 									//{
 										var valFormat = currentObj[0].text;
 										var nameFormat = false;
-										if(currentObj.format !== null && currentObj.format !== '' && currentObj.format !== undefined)
-										{
-											nameFormat = clipboard._decode(currentObj.format.split(';')[0]);
-											valFormat = clipboard._decode(currentObj.format.split(';')[1]);
-										}
 									//}
 									if( currentObj[0].cellFrom ){
 										var offset = range.getCells()[0].getOffset2(currentObj[0].cellFrom),