Commit 089e7d32 authored by ElenaSubbotina's avatar ElenaSubbotina

Merge branch 'develop' of https://github.com/ONLYOFFICE/core into develop

parents e0296d5a bd5863a0
...@@ -2073,7 +2073,7 @@ distT=\"0\" distB=\"0\" distL=\"0\" distR=\"0\"><wp:extent cx=\"" + std::to_wstr ...@@ -2073,7 +2073,7 @@ distT=\"0\" distB=\"0\" distL=\"0\" distR=\"0\"><wp:extent cx=\"" + std::to_wstr
int nSimplePos = 0; int nSimplePos = 0;
if(bBSimplePos && BSimplePos) if(bBSimplePos && BSimplePos)
nSimplePos = 1; nSimplePos = 1;
int nRelativeHeight = 0; unsigned long nRelativeHeight = 0;
if(bRelativeHeight) if(bRelativeHeight)
nRelativeHeight = RelativeHeight; nRelativeHeight = RelativeHeight;
int nBehindDoc = 0; int nBehindDoc = 0;
......
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