Skip to content

O
onlyoffice_core
Commit 691afd27 authored by ElenaSubbotina's avatar ElenaSubbotina
Browse files
Options

.

parent 6ed698c4
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 19 deletions
Common/DocxFormat/Source/Common/SimpleTypes_Vml.h
View file @ 691afd27
...@@ -3298,10 +3298,12 @@ namespace SimpleTypes ...@@ -3298,10 +3298,12 @@ namespace SimpleTypes
}; };
enum ECssMsoPosHorRel enum ECssMsoPosHorRel
{ {
cssmsoposhorrelMargin = 0, cssmsoposhorrelMargin = 0,
cssmsoposhorrelPage = 1, cssmsoposhorrelPage = 1,
cssmsoposhorrelText = 2, cssmsoposhorrelText = 2,
cssmsoposhorrelChar = 3, cssmsoposhorrelChar = 3,
cssmsoposhorrelLeftMargin = 4,
cssmsoposhorrelRightMargin = 5
}; };
enum ECssMsoPosVer enum ECssMsoPosVer
{ {
...@@ -3314,10 +3316,12 @@ namespace SimpleTypes ...@@ -3314,10 +3316,12 @@ namespace SimpleTypes
}; };
enum ECssMsoPosVerRel enum ECssMsoPosVerRel
{ {
cssmsoposverrelMargin = 0, cssmsoposverrelMargin = 0,
cssmsoposverrelPage = 1, cssmsoposverrelPage = 1,
cssmsoposverrelText = 2, cssmsoposverrelText = 2,
cssmsoposverrelLine = 3, cssmsoposverrelLine = 3,
cssmsoposverrelTopMargin = 4,
cssmsoposverrelBottomMargin = 5
}; };
enum ECssMsoWrapStyle enum ECssMsoWrapStyle
{ {
...@@ -3860,10 +3864,12 @@ namespace SimpleTypes ...@@ -3860,10 +3864,12 @@ namespace SimpleTypes
} }
void ReadValue_MsoPosHorRel(CString& sValue) void ReadValue_MsoPosHorRel(CString& sValue)
{ {
if ( _T("margin") == sValue ) m_oValue.eMsoPosHorRel = cssmsoposhorrelMargin; if ( _T("left-margin-area") == sValue ) m_oValue.eMsoPosHorRel = cssmsoposhorrelLeftMargin;
else if ( _T("page") == sValue ) m_oValue.eMsoPosHorRel = cssmsoposhorrelPage; else if ( _T("right-margin-area") == sValue ) m_oValue.eMsoPosHorRel = cssmsoposhorrelRightMargin;
else if ( _T("text") == sValue ) m_oValue.eMsoPosHorRel = cssmsoposhorrelText; else if ( _T("margin") == sValue ) m_oValue.eMsoPosHorRel = cssmsoposhorrelMargin;
else if ( _T("char") == sValue ) m_oValue.eMsoPosHorRel = cssmsoposhorrelChar; else if ( _T("page") == sValue ) m_oValue.eMsoPosHorRel = cssmsoposhorrelPage;
else if ( _T("text") == sValue ) m_oValue.eMsoPosHorRel = cssmsoposhorrelText;
else if ( _T("char") == sValue ) m_oValue.eMsoPosHorRel = cssmsoposhorrelChar;
else else
m_oValue.eMsoPosHorRel = cssmsoposhorrelText; m_oValue.eMsoPosHorRel = cssmsoposhorrelText;
} }
...@@ -3880,13 +3886,12 @@ namespace SimpleTypes ...@@ -3880,13 +3886,12 @@ namespace SimpleTypes
} }
void ReadValue_MsoPosVerRel(CString& sValue) void ReadValue_MsoPosVerRel(CString& sValue)
{ {
//bottom-margin-area ???? if ( _T("bottom-margin-area") == sValue ) m_oValue.eMsoPosVerRel = cssmsoposverrelBottomMargin;
if ( _T("margin") == sValue ) m_oValue.eMsoPosVerRel = cssmsoposverrelMargin; else if ( _T("top-margin-area") == sValue ) m_oValue.eMsoPosVerRel = cssmsoposverrelTopMargin;
else if ( _T("page") == sValue ) m_oValue.eMsoPosVerRel = cssmsoposverrelPage; else if ( _T("margin") == sValue ) m_oValue.eMsoPosVerRel = cssmsoposverrelMargin;
else if ( _T("text") == sValue ) m_oValue.eMsoPosVerRel = cssmsoposverrelText; else if ( _T("page") == sValue ) m_oValue.eMsoPosVerRel = cssmsoposverrelPage;
else if ( _T("line") == sValue ) m_oValue.eMsoPosVerRel = cssmsoposverrelLine; else if ( _T("text") == sValue ) m_oValue.eMsoPosVerRel = cssmsoposverrelText;
else if (sValue.Find(_T("margin")) >=0) else if ( _T("line") == sValue ) m_oValue.eMsoPosVerRel = cssmsoposverrelLine;
m_oValue.eMsoPosVerRel = cssmsoposverrelMargin;
else else
m_oValue.eMsoPosVerRel = cssmsoposverrelText; m_oValue.eMsoPosVerRel = cssmsoposverrelText;
} }
......
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
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7