Skip to content

O
onlyoffice_core
Commit a87f59b8 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@58866 954022d7-b5bf-4e40-9824-e11837661b57
parent 03d14384
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 37 additions and 2711 deletions
ASCOfficePPTXFile/ASCOfficeDrawingConverter.cpp
View file @ a87f59b8
......@@ -1583,7 +1583,8 @@ PPTX::Logic::SpTreeElem CDrawingConverter::doc_LoadShape(XmlUtils::CXmlNode& oNo
pShape->TextBoxBodyPr->upright = true;
std::map<CString, CString>::iterator pPair = oCSSParser.m_mapSettings.find(_T("v-text-anchor"));
if (pPair != NULL)
if (pPair != oCSSParser.m_mapSettings.end())
{
if (_T("top") == pPair->second)
pShape->TextBoxBodyPr->anchor = _T("t");
......@@ -1603,7 +1604,8 @@ PPTX::Logic::SpTreeElem CDrawingConverter::doc_LoadShape(XmlUtils::CXmlNode& oNo
pShape->spPr.xfrm->extX = oProps.Width;
pShape->spPr.xfrm->extY = oProps.Height;
std::map<CString, CString>::iterator pPair = NULL;
std::map<CString, CString>::iterator pPair;
pPair = oCSSParser.m_mapSettings.find(_T("flip"));
if (oCSSParser.m_mapSettings.end() != pPair)
{
......@@ -1635,7 +1637,8 @@ PPTX::Logic::SpTreeElem CDrawingConverter::doc_LoadShape(XmlUtils::CXmlNode& oNo
pShape->spPr.xfrm->extX = oProps.Width;
pShape->spPr.xfrm->extY = oProps.Height;
std::map<CString, CString>::iterator pPair = NULL;
std::map<CString, CString>::iterator pPair;
pPair = oCSSParser.m_mapSettings.find(_T("flip"));
if (oCSSParser.m_mapSettings.end() != pPair)
{
......@@ -1774,7 +1777,8 @@ PPTX::Logic::SpTreeElem CDrawingConverter::doc_LoadGroup(XmlUtils::CXmlNode& oNo
pTree->grpSpPr.xfrm->chExtX = lCoordSizeW;
pTree->grpSpPr.xfrm->chExtY = lCoordSizeH;
std::map<CString, CString>::iterator pPair = NULL;
std::map<CString, CString>::iterator pPair;
pPair = oCSSParser.m_mapSettings.find(_T("flip"));
if (oCSSParser.m_mapSettings.end() != pPair)
{
......@@ -1808,7 +1812,8 @@ PPTX::Logic::SpTreeElem CDrawingConverter::doc_LoadGroup(XmlUtils::CXmlNode& oNo
pTree->grpSpPr.xfrm->chExtX = lCoordSizeW;
pTree->grpSpPr.xfrm->chExtY = lCoordSizeH;
std::map<CString, CString>::iterator pPair = NULL;
std::map<CString, CString>::iterator pPair;
pPair = oCSSParser.m_mapSettings.find(_T("flip"));
if (oCSSParser.m_mapSettings.end() != pPair)
{
......@@ -1885,7 +1890,7 @@ void CDrawingConverter::LoadCoordSize(XmlUtils::CXmlNode& oNode, CShape* pShape)
CString CDrawingConverter::GetDrawingMainProps(XmlUtils::CXmlNode& oNode, PPTX::CCSS& oCssStyles, CSpTreeElemProps& oProps)
{
std::map<CString, CString>::iterator pPair = NULL;
std::map<CString, CString>::iterator pPair;
bool bIsInline = false;
......@@ -1950,7 +1955,7 @@ CString CDrawingConverter::GetDrawingMainProps(XmlUtils::CXmlNode& oNode, PPTX::
else
{
pPair = oCssStyles.m_mapSettings.find(_T("margin-right"));
if (oCssStyles.m_mapSettings.end() != NULL)
if (oCssStyles.m_mapSettings.end() != oCssStyles.m_mapSettings.end())
width = (LONG)(dKoefSize * parserPoint.FromString(pPair->second)) - left;
}
......@@ -1962,7 +1967,7 @@ CString CDrawingConverter::GetDrawingMainProps(XmlUtils::CXmlNode& oNode, PPTX::
else
{
pPair = oCssStyles.m_mapSettings.find(_T("margin-bottom"));
if (oCssStyles.m_mapSettings.end() != NULL)
if (oCssStyles.m_mapSettings.end() != oCssStyles.m_mapSettings.end())
height = (LONG)(dKoefSize * parserPoint.FromString(pPair->second)) - top;
}
......@@ -2120,7 +2125,7 @@ CString CDrawingConverter::GetDrawingMainProps(XmlUtils::CXmlNode& oNode, PPTX::
oWriter.StartAttributes();
pPair = oCssStyles.m_mapSettings.find(_T("mso-position-horizontal-relative"));
if (pPair != NULL)
if (pPair != oCssStyles.m_mapSettings.end())
{
if (_T("char") == pPair->second)
oWriter.WriteAttribute(_T("relativeFrom"), (CString)_T("character"));
......@@ -2171,7 +2176,7 @@ CString CDrawingConverter::GetDrawingMainProps(XmlUtils::CXmlNode& oNode, PPTX::
oWriter.StartAttributes();
pPair = oCssStyles.m_mapSettings.find(_T("mso-position-vertical-relative"));
if (pPair != NULL)
if (pPair != oCssStyles.m_mapSettings.end())
{
if (_T("margin") == pPair->second)
oWriter.WriteAttribute(_T("relativeFrom"), (CString)_T("margin"));
......
ASCOfficePPTXFile/ASCOfficePPTXFile.sln
View file @ a87f59b8
Microsoft Visual Studio Solution File, Format Version 9.00
# Visual C++ Express 2005
# Visual Studio 2005
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ASCOfficePPTXFile", "ASCOfficePPTXFile.vcproj", "{70078FE7-BE4F-493C-84F3-F98F151587F5}"
ProjectSection(ProjectDependencies) = postProject
{36636678-AE25-4BE6-9A34-2561D1BCF302} = {36636678-AE25-4BE6-9A34-2561D1BCF302}
EndProjectSection
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "PPTXFormat", "PPTXLib\PPTXFormat.vcproj", "{36636678-AE25-4BE6-9A34-2561D1BCF302}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
......@@ -18,6 +23,14 @@ Global
{70078FE7-BE4F-493C-84F3-F98F151587F5}.ReleaseASC|Win32.Build.0 = ReleaseASC|Win32
{70078FE7-BE4F-493C-84F3-F98F151587F5}.ReleaseOpenSource|Win32.ActiveCfg = ReleaseOpenSource|Win32
{70078FE7-BE4F-493C-84F3-F98F151587F5}.ReleaseOpenSource|Win32.Build.0 = ReleaseOpenSource|Win32
{36636678-AE25-4BE6-9A34-2561D1BCF302}.Debug|Win32.ActiveCfg = Debug|Win32
{36636678-AE25-4BE6-9A34-2561D1BCF302}.Debug|Win32.Build.0 = Debug|Win32
{36636678-AE25-4BE6-9A34-2561D1BCF302}.Release|Win32.ActiveCfg = Release|Win32
{36636678-AE25-4BE6-9A34-2561D1BCF302}.Release|Win32.Build.0 = Release|Win32
{36636678-AE25-4BE6-9A34-2561D1BCF302}.ReleaseASC|Win32.ActiveCfg = Release|Win32
{36636678-AE25-4BE6-9A34-2561D1BCF302}.ReleaseASC|Win32.Build.0 = Release|Win32
{36636678-AE25-4BE6-9A34-2561D1BCF302}.ReleaseOpenSource|Win32.ActiveCfg = Release|Win32
{36636678-AE25-4BE6-9A34-2561D1BCF302}.ReleaseOpenSource|Win32.Build.0 = Release|Win32
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
......
ASCOfficePPTXFile/ASCOfficePPTXFile.vcproj
View file @ a87f59b8
This diff is collapsed.
ASCOfficePPTXFile/ASCOfficePPTXFileRealization.cpp
View file @ a87f59b8
//#include "stdafx.h"
#include "stdafx.h"
#include "ASCOfficePPTXFile.h"
#include "PPTXFormat/PPTXEvent.h"
......
ASCOfficePPTXFile/PPTXLib/PPTXFormat.vcproj
View file @ a87f59b8
......@@ -154,15 +154,7 @@
Filter="cpp;c;cxx;def;odl;idl;hpj;bat;asm"
>
<File
RelativePath="..\.\ASCOfficeDrawingConverter.cpp"
>
</File>
<File
RelativePath="..\.\ASCOfficePPTXFile.cpp"
>
</File>
<File
RelativePath="..\.\ASCOfficePPTXFileRealization.cpp"
RelativePath="..\ASCOfficeDrawingConverter.cpp"
>
</File>
<File
......
ASCOfficePPTXFile/version.h
View file @ a87f59b8
......@@ -2,6 +2,6 @@
//1
//0
//0
//240
#define INTVER 1,0,0,240
#define STRVER "1,0,0,240\0"
//247
#define INTVER 1,0,0,247
#define STRVER "1,0,0,247\0"
ASCPresentationEditor/PPTXWriter/CSS.h
View file @ a87f59b8
......@@ -244,7 +244,7 @@ public:
AVSINLINE void LoadTextStyle(NSPresentationEditor::CTextStyleLevel& oLevel)
{
std::map<CString, CString>::iterator pPair = NULL;
std::map<CString, CString>::iterator pPair;
pPair = m_mapSettings.find(_T("text-align"));
if (m_mapSettings.end() != pPair)
......@@ -393,7 +393,7 @@ public:
}
AVSINLINE void LoadStyleCF(NSPresentationEditor::CTextCFRun& oRun, const NSPresentationEditor::CMetricInfo& oInfo)
{
std::map<CString, CString>::iterator pPair = NULL;
std::map<CString, CString>::iterator pPair;
pPair = m_mapSettings.find(_T("font-weight"));
if (m_mapSettings.end() != pPair)
......
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