Commit aa643059 authored by Ilya Kirillov's avatar Ilya Kirillov

Fixed bug #33405. Changing an image wrapping style inside a footnote was forbidden.

parent 83628cc5
...@@ -343,14 +343,12 @@ ParaDrawing.prototype.Get_Props = function(OtherProps) ...@@ -343,14 +343,12 @@ ParaDrawing.prototype.Get_Props = function(OtherProps)
Props.Locked = this.Lock.Is_Locked(); Props.Locked = this.Lock.Is_Locked();
var ParentParagraph = this.Get_ParentParagraph(); var ParentParagraph = this.Get_ParentParagraph();
if (ParentParagraph) if (ParentParagraph && undefined !== ParentParagraph.Parent)
{ {
if (ParentParagraph) var DocContent = ParentParagraph.Parent;
{ if (true === DocContent.Is_DrawingShape() || (DocContent.Get_TopDocumentContent() instanceof CFootEndnote))
if (undefined != ParentParagraph.Parent && true === ParentParagraph.Parent.Is_DrawingShape())
Props.CanBeFlow = false; Props.CanBeFlow = false;
} }
}
Props.title = this.docPr.title !== null ? this.docPr.title : undefined; Props.title = this.docPr.title !== null ? this.docPr.title : undefined;
Props.description = this.docPr.descr !== null ? this.docPr.descr : undefined; Props.description = this.docPr.descr !== null ? this.docPr.descr : undefined;
......
...@@ -5262,7 +5262,7 @@ ParaRun.prototype.Get_ParaContentPosByXY = function(SearchPos, Depth, _CurLine, ...@@ -5262,7 +5262,7 @@ ParaRun.prototype.Get_ParaContentPosByXY = function(SearchPos, Depth, _CurLine,
return Result; return Result;
}; };
ParaRun.prototype.Get_ParaContentPos = function(bSelection, bStart, ContentPos) ParaRun.prototype.Get_ParaContentPos = function(bSelection, bStart, ContentPos, bUseCorrection)
{ {
var Pos = ( true !== bSelection ? this.State.ContentPos : ( false !== bStart ? this.State.Selection.StartPos : this.State.Selection.EndPos ) ); var Pos = ( true !== bSelection ? this.State.ContentPos : ( false !== bStart ? this.State.Selection.StartPos : this.State.Selection.EndPos ) );
ContentPos.Add(Pos); ContentPos.Add(Pos);
......
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