Skip to content

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

PPTFormat автоподстановки 

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@65645 954022d7-b5bf-4e40-9824-e11837661b57
parent 63fd3bbc
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 352 additions and 354 deletions
ASCOfficePPTFile/PPTFormatLib/Reader/PPTDocumentInfoOneUser.h
View file @ b667c8a9
......@@ -43,6 +43,10 @@ public:
NSPresentationEditor::CTextStyles m_oDefaultTextStyle;
std::vector<std::wstring> m_oFootersHeaderString;
bool m_bHasDate;
bool m_bHasSlideNumber;
bool m_bHasFooter;
int m_nFormatDate;
// ()
CPPTDocumentInfo* m_pDocumentInfo;
......@@ -254,8 +258,7 @@ public:
void AddAnimation (DWORD dwSlideID, double Width, double Height, IElement* pElement);
void AddAudioTransition (DWORD dwSlideID, CTransition* pTransition, const std::wstring& strFilePath);
int AddNewLayout(NSPresentationEditor::CTheme* pTheme, SSlideLayoutAtom* layoutRecord, std::vector<CTextFullSettings> & text,
CRecordHeadersFootersAtom* headers_footers, bool addShapes, bool bMasterObjects);
int AddNewLayout(NSPresentationEditor::CTheme* pTheme, CRecordSlide* pRecordSlide, bool addShapes, bool bMasterObjects);
IElement* AddNewLayoutPlaceholder (CLayout *pLayout, int placeholderType, int placeholderSizePreset = -1);
IElement* AddThemeLayoutPlaceholder (CLayout *pLayout, int placeholderType, CTheme* pTheme);
......
ASCOfficePPTFile/PPTFormatLib/Reader/PPTFileDefines.h
View file @ b667c8a9
......@@ -97,7 +97,7 @@ typedef BYTE BOOL1;
#define RECORD_TYPE_SLIDENUMBER_META_ATOM 0x0FD8
#define RECORD_TYPE_HEADERSFOOTERS 4057
#define RECORD_TYPE_HEADERSFOOTERS 0x0FD9
#define RECORD_TYPE_HEADERSFOOTERS_ATOM 4058
#define RECORD_TYPE_TXINTERACTIVEINFO_ATOM 4063
#define RECORD_TYPE_CHARFORMAT_ATOM 4066
......
ASCOfficePPTFile/PPTFormatLib/Records/Drawing/ShapeContainer.h
View file @ b667c8a9
......@@ -1456,24 +1456,25 @@ public:
}
//meta placeholders
std::vector<CRecordFooterMetaAtom*> oArrayFooterMeta;
GetRecordsByType(&oArrayFooterMeta, true, true);
if (0 < oArrayFooterMeta.size())
{
pElem->m_lPlaceholderType = PT_MasterFooter;
DWORD posText = oArrayFooterMeta[0]->m_nPosition;
if (posText < pTheme->m_oFootersHeaderString.size())
strShapeText = pTheme->m_oFootersHeaderString[posText];
pElem->m_lPlaceholderType = PT_MasterFooter;
pElem->m_lPlaceholderUserStr = oArrayFooterMeta[0]->m_nPosition;
}
std::vector<CRecordSlideNumberMetaAtom*> oArraySlideNumberMeta;
GetRecordsByType(&oArraySlideNumberMeta, true, true);
if (0 < oArraySlideNumberMeta.size())
{
pElem->m_lPlaceholderType = PT_MasterSlideNumber;
DWORD posText = oArraySlideNumberMeta[0]->m_nPosition;
if (posText < pTheme->m_oFootersHeaderString.size())
strShapeText = pTheme->m_oFootersHeaderString[posText];
}
std::vector<CRecordGenericDateMetaAtom*> oArrayDateMeta;
GetRecordsByType(&oArrayDateMeta, true, true);
if (0 < oArrayDateMeta.size())
{
pElem->m_lPlaceholderType = PT_MasterDate;
pElem->m_lPlaceholderUserStr = oArrayDateMeta[0]->m_nPosition;
}
//------------- ---------------------------------------------------------------------------------
std::vector<CRecordClientAnchor*> oArrayAnchor;
......
ASCOfficePPTFile/PPTFormatLib/Records/HeadersFootersAtom.h
View file @ b667c8a9
......@@ -73,9 +73,6 @@ public:
}
};
class CRecordMetaCharacterAtom : public CUnknownRecord
{
public:
......@@ -99,35 +96,36 @@ public:
}
};
class CRecordRTFDateTimeMetaAtom : public CRecordMetaCharacterAtom
class CRecordGenericDateMetaAtom : public CRecordMetaCharacterAtom
{
};
class CRecordRTFDateTimeMetaAtom : public CRecordGenericDateMetaAtom
{
public:
std::string m_strFormat;
virtual void ReadFromStream(SRecordHeader & oHeader, POLE::Stream* pStream)
{
CRecordMetaCharacterAtom::ReadFromStream(oHeader, pStream);
CRecordGenericDateMetaAtom::ReadFromStream(oHeader, pStream);
m_strFormat = StreamUtils::ReadStringA(pStream, 128);
}
};
class CRecordDateTimeMetaAtom : public CRecordMetaCharacterAtom
class CRecordDateTimeMetaAtom : public CRecordGenericDateMetaAtom
{
public:
BYTE m_FormatID;
virtual void ReadFromStream(SRecordHeader & oHeader, POLE::Stream* pStream)
{
CRecordMetaCharacterAtom::ReadFromStream(oHeader, pStream);
CRecordGenericDateMetaAtom::ReadFromStream(oHeader, pStream);
m_FormatID = StreamUtils::ReadBYTE(pStream);
}
};
class CRecordGenericDateMetaAtom : public CRecordMetaCharacterAtom
{
};
class CRecordFooterMetaAtom : public CRecordMetaCharacterAtom
{
......
ASCOfficePPTFile/PPTFormatLib/Records/StyleTextPropAtom.h
View file @ b667c8a9
......@@ -45,8 +45,6 @@ public:
while (lMemCount < m_lCount + 1)
{
if (pStream->tell() >= m_lOffsetInStream + m_oHeader.RecLen) break;
CTextPFRun_ppt elm;
m_arrPFs.push_back(elm);
m_arrPFs[lCountItems].LoadFromStream(pStream);
......@@ -59,8 +57,6 @@ public:
lCountItems = 0;
while (lMemCount < m_lCount + 1)
{
if (pStream->tell() >= m_lOffsetInStream + m_oHeader.RecLen) break;
CTextCFRun_ppt elm;
m_arrCFs.push_back(elm);
......
ASCPresentationEditor/OfficeDrawing/Document.h
View file @ b667c8a9
......@@ -156,16 +156,6 @@ namespace NSPresentationEditor
}
}
// /
void ClearPreset()
{
size_t nCount = m_arSlides.size();
for (size_t nIndex = 0; nIndex < nCount; ++nIndex)
{
m_arSlides[nIndex]->ClearPreset();
}
}
CString GetXmlSlideTransition ( CSlide& oSlide/*, CAudioOverlay& oAudioOverlay*/ )
{
CString Source = CString ( _T("") );
......
ASCPresentationEditor/OfficeDrawing/Element.h
View file @ b667c8a9
......@@ -120,6 +120,8 @@ namespace NSPresentationEditor
int m_lPlaceholderType;
bool m_bPlaceholderSet;
int m_lPlaceholderSizePreset;
int m_lPlaceholderUserStr;
int m_nFormatDate;
//
CMetricInfo m_oMetric;
......@@ -134,7 +136,6 @@ namespace NSPresentationEditor
bool m_bHaveAnchor;
bool m_bIsChangeable; //
bool m_bIsLayoutElement; // ,
CElementProperties m_oProperties;
......@@ -175,7 +176,6 @@ namespace NSPresentationEditor
m_bHaveAnchor = true;
m_bIsChangeable = true;
m_bIsLayoutElement = false;
m_lID = -1;
m_lLayoutID = -1;
......@@ -184,6 +184,8 @@ namespace NSPresentationEditor
m_lPlaceholderType = -1;
m_bPlaceholderSet = false;
m_lPlaceholderSizePreset = -1;
m_lPlaceholderUserStr = -1;
m_nFormatDate = 1;
m_etType = etPicture;
......@@ -246,7 +248,6 @@ namespace NSPresentationEditor
pDublicate->m_bHaveAnchor = m_bHaveAnchor;
pDublicate->m_bIsChangeable = m_bIsChangeable;
pDublicate->m_bIsLayoutElement = m_bIsLayoutElement;
pDublicate->m_etType = m_etType;
......@@ -267,6 +268,8 @@ namespace NSPresentationEditor
pDublicate->m_lPlaceholderType = m_lPlaceholderType;
pDublicate->m_bPlaceholderSet = m_bPlaceholderSet;
pDublicate->m_lPlaceholderSizePreset = m_lPlaceholderSizePreset;
pDublicate->m_lPlaceholderUserStr = m_lPlaceholderUserStr;
pDublicate->m_nFormatDate = m_nFormatDate;
pDublicate->m_oMetric = m_oMetric;
pDublicate->m_oProperties = m_oProperties;
......
ASCPresentationEditor/OfficeDrawing/Elements.cpp
View file @ b667c8a9
......@@ -88,3 +88,21 @@ void NSPresentationEditor::CShapeElement::SetupTextProperties(CSlide* pSlide, CT
}
}
}
void NSPresentationEditor::CShapeElement::SetUpText(std::wstring newText)
{
NSPresentationEditor::CTextAttributesEx* pText = &m_oShape.m_oText;
if (pText->m_arParagraphs.size() > 0)
{
if (pText->m_arParagraphs[0].m_arSpans.size() >0)
{
ReplaceAll(pText->m_arParagraphs[0].m_arSpans[0].m_strText, L"*", newText);
pText->m_arParagraphs[0].m_arSpans.erase(pText->m_arParagraphs[0].m_arSpans.begin()+1,pText->m_arParagraphs[0].m_arSpans.end());
}
pText->m_arParagraphs.erase(pText->m_arParagraphs.begin()+1,pText->m_arParagraphs.end());
}
}
\ No newline at end of file
ASCPresentationEditor/OfficeDrawing/Elements.h
View file @ b667c8a9
......@@ -497,74 +497,6 @@ namespace NSPresentationEditor
{
}
//virtual void WriteToXml(XmlUtils::CXmlWriter& oWriter)
//{
// CString strXml = SaveToXML();
// oWriter.WriteString(strXml);
//}
//virtual void ReadFromXml(XmlUtils::CXmlNode& oNode)
//{
//}
//virtual CString SaveToXML()
//{
// if (!m_oAnimations.m_arAnimations.empty())
// return ToAnimationXml();
//
// CGeomShapeInfo oInfo;
// oInfo.SetBounds(m_rcBounds);
// oInfo.m_dRotate = m_dRotate;
// oInfo.m_bFlipH = m_bFlipH;
// oInfo.m_bFlipV = m_bFlipV;
// return m_oShape.ToXml(oInfo, m_oMetric, m_dStartTime, m_dEndTime, m_pTheme, m_pLayout);
//}
//CString ToAnimationXml()
//{
// CGeomShapeInfo oInfo;
// oInfo.SetBounds(m_rcBounds);
// oInfo.m_dRotate = m_dRotate;
// oInfo.m_bFlipH = m_bFlipH;
// oInfo.m_bFlipV = m_bFlipV;
// m_oAnimations.m_dSlideWidth = m_oMetric.m_lMillimetresHor;
// m_oAnimations.m_dSlideHeight = m_oMetric.m_lMillimetresVer;
// CString timeXML;
// timeXML.Format(_T("<timeline type = \"1\" begin=\"%f\" end=\"%f\" fadein=\"0\" fadeout=\"0\" completeness=\"1.0\"/> "), m_dStartTime, m_dEndTime );
//
// CString baseXML = m_oShape.ToXml(oInfo, m_oMetric, m_dStartTime, m_dEndTime, m_pTheme, m_pLayout);
// if ( -1 != baseXML.Find ( _T("<ImagePaint-DrawTextEx") ) )
// {
// CString sBounds; // FIX
// sBounds.Format(_T("<bounds left='%d' top='%d' right='%d' bottom='%d'/>"),
// (LONG)m_rcBounds.left, (LONG)m_rcBounds.top, (LONG)m_rcBounds.right, (LONG)m_rcBounds.bottom);
// CString sReplace = m_oAnimations.ToXml(m_dStartTime, m_dEndTime) + timeXML + sBounds + _T("</ImagePaint-DrawTextAnimateEx>");
//
// baseXML.Replace ( _T("</ImagePaint-DrawTextEx>"), sReplace );
// baseXML.Replace ( _T("<ImagePaint-DrawTextEx"), _T("<ImagePaint-DrawTextAnimateEx") );
// }
// if ( -1 != baseXML.Find ( _T("<ImagePaint-DrawGraphicPath") ) )
// {
// CString sAnim = m_oAnimations.ToXml(m_dStartTime, m_dEndTime, true);
// if (sAnim.GetLength())
// {
// CString sReplace = sAnim + timeXML + _T("</ImagePaint-DrawGraphicPathAnimate>");
//
// baseXML.Replace ( _T("</ImagePaint-DrawGraphicPath>"), sReplace );
// baseXML.Replace ( _T("<ImagePaint-DrawGraphicPath"), _T("<ImagePaint-DrawGraphicPathAnimate") );
// }
// }
//
// return baseXML;
//}
virtual IElement* CreateDublicate()
{
CShapeElement* pShapeElement = new CShapeElement(m_ClassType, m_lShapeType);
......@@ -577,7 +509,7 @@ namespace NSPresentationEditor
m_oShape.SetToDublicate(&pShapeElement->m_oShape);
return (IElement*)pShapeElement;
}
void SetUpText(std::wstring newText);
virtual void SetupProperties(CSlide* pSlide, CTheme* pTheme, CLayout* pLayout)
{
......
ASCPresentationEditor/OfficeDrawing/Layout.h
View file @ b667c8a9
......@@ -14,17 +14,22 @@ namespace NSPresentationEditor
bool m_bUseThemeColorScheme;
// ""( ),
long m_lOriginalWidth;
long m_lOriginalHeight;
long m_lOriginalWidth;
long m_lOriginalHeight;
bool m_bIsBackground;
CBrush m_oBackground;
bool m_bIsBackground;
CBrush m_oBackground;
//
long m_lWidth;
long m_lHeight;
long m_lWidth;
long m_lHeight;
CMetricInfo m_oInfo;
CMetricInfo m_oInfo;
bool m_bHasDate;
bool m_bHasSlideNumber;
bool m_bHasFooter;
int m_nFormatDate;
bool m_bShowMasterShapes;
std::wstring m_strLayoutType;
......@@ -67,6 +72,11 @@ namespace NSPresentationEditor
m_bIsBackground = oSrc.m_bIsBackground;
m_oBackground = oSrc.m_oBackground;
m_bHasDate = oSrc.m_bHasDate;
m_bHasSlideNumber = oSrc.m_bHasSlideNumber;
m_bHasFooter = oSrc.m_bHasFooter;
m_nFormatDate = oSrc.m_nFormatDate;
m_bShowMasterShapes = oSrc.m_bShowMasterShapes;
m_strLayoutType = oSrc.m_strLayoutType;
......@@ -96,6 +106,11 @@ namespace NSPresentationEditor
m_arElements.clear();
m_mapPlaceholders.clear();
m_bHasDate = false;
m_bHasSlideNumber = false;
m_bHasFooter = false;
m_nFormatDate = 1;
m_bUseThemeColorScheme = true;
m_bShowMasterShapes = true;
m_strLayoutType = _T("obj");
......
ASCPresentationEditor/OfficeDrawing/Slide.h
View file @ b667c8a9
......@@ -14,19 +14,19 @@ namespace NSPresentationEditor
CSlideShowInfo m_oSlideShow;
//
long m_lWidth;
long m_lHeight;
long m_lWidth;
long m_lHeight;
// - "" ( ),
long m_lOriginalWidth;
long m_lOriginalHeight;
long m_lOriginalWidth;
long m_lOriginalHeight;
double m_dStartTime;
double m_dEndTime;
double m_dDuration;
double m_dStartTime;
double m_dEndTime;
double m_dDuration;
bool m_bIsBackground;
CBrush m_oBackground;
bool m_bIsBackground;
CBrush m_oBackground;
std::vector<CColor> m_arColorScheme;
bool m_bUseLayoutColorScheme;
......@@ -34,6 +34,11 @@ namespace NSPresentationEditor
CMetricInfo m_oInfo;
bool m_bHasDate;
bool m_bHasSlideNumber;
bool m_bHasFooter;
int m_nFormatDate;
std::wstring m_strComment;
std::wstring m_sName;
public:
......@@ -56,18 +61,23 @@ namespace NSPresentationEditor
m_arColorScheme.clear();
m_arElements.clear();
m_lThemeID = -1;
m_lLayoutID = -1;
m_lThemeID = -1;
m_lLayoutID = -1;
m_lWidth = 270;
m_lHeight = 190;
m_lWidth = 270;
m_lHeight = 190;
m_lOriginalWidth = 6000;
m_lOriginalHeight = 5000;
m_dStartTime = 0.0;
m_dEndTime = 0.0;
m_dDuration = 30000.0;
m_dStartTime = 0.0;
m_dEndTime = 0.0;
m_dDuration = 30000.0;
m_bHasDate = false;
m_bHasSlideNumber = false;
m_bHasFooter = false;
m_nFormatDate = 1;
m_bShowMasterShapes = true;
m_strComment.clear();
......@@ -75,42 +85,6 @@ namespace NSPresentationEditor
}
//CSlide& operator=(const CSlide& oSrc)
//{
// Clear();
//
// size_t nCount = oSrc.m_arElements.size();
// for (size_t nIndex = 0; nIndex < nCount; ++nIndex)
// {
// m_arElements.push_back(oSrc.m_arElements[nIndex]->CreateDublicate());
// }
// m_arColorScheme = oSrc.m_arColorScheme;
// m_oSlideShow = oSrc.m_oSlideShow;
// m_lThemeID = oSrc.m_lThemeID;
// m_lLayoutID = oSrc.m_lLayoutID;
// m_lWidth = oSrc.m_lWidth;
// m_lHeight = oSrc.m_lHeight;
// m_lOriginalWidth = oSrc.m_lOriginalWidth;
// m_lOriginalHeight = oSrc.m_lOriginalHeight;
//
// m_dStartTime = oSrc.m_dStartTime;
// m_dEndTime = oSrc.m_dEndTime;
// m_dDuration = oSrc.m_dDuration;
// m_bIsBackground = oSrc.m_bIsBackground;
// m_oBackground = oSrc.m_oBackground;
// m_bShowMasterShapes = oSrc.m_bShowMasterShapes;
// m_strComment = oSrc.m_strComment;
// return *this;
//}
CSlide(const CSlide& oSrc)
{
Clear();
......@@ -143,6 +117,11 @@ namespace NSPresentationEditor
m_bShowMasterShapes = oSrc.m_bShowMasterShapes;
m_bHasDate = oSrc.m_bHasDate;
m_bHasSlideNumber = oSrc.m_bHasSlideNumber;
m_bHasFooter = oSrc.m_bHasFooter;
m_nFormatDate = oSrc.m_nFormatDate;
m_strComment = oSrc.m_strComment;
m_sName = oSrc.m_sName;
}
......@@ -169,30 +148,6 @@ namespace NSPresentationEditor
}
}
void ClearPreset()
{
LONG nCount = (LONG)m_arElements.size();
for (LONG i = 0; i < nCount; ++i)
{
IElement* pElement = m_arElements[i];
if (NULL == pElement)
{
m_arElements.erase(m_arElements.begin() + i);
--i;
--nCount;
continue;
}
else if (pElement->m_bIsLayoutElement)
{
m_arElements.erase(m_arElements.begin() + i);
--i;
--nCount;
RELEASEINTERFACE(pElement);
}
}
}
void CalculateElement(size_t nIndexElement, CTheme* pTheme, CLayout* pLayout)
{
IElement* pElement = m_arElements[nIndexElement];
......
ASCPresentationEditor/OfficeDrawing/Theme.h
View file @ b667c8a9
......@@ -35,13 +35,14 @@ namespace NSPresentationEditor
std::vector<std::vector<CColor>>m_arExtraColorScheme;
long m_lOriginalWidth;
long m_lOriginalHeight;
long m_lOriginalWidth;
long m_lOriginalHeight;
bool m_bHasDate;
bool m_bHasSlideNumber;
bool m_bHasHeader;
bool m_bHasFooter;
bool m_bHasDate;
bool m_bHasSlideNumber;
bool m_bHasFooter;
int m_nFormatDate;//1- current, 2 - user
std::vector<std::wstring> m_oFootersHeaderString;
......@@ -49,13 +50,7 @@ namespace NSPresentationEditor
CTheme() : m_arColorScheme(), m_arFonts(), m_arBrushes(),
m_arPens(), m_arEffects(), m_arLayouts()
{
m_sThemeName = L"Default";
m_lOriginalWidth = m_lOriginalHeight = 0;
m_bHasDate = false;
m_bHasSlideNumber = false;
m_bHasHeader = false;
m_bHasFooter = false;
Clear();
}
CTheme(const CTheme& oSrc)
......@@ -78,8 +73,8 @@ namespace NSPresentationEditor
m_bHasDate = oSrc.m_bHasDate;
m_bHasSlideNumber = oSrc.m_bHasSlideNumber;
m_bHasHeader = oSrc.m_bHasHeader;
m_bHasFooter = oSrc.m_bHasFooter;
m_nFormatDate = oSrc.m_nFormatDate;
for (int i = 0; i < oSrc.m_arExtraColorScheme.size(); ++i)
{
......@@ -152,12 +147,12 @@ namespace NSPresentationEditor
m_lOriginalWidth = m_lOriginalHeight = 0;
m_sThemeName = L"Default";
m_sThemeName = L"Default";
m_bHasDate = false;
m_bHasSlideNumber = false;
m_bHasHeader = false;
m_bHasFooter = false;
m_bHasDate = false;
m_bHasSlideNumber = false;
m_bHasFooter = false;
m_nFormatDate = 1;
}
~CTheme()
......
ASCPresentationEditor/PPTXWriter/ShapeWriter.cpp
View file @ b667c8a9
......@@ -951,7 +951,7 @@ void NSPresentationEditor::CShapeWriter::WriteTextInfo()
{
m_oWriter.WriteString(std::wstring(L"<a:fld id=\"{D038279B-FC19-497E-A7D1-5ADD9CAF016F}\" type=\"slidenum\"><a:rPr"));
}
else if (m_pShapeElement->m_lPlaceholderType == PT_MasterDate)
else if (m_pShapeElement->m_lPlaceholderType == PT_MasterDate && m_pShapeElement->m_nFormatDate == 1)
{
m_oWriter.WriteString(std::wstring(L"<a:fld id=\"{D7E01130-044F-4930-9A27-C729C70D8524}\" type=\"datetime1\"><a:rPr"));
}
......@@ -1067,7 +1067,7 @@ void NSPresentationEditor::CShapeWriter::WriteTextInfo()
m_oWriter.WriteString(strT2);
if (m_pShapeElement->m_lPlaceholderType == PT_MasterSlideNumber ||
m_pShapeElement->m_lPlaceholderType == PT_MasterDate)
(m_pShapeElement->m_lPlaceholderType == PT_MasterDate && m_pShapeElement->m_nFormatDate == 1))
{
m_oWriter.WriteString(std::wstring(L"</a:fld>"));
}
......
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