pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-02-10 18:05:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

For bug 50842

Browse Source 
(cherry picked from commit 31b8fdbd8d)
This commit is contained in:
Daria
2025-09-04 11:19:25 +03:00
parent a96460f096
commit f1c51c0fe8
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
RtfFile/Format/DestinationCommand.cpp
View File

@ -2957,12 +2957,12 @@ void RtfShapeReader::ShapePropertyReader::ShapePropertyValueReader::PopState( Rt
int x = 0, y = 0;
try
{
x = XmlUtils::GetInteger(splitted[i].substr(0, pos));
x = XmlUtils::GetInteger(splitted[i].substr(0, pos)) - m_oShape.m_nRelLeft;
}
catch(...){}
try
{
y = XmlUtils::GetInteger(splitted[i].substr(pos + 1, splitted[i].length() - 1));
y = XmlUtils::GetInteger(splitted[i].substr(pos + 1, splitted[i].length() - 1)) - m_oShape.m_nRelTop;
}
catch(...){}
@ -2986,10 +2986,10 @@ void RtfShapeReader::ShapePropertyReader::ShapePropertyValueReader::PopState( Rt
m_oShape.m_aPSegmentInfo.push_back( val );
}
}
else if ( L"geoBottom" == m_sPropName ) m_oShape.m_nGeoBottom = nValue;
else if ( L"geoLeft" == m_sPropName ) m_oShape.m_nGeoLeft = nValue;
else if ( L"geoRight" == m_sPropName ) m_oShape.m_nGeoRight = nValue;
else if ( L"geoTop" == m_sPropName ) m_oShape.m_nGeoTop = nValue;
else if ( L"geoBottom" == m_sPropName ) m_oShape.m_nGeoBottom = nValue - m_oShape.m_nRelTop;
else if ( L"geoLeft" == m_sPropName ) m_oShape.m_nGeoLeft = nValue - m_oShape.m_nRelLeft;
else if ( L"geoRight" == m_sPropName ) m_oShape.m_nGeoRight = nValue - m_oShape.m_nRelLeft;
else if ( L"geoTop" == m_sPropName ) m_oShape.m_nGeoTop = nValue - m_oShape.m_nRelTop;
//
else if ( L"dxWrapDistLeft" == m_sPropName ) m_oShape.m_nWrapDistLeft = RtfUtility::Emu2Twips( nValue );
else if ( L"dyWrapDistTop" == m_sPropName ) m_oShape.m_nWrapDistTop = RtfUtility::Emu2Twips( nValue );