Skip to content

O
onlyoffice_core
Commit ac086e3d authored by Elen.Subbotina's avatar Elen.Subbotina Committed by Alexander Trofimov
Browse files
Options

..... 

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@65511 954022d7-b5bf-4e40-9824-e11837661b57
parent 86415665
Hide whitespace changes
Inline Side-by-side
Showing with 81 additions and 43 deletions
ASCOfficePPTFile/PPTFormatLib/Reader/PPTDocumentInfoOneUser.cpp
View file @ ac086e3d
...@@ -606,9 +606,9 @@ IElement* CPPTUserInfo::AddNewLayoutElement (CLayout *pLayout, int placeholderTy ...@@ -606,9 +606,9 @@ IElement* CPPTUserInfo::AddNewLayoutElement (CLayout *pLayout, int placeholderTy
pShape->m_lPlaceholderType = placeholderType; pShape->m_lPlaceholderType = placeholderType;
pShape->m_lPlaceholderSizePreset = placeholderSizePreset; pShape->m_lPlaceholderSizePreset = placeholderSizePreset;
if (pShape->m_lPlaceholderSizePreset > 0) //if (pShape->m_lPlaceholderSizePreset > 0)
pShape->m_bPlaceholderSet = true; // pShape->m_bPlaceholderSet = true;
else //else
pShape->m_bPlaceholderSet = false; pShape->m_bPlaceholderSet = false;
pShape->m_bLine = false; pShape->m_bLine = false;
pShape->m_bBoundsEnabled = false; pShape->m_bBoundsEnabled = false;
...@@ -752,6 +752,7 @@ int CPPTUserInfo::AddNewLayout(NSPresentationEditor::CTheme* pTheme, SSlideLayou ...@@ -752,6 +752,7 @@ int CPPTUserInfo::AddNewLayout(NSPresentationEditor::CTheme* pTheme, SSlideLayou
return ind; return ind;
} }
void CPPTUserInfo::LoadMainMaster(DWORD dwMasterID, const LONG& lOriginWidth, const LONG& lOriginHeight) void CPPTUserInfo::LoadMainMaster(DWORD dwMasterID, const LONG& lOriginWidth, const LONG& lOriginHeight)
{ {
std::map<DWORD, LONG>::iterator pPair = m_mapMasterToTheme.find(dwMasterID); std::map<DWORD, LONG>::iterator pPair = m_mapMasterToTheme.find(dwMasterID);
......
ASCOfficePPTFile/PPTFormatLib/Reader/ReadStructures.cpp
View file @ ac086e3d
...@@ -182,6 +182,7 @@ void CTextPFRun_ppt::LoadFromStream(POLE::Stream* pStream, bool bIsIndentation) ...@@ -182,6 +182,7 @@ void CTextPFRun_ppt::LoadFromStream(POLE::Stream* pStream, bool bIsIndentation)
BYTE flag3 = (BYTE)(dwFlags >> 16); BYTE flag3 = (BYTE)(dwFlags >> 16);
BYTE flag4 = (BYTE)(dwFlags >> 24); BYTE flag4 = (BYTE)(dwFlags >> 24);
//
bool hasBullet_ = (0x01 == (0x01 & flag1)); bool hasBullet_ = (0x01 == (0x01 & flag1));
bool bulletHasFont_ = (0x02 == (0x02 & flag1)); bool bulletHasFont_ = (0x02 == (0x02 & flag1));
bool bulletHasColor_ = (0x04 == (0x04 & flag1)); bool bulletHasColor_ = (0x04 == (0x04 & flag1));
...@@ -213,33 +214,51 @@ void CTextPFRun_ppt::LoadFromStream(POLE::Stream* pStream, bool bIsIndentation) ...@@ -213,33 +214,51 @@ void CTextPFRun_ppt::LoadFromStream(POLE::Stream* pStream, bool bIsIndentation)
bool bulletScheme_ = (0x01 == (0x01 & flag4)); bool bulletScheme_ = (0x01 == (0x01 & flag4));
bool bulletHasScheme_ = (0x02 == (0x02 & flag4)); bool bulletHasScheme_ = (0x02 == (0x02 & flag4));
WORD bulletFlag = 0;
if (hasBullet_ || bulletHasFont_ || bulletHasColor_ || bulletHasSize_) if (hasBullet_ || bulletHasFont_ || bulletHasColor_ || bulletHasSize_)
{ {
WORD bulletFlag = StreamUtils::ReadWORD(pStream); bulletFlag = StreamUtils::ReadWORD(pStream);
if (bulletFlag & 0x0F) if (bulletFlag & 0x0F)
m_oRun.hasBullet = (bool)(0x01 == (bulletFlag & 0x01)); {
else m_oRun.hasBullet = (bool)(0x01 == (bulletFlag & 0x01));
m_oRun.hasBullet = false; }else
m_oRun.hasBullet = false;
} }
if (bulletChar_) if (bulletChar_)
{ {
if (sizeof(wchar_t) == 2) unsigned short utf16 = (unsigned short)StreamUtils::ReadWORD(pStream);
{
m_oRun.bulletChar = (WCHAR)StreamUtils::ReadWORD(pStream); if (utf16 !=0x04)
}
else
{ {
unsigned short utf16 = (unsigned short)StreamUtils::ReadWORD(pStream); if (sizeof(wchar_t) == 2)
std::wstring utf32 = NSFile::CUtf8Converter::GetWStringFromUTF16(&utf16, 1); {
if (!utf32.empty()) m_oRun.bulletChar = utf16;
m_oRun.bulletChar = utf32.c_str()[0]; }
else
{
std::wstring utf32 = NSFile::CUtf8Converter::GetWStringFromUTF16(&utf16, 1);
if (!utf32.empty())
m_oRun.bulletChar = utf32.c_str()[0];
}
} }
} }
if (bulletFontRef_) if (bulletFontRef_)
{
m_oRun.bulletFontRef = StreamUtils::ReadWORD(pStream); m_oRun.bulletFontRef = StreamUtils::ReadWORD(pStream);
//if ((bulletFlag & 0x0F) && !(0x02 == (bulletFlag & 0x02)))
// m_oRun.bulletFontRef.reset();
}
if (bulletSize_) if (bulletSize_)
{
m_oRun.bulletSize = StreamUtils::ReadWORD(pStream); m_oRun.bulletSize = StreamUtils::ReadWORD(pStream);
//if ((bulletFlag & 0x0F) && !(0x08 == (bulletFlag & 0x08)))
// m_oRun.bulletSize.reset();
}
if (bulletColor_) if (bulletColor_)
{ {
SColorAtom oColorAtom; SColorAtom oColorAtom;
...@@ -260,8 +279,19 @@ void CTextPFRun_ppt::LoadFromStream(POLE::Stream* pStream, bool bIsIndentation) ...@@ -260,8 +279,19 @@ void CTextPFRun_ppt::LoadFromStream(POLE::Stream* pStream, bool bIsIndentation)
} }
m_oRun.bulletColor = oColor; m_oRun.bulletColor = oColor;
//if ((bulletFlag & 0x0F) && !(0x04 == (bulletFlag & 0x04)))
// m_oRun.bulletColor.reset();
} }
//if (/*((m_oRun.hasBullet.is_init()) && (m_oRun.hasBullet.get() == false)) ||*/ !m_oRun.hasBullet.is_init())
//{
// m_oRun.bulletColor.reset();
// m_oRun.bulletSize.reset();
// m_oRun.bulletFontRef.reset();
// m_oRun.bulletChar.reset();
//}
if (textAlignment_) if (textAlignment_)
m_oRun.textAlignment = StreamUtils::ReadWORD(pStream); m_oRun.textAlignment = StreamUtils::ReadWORD(pStream);
......
ASCPresentationEditor/OfficeDrawing/TextAttributesEx.cpp
View file @ ac086e3d
...@@ -79,19 +79,21 @@ namespace NSPresentationEditor ...@@ -79,19 +79,21 @@ namespace NSPresentationEditor
if (-1 != m_lTextType && m_lTextType < 4 && pTheme->m_pStyles[m_lTextType].m_pLevels[lLevel].is_init()) if (-1 != m_lTextType && m_lTextType < 4 && pTheme->m_pStyles[m_lTextType].m_pLevels[lLevel].is_init())
{ {
if (pTheme->m_pStyles[m_lTextType].m_pLevels[lLevel]->m_oPFRun.hasBullet.is_init()) if (pTheme->m_pStyles[m_lTextType].m_pLevels[lLevel]->m_oPFRun.hasBullet.is_init())
{
hasBullet = pTheme->m_pStyles[m_lTextType].m_pLevels[lLevel]->m_oPFRun.hasBullet; hasBullet = pTheme->m_pStyles[m_lTextType].m_pLevels[lLevel]->m_oPFRun.hasBullet;
if (pTheme->m_pStyles[m_lTextType].m_pLevels[lLevel]->m_oPFRun.bulletColor.is_init()) if (pTheme->m_pStyles[m_lTextType].m_pLevels[lLevel]->m_oPFRun.bulletColor.is_init())
bulletColor = pTheme->m_pStyles[m_lTextType].m_pLevels[lLevel]->m_oPFRun.bulletColor; bulletColor = pTheme->m_pStyles[m_lTextType].m_pLevels[lLevel]->m_oPFRun.bulletColor;
if (pTheme->m_pStyles[m_lTextType].m_pLevels[lLevel]->m_oPFRun.bulletChar.is_init() ) if (pTheme->m_pStyles[m_lTextType].m_pLevels[lLevel]->m_oPFRun.bulletChar.is_init() )
{ {
bulletFontRef = pTheme->m_pStyles[m_lTextType].m_pLevels[lLevel]->m_oPFRun.bulletFontRef; bulletFontRef = pTheme->m_pStyles[m_lTextType].m_pLevels[lLevel]->m_oPFRun.bulletFontRef;
bulletChar = pTheme->m_pStyles[m_lTextType].m_pLevels[lLevel]->m_oPFRun.bulletChar; bulletChar = pTheme->m_pStyles[m_lTextType].m_pLevels[lLevel]->m_oPFRun.bulletChar;
}
if (pTheme->m_pStyles[m_lTextType].m_pLevels[lLevel]->m_oPFRun.bulletSize.is_init())
bulletSize = pTheme->m_pStyles[m_lTextType].m_pLevels[lLevel]->m_oPFRun.bulletSize;
} }
if (pTheme->m_pStyles[m_lTextType].m_pLevels[lLevel]->m_oPFRun.bulletSize.is_init())
bulletSize = pTheme->m_pStyles[m_lTextType].m_pLevels[lLevel]->m_oPFRun.bulletSize;
if (pTheme->m_pStyles[m_lTextType].m_pLevels[lLevel]->m_oPFRun.leftMargin.is_init()) if (pTheme->m_pStyles[m_lTextType].m_pLevels[lLevel]->m_oPFRun.leftMargin.is_init())
margin = pTheme->m_pStyles[m_lTextType].m_pLevels[lLevel]->m_oPFRun.leftMargin; margin = pTheme->m_pStyles[m_lTextType].m_pLevels[lLevel]->m_oPFRun.leftMargin;
...@@ -105,18 +107,20 @@ namespace NSPresentationEditor ...@@ -105,18 +107,20 @@ namespace NSPresentationEditor
if (m_oLayoutStyles.m_pLevels[lLevel].is_init()) if (m_oLayoutStyles.m_pLevels[lLevel].is_init())
{ {
if (m_oLayoutStyles.m_pLevels[lLevel]->m_oPFRun.hasBullet.is_init()) if (m_oLayoutStyles.m_pLevels[lLevel]->m_oPFRun.hasBullet.is_init())
{
hasBullet = m_oLayoutStyles.m_pLevels[lLevel]->m_oPFRun.hasBullet; hasBullet = m_oLayoutStyles.m_pLevels[lLevel]->m_oPFRun.hasBullet;
if (m_oLayoutStyles.m_pLevels[lLevel]->m_oPFRun.bulletColor.is_init()) if (m_oLayoutStyles.m_pLevels[lLevel]->m_oPFRun.bulletColor.is_init())
bulletColor = m_oLayoutStyles.m_pLevels[lLevel]->m_oPFRun.bulletColor; bulletColor = m_oLayoutStyles.m_pLevels[lLevel]->m_oPFRun.bulletColor;
if (m_oLayoutStyles.m_pLevels[lLevel]->m_oPFRun.bulletSize.is_init()) if (m_oLayoutStyles.m_pLevels[lLevel]->m_oPFRun.bulletSize.is_init())
bulletSize = m_oLayoutStyles.m_pLevels[lLevel]->m_oPFRun.bulletSize; bulletSize = m_oLayoutStyles.m_pLevels[lLevel]->m_oPFRun.bulletSize;
if (m_oLayoutStyles.m_pLevels[lLevel]->m_oPFRun.bulletChar.is_init() ) if (m_oLayoutStyles.m_pLevels[lLevel]->m_oPFRun.bulletChar.is_init() )
{ {
bulletChar = m_oLayoutStyles.m_pLevels[lLevel]->m_oPFRun.bulletChar; bulletChar = m_oLayoutStyles.m_pLevels[lLevel]->m_oPFRun.bulletChar;
bulletFontRef = m_oLayoutStyles.m_pLevels[lLevel]->m_oPFRun.bulletFontRef; bulletFontRef = m_oLayoutStyles.m_pLevels[lLevel]->m_oPFRun.bulletFontRef;
}
} }
if (m_oLayoutStyles.m_pLevels[lLevel]->m_oPFRun.leftMargin.is_init()) if (m_oLayoutStyles.m_pLevels[lLevel]->m_oPFRun.leftMargin.is_init())
...@@ -131,19 +135,22 @@ namespace NSPresentationEditor ...@@ -131,19 +135,22 @@ namespace NSPresentationEditor
if (m_oStyles.m_pLevels[lLevel].is_init()) if (m_oStyles.m_pLevels[lLevel].is_init())
{ {
if (m_oStyles.m_pLevels[lLevel]->m_oPFRun.hasBullet.is_init()) if (m_oStyles.m_pLevels[lLevel]->m_oPFRun.hasBullet.is_init())
{
hasBullet = m_oStyles.m_pLevels[lLevel]->m_oPFRun.hasBullet; hasBullet = m_oStyles.m_pLevels[lLevel]->m_oPFRun.hasBullet;
if (m_oStyles.m_pLevels[lLevel]->m_oPFRun.bulletColor.is_init()) if (m_oStyles.m_pLevels[lLevel]->m_oPFRun.bulletColor.is_init())
bulletColor = m_oStyles.m_pLevels[lLevel]->m_oPFRun.bulletColor; bulletColor = m_oStyles.m_pLevels[lLevel]->m_oPFRun.bulletColor;
if (m_oStyles.m_pLevels[lLevel]->m_oPFRun.bulletChar.is_init()) if (m_oStyles.m_pLevels[lLevel]->m_oPFRun.bulletChar.is_init())
{ {
bulletFontRef = m_oStyles.m_pLevels[lLevel]->m_oPFRun.bulletFontRef; bulletFontRef = m_oStyles.m_pLevels[lLevel]->m_oPFRun.bulletFontRef;
bulletChar = m_oStyles.m_pLevels[lLevel]->m_oPFRun.bulletChar; bulletChar = m_oStyles.m_pLevels[lLevel]->m_oPFRun.bulletChar;
} }
if (m_oStyles.m_pLevels[lLevel]->m_oPFRun.bulletSize.is_init()) if (m_oStyles.m_pLevels[lLevel]->m_oPFRun.bulletSize.is_init())
bulletSize = m_oStyles.m_pLevels[lLevel]->m_oPFRun.bulletSize; bulletSize = m_oStyles.m_pLevels[lLevel]->m_oPFRun.bulletSize;
}
if (m_oStyles.m_pLevels[lLevel]->m_oPFRun.leftMargin.is_init()) if (m_oStyles.m_pLevels[lLevel]->m_oPFRun.leftMargin.is_init())
margin = m_oStyles.m_pLevels[lLevel]->m_oPFRun.leftMargin; margin = m_oStyles.m_pLevels[lLevel]->m_oPFRun.leftMargin;
......
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