Skip to content

Commit

Permalink
Merge pull request 'fix/bug-72577' (#669) from fix/bug-72577 into hot…
Browse files Browse the repository at this point in the history
…fix/v8.3.1
  • Loading branch information
KirillovIlya committed Feb 14, 2025
2 parents a195425 + 5cc0fb2 commit 2eca068
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 1 deletion.
2 changes: 2 additions & 0 deletions common/apiCommon.js
Original file line number Diff line number Diff line change
Expand Up @@ -6750,6 +6750,8 @@ function (window, undefined) {
prot = asc_CPdfPageProperty.prototype;
prot["asc_getDeleteLock"] = prot.asc_getDeleteLock;
prot["asc_putDeleteLock"] = prot.asc_putDeleteLock;
prot["asc_getRotateLock"] = prot.asc_getRotateLock;
prot["asc_putRotateLock"] = prot.asc_putRotateLock;
prot["asc_getEditLock"] = prot.asc_getEditLock;
prot["asc_putEditLock"] = prot.asc_putEditLock;

Expand Down
3 changes: 2 additions & 1 deletion common/commonDefines.js
Original file line number Diff line number Diff line change
Expand Up @@ -4752,9 +4752,10 @@ window.AscCommon.g_cIsBeta = "false";
prot['MailMerge'] = prot.MailMerge;
prot['ContentControl'] = prot.ContentControl;
prot['Animation'] = prot.Animation;
prot['UnProtectedRegion'] = prot.UnProtectedRegion;
prot['Text'] = prot.Text;
prot['Annot'] = prot.Annot;
prot['UnProtectedRegion'] = prot.UnProtectedRegion;
prot['PdfPage'] = prot.PdfPage;

window['Asc']['linerule_AtLeast'] = window['Asc'].linerule_AtLeast = linerule_AtLeast;
window['Asc']['linerule_Auto'] = window['Asc'].linerule_Auto = linerule_Auto;
Expand Down
12 changes: 12 additions & 0 deletions pdf/src/GraphicObjects.js
Original file line number Diff line number Diff line change
Expand Up @@ -1009,6 +1009,18 @@
}
return false;
};
CGraphicObjects.prototype.checkSelectedObjectsAndCallback = function(callback, args, bNoSendProps, nHistoryPointType, aAdditionaObjects, bNoCheckLock) {
let oDoc = this.document;
let check_type = AscCommon.changestype_Drawing_Props;

if(bNoCheckLock || oDoc.Document_Is_SelectionLocked(check_type, null, false, false) === false) {
let nPointType = AscFormat.isRealNumber(nHistoryPointType) ? nHistoryPointType : AscDFH.historydescription_CommonControllerCheckSelected;
oDoc.StartAction(nPointType);
callback.apply(this, args);
oDoc.Recalculate();
oDoc.FinalizeAction(true);
}
};
CGraphicObjects.prototype.selectObject = function (object, pageIndex) {
let oDoc = this.document;
object.select(this, pageIndex);
Expand Down

0 comments on commit 2eca068

Please sign in to comment.