Commit 5ba8a91f authored by Alexander.Trofimov's avatar Alexander.Trofimov Committed by Alexander.Trofimov

Убрал лишние функции для возврата и генерации большой картинки стилей.

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@66839 954022d7-b5bf-4e40-9824-e11837661b57
parent 30fd287e
...@@ -2836,15 +2836,13 @@ CAscMathCategory.prototype["get_W"] = function(){ return this.W; }; ...@@ -2836,15 +2836,13 @@ CAscMathCategory.prototype["get_W"] = function(){ return this.W; };
CAscMathCategory.prototype["get_H"] = function(){ return this.H; }; CAscMathCategory.prototype["get_H"] = function(){ return this.H; };
CAscMathCategory.prototype.private_Sort = function(){ this.Data.sort( function(a,b){ return a.Id- b.Id; } ); }; CAscMathCategory.prototype.private_Sort = function(){ this.Data.sort( function(a,b){ return a.Id- b.Id; } ); };
function CStyleImage(name, ind, type, image, uiPriority) { function CStyleImage(name, type, image, uiPriority) {
this.name = name; this.name = name;
this.thumbnailOffset = ind;
this.type = type; this.type = type;
this.image = image; this.image = image;
this.uiPriority = uiPriority; this.uiPriority = uiPriority;
} }
CStyleImage.prototype['asc_getName'] = CStyleImage.prototype['get_Name'] = function() { return this.name; }; CStyleImage.prototype['asc_getName'] = CStyleImage.prototype['get_Name'] = function() { return this.name; };
CStyleImage.prototype['asc_getThumbnailOffset'] = CStyleImage.prototype['get_ThumbnailOffset'] = function() { return this.thumbnailOffset; };
CStyleImage.prototype['asc_getType'] = CStyleImage.prototype['get_Type'] = function() { return this.type; }; CStyleImage.prototype['asc_getType'] = CStyleImage.prototype['get_Type'] = function() { return this.type; };
CStyleImage.prototype['asc_getImage'] = function() { return this.image; }; CStyleImage.prototype['asc_getImage'] = function() { return this.image; };
......
...@@ -1358,7 +1358,7 @@ ...@@ -1358,7 +1358,7 @@
// ToDo Возможно стоит переписать немного, чтобы не пробегать каждый раз по массиву custom-стилей (нужно генерировать AllStyles) // ToDo Возможно стоит переписать немного, чтобы не пробегать каждый раз по массиву custom-стилей (нужно генерировать AllStyles)
oCustomStyle = cellStylesAll.getCustomStyleByBuiltinId(oStyle.BuiltinId); oCustomStyle = cellStylesAll.getCustomStyleByBuiltinId(oStyle.BuiltinId);
this.defaultStyles[i] = new CStyleImage(oStyle.Name, styleIndex, c_oAscStyleImage.Default); this.defaultStyles[i] = new CStyleImage(oStyle.Name, c_oAscStyleImage.Default);
this.native.BeginDrawDefaultStyle(oStyle.Name, styleIndex); this.native.BeginDrawDefaultStyle(oStyle.Name, styleIndex);
this.drawStyle(oGraphics, stringRenderer, oCustomStyle || oStyle, oStyle.Name, styleIndex); this.drawStyle(oGraphics, stringRenderer, oCustomStyle || oStyle, oStyle.Name, styleIndex);
this.native.EndDrawStyle(); this.native.EndDrawStyle();
...@@ -1382,7 +1382,7 @@ ...@@ -1382,7 +1382,7 @@
oStyle = cellStyles[i]; oStyle = cellStyles[i];
if (oStyle.Hidden || null != oStyle.BuiltinId) if (oStyle.Hidden || null != oStyle.BuiltinId)
continue; continue;
this.docStyles[styleIndex] = new CStyleImage(oStyle.Name, styleIndex, c_oAscStyleImage.Document); this.docStyles[styleIndex] = new CStyleImage(oStyle.Name, c_oAscStyleImage.Document);
this.native.BeginDrawDocumentStyle(oStyle.Name, styleIndex); this.native.BeginDrawDocumentStyle(oStyle.Name, styleIndex);
this.drawStyle(oGraphics, stringRenderer, oStyle, oStyle.Name, styleIndex); this.drawStyle(oGraphics, stringRenderer, oStyle, oStyle.Name, styleIndex);
this.native.EndDrawStyle(); this.native.EndDrawStyle();
......
This diff is collapsed.
This diff is collapsed.
...@@ -136,8 +136,6 @@ CHeaderProp.prototype.get_Locked = function() { return this.Locked; }; ...@@ -136,8 +136,6 @@ CHeaderProp.prototype.get_Locked = function() { return this.Locked; };
// [!dirty hack for minimizer - don't delete this comment!] function CStylesPainter () // [!dirty hack for minimizer - don't delete this comment!] function CStylesPainter ()
// [!dirty hack for minimizer - don't delete this comment!] function CFont () // [!dirty hack for minimizer - don't delete this comment!] function CFont ()
CStylesPainter.prototype.get_DefaultStylesImage = function() { return this.defaultStylesImage; };
CStylesPainter.prototype.get_DocStylesImage = function() { return this.docStylesImage; };
CStylesPainter.prototype.get_MergedStyles = function() { return this.mergedStyles; }; CStylesPainter.prototype.get_MergedStyles = function() { return this.mergedStyles; };
CStylesPainter.prototype.get_STYLE_THUMBNAIL_WIDTH = function() { return this.STYLE_THUMBNAIL_WIDTH; }; CStylesPainter.prototype.get_STYLE_THUMBNAIL_WIDTH = function() { return this.STYLE_THUMBNAIL_WIDTH; };
CStylesPainter.prototype.get_STYLE_THUMBNAIL_HEIGHT = function() { return this.STYLE_THUMBNAIL_HEIGHT; }; CStylesPainter.prototype.get_STYLE_THUMBNAIL_HEIGHT = function() { return this.STYLE_THUMBNAIL_HEIGHT; };
...@@ -1933,7 +1931,7 @@ asc_docs_api.prototype.processSavedFile = function(url, downloadType) { ...@@ -1933,7 +1931,7 @@ asc_docs_api.prototype.processSavedFile = function(url, downloadType) {
} }
}); });
} else { } else {
asc_docs_api.superclass.constructor.prototype.processSavedFile.call(this, url, downloadType); asc_docs_api.superclass.processSavedFile.call(this, url, downloadType);
} }
}; };
asc_docs_api.prototype.startGetDocInfo = function(){ asc_docs_api.prototype.startGetDocInfo = function(){
......
...@@ -40,8 +40,6 @@ CHeaderProp.prototype['put_DifferentEvenOdd'] = CHeaderProp.prototype.put_Differ ...@@ -40,8 +40,6 @@ CHeaderProp.prototype['put_DifferentEvenOdd'] = CHeaderProp.prototype.put_Differ
CHeaderProp.prototype['get_LinkToPrevious'] = CHeaderProp.prototype.get_LinkToPrevious; CHeaderProp.prototype['get_LinkToPrevious'] = CHeaderProp.prototype.get_LinkToPrevious;
CHeaderProp.prototype['get_Locked'] = CHeaderProp.prototype.get_Locked; CHeaderProp.prototype['get_Locked'] = CHeaderProp.prototype.get_Locked;
window['CStylesPainter'] = CStylesPainter; window['CStylesPainter'] = CStylesPainter;
CStylesPainter.prototype['get_DefaultStylesImage'] = CStylesPainter.prototype.get_DefaultStylesImage;
CStylesPainter.prototype['get_DocStylesImage'] = CStylesPainter.prototype.get_DocStylesImage;
CStylesPainter.prototype['get_MergedStyles'] = CStylesPainter.prototype.get_MergedStyles; CStylesPainter.prototype['get_MergedStyles'] = CStylesPainter.prototype.get_MergedStyles;
CStylesPainter.prototype['get_STYLE_THUMBNAIL_WIDTH'] = CStylesPainter.prototype.get_STYLE_THUMBNAIL_WIDTH; CStylesPainter.prototype['get_STYLE_THUMBNAIL_WIDTH'] = CStylesPainter.prototype.get_STYLE_THUMBNAIL_WIDTH;
CStylesPainter.prototype['get_STYLE_THUMBNAIL_HEIGHT'] = CStylesPainter.prototype.get_STYLE_THUMBNAIL_HEIGHT; CStylesPainter.prototype['get_STYLE_THUMBNAIL_HEIGHT'] = CStylesPainter.prototype.get_STYLE_THUMBNAIL_HEIGHT;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment