Commit ef3ac03c authored by Dmitry.Vikulov's avatar Dmitry.Vikulov Committed by Alexander.Trofimov

ungroup objects

git-svn-id: svn://192.168.3.15/activex/AVS/Sources/TeamlabOffice/trunk/OfficeWeb@47718 954022d7-b5bf-4e40-9824-e11837661b57
parent 1e3ff109
...@@ -39,6 +39,18 @@ function convertFormula(formula, ws) { ...@@ -39,6 +39,18 @@ function convertFormula(formula, ws) {
return range; return range;
} }
function getFullImageSrc(src) {
/*var start = src.substring(0, 6);
if ( 0 != src.indexOf("http:") && 0 != src.indexOf("data:") && 0 != src.indexOf("https:") && 0 != src.indexOf("ftp:") && 0 != src.indexOf("file:") ) {
var editor = window["Asc"]["editor"];
if ( 0 == src.indexOf(editor.DocumentUrl) )
return src;
return editor.DocumentUrl + "media/" + src;
}
else
return src;*/
};
//----------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------
// Интерфейс < Excel - Word > // Интерфейс < Excel - Word >
//----------------------------------------------------------------------------------- //-----------------------------------------------------------------------------------
...@@ -3842,7 +3854,7 @@ function DrawingObjects() { ...@@ -3842,7 +3854,7 @@ function DrawingObjects() {
_this.showDrawingObjects(false); _this.showDrawingObjects(false);
} }
_this.addGraphicGroup = function() { _this.groupGraphicObjects = function() {
if ( _this.controller.canGroup() ) { if ( _this.controller.canGroup() ) {
...@@ -3858,6 +3870,13 @@ function DrawingObjects() { ...@@ -3858,6 +3870,13 @@ function DrawingObjects() {
} }
} }
_this.unGroupGraphicObjects = function() {
if ( _this.controller.canUnGroup() ) {
_this.controller.unGroup();
}
}
_this.insertUngroupedObjects = function(idGroup, aGraphics) { _this.insertUngroupedObjects = function(idGroup, aGraphics) {
if ( idGroup && aGraphics.length ) { if ( idGroup && aGraphics.length ) {
......
...@@ -2077,11 +2077,12 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS"; ...@@ -2077,11 +2077,12 @@ var ASC_DOCS_API_USE_EMBEDDED_FONTS = "@@ASC_DOCS_API_USE_EMBEDDED_FONTS";
asc_groupGraphicsObjects: function() { asc_groupGraphicsObjects: function() {
var ws = this.wb.getWorksheet(); var ws = this.wb.getWorksheet();
ws.objectRender.addGraphicGroup(); ws.objectRender.groupGraphicObjects();
}, },
asc_unGroupGraphicsObjects: function() { asc_unGroupGraphicsObjects: function() {
var ws = this.wb.getWorksheet(); var ws = this.wb.getWorksheet();
ws.objectRender.unGroupGraphicObjects();
}, },
// Cell interface // Cell interface
......
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