mirror of
https://github.com/ONLYOFFICE/core.git
synced 2026-02-20 06:46:23 +08:00
Compare commits
42 Commits
core/devel
...
core-windo
| Author | SHA1 | Date | |
|---|---|---|---|
| 2c945b7166 | |||
| e49deaaf64 | |||
| 3edb12499c | |||
| 52c3f9bdb1 | |||
| 1e53b26704 | |||
| 8ac5180992 | |||
| 8cdf491178 | |||
| c5c64cb6c2 | |||
| 86000ee48f | |||
| 652fc292af | |||
| 2ff5bd5910 | |||
| 01528516dd | |||
| 95dcf3661f | |||
| 717d91a192 | |||
| 3dd4dda2e3 | |||
| 24dc35546f | |||
| fc2707f0b5 | |||
| ea5ebe720b | |||
| cdead54f4a | |||
| 29ae0bdc38 | |||
| 502243103b | |||
| c668288308 | |||
| 39257334e4 | |||
| 48f95bd9f2 | |||
| 42fb658349 | |||
| d500cbc615 | |||
| 470d57aec2 | |||
| 635a5d232a | |||
| 6fa18eb20d | |||
| 435bb02de3 | |||
| a84425b49f | |||
| 250a6e5a06 | |||
| 82dc7ab444 | |||
| 51c8ab5499 | |||
| 4176176e2b | |||
| 34d03c743e | |||
| 4cf55208b1 | |||
| fe1d48635b | |||
| db20232095 | |||
| 56ecea3ffc | |||
| 59599289af | |||
| d95c93abb2 |
@ -766,18 +766,11 @@ namespace DocFormatUtils
|
||||
|
||||
static inline std::wstring IntToWideString(int value)
|
||||
{
|
||||
#if defined(_WIN32) || defined (_WIN64)
|
||||
wchar_t buff[33] ={};
|
||||
_itow(value, buff, 10);
|
||||
return std::wstring(buff);
|
||||
#else
|
||||
return (std::to_wstring(value));
|
||||
#endif
|
||||
}
|
||||
static inline std::wstring DoubleToWideString(double value)
|
||||
{
|
||||
std::wstringstream src;
|
||||
|
||||
std::wstringstream src;
|
||||
src << value;
|
||||
|
||||
return std::wstring(src.str());
|
||||
@ -785,8 +778,7 @@ namespace DocFormatUtils
|
||||
|
||||
static inline std::string DoubleToString(double value)
|
||||
{
|
||||
std::stringstream src;
|
||||
|
||||
std::stringstream src;
|
||||
src << value;
|
||||
|
||||
return std::string(src.str());
|
||||
@ -813,36 +805,16 @@ namespace DocFormatUtils
|
||||
|
||||
static inline std::wstring IntToFormattedWideString( int value, const wchar_t* format )
|
||||
{
|
||||
// const int size = 33;
|
||||
|
||||
// wchar_t strValue[size] = L"\0";
|
||||
|
||||
if ( format == NULL ) return L"";
|
||||
// swprintf_s( strValue, size, format, value );
|
||||
//// }
|
||||
// CString format_str;
|
||||
// format_str.Format(format , value);
|
||||
|
||||
std::wstringstream sstream;
|
||||
sstream << boost::wformat(format) % value;
|
||||
return sstream.str();
|
||||
//return string2std_string( format_str );
|
||||
}
|
||||
|
||||
static inline std::wstring DoubleToFormattedWideString( double value, wchar_t* format )
|
||||
{
|
||||
if ( format == NULL ) return L"";
|
||||
//std::wstring wstr;
|
||||
|
||||
//if ( format != NULL )
|
||||
//{
|
||||
// CString strValue;
|
||||
// strValue.Format(format, value);
|
||||
|
||||
// wstr = string2std_string( strValue );
|
||||
//}
|
||||
|
||||
//return wstr;
|
||||
std::wstringstream sstream;
|
||||
sstream << boost::wformat(format) % value;
|
||||
return sstream.str();
|
||||
|
||||
@ -72,6 +72,8 @@ namespace DocFileFormat
|
||||
_isSectionPageBreak = 0;
|
||||
_isTextBoxContent = false;
|
||||
_embeddedObject = false;
|
||||
|
||||
_cacheListNum = -1;
|
||||
}
|
||||
|
||||
DocumentMapping::~DocumentMapping()
|
||||
@ -81,12 +83,8 @@ namespace DocFileFormat
|
||||
RELEASEOBJECT(m_pXmlWriter);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
namespace DocFileFormat
|
||||
{
|
||||
// Looks into the section table to find out if this CP is the end & current of a sections
|
||||
|
||||
int DocumentMapping::getCurrentSection(int cp)
|
||||
{
|
||||
//if cp is the last char of a section, the next section will start at cp +1
|
||||
@ -105,6 +103,22 @@ namespace DocFileFormat
|
||||
|
||||
return m_document->SectionPlex->CharacterPositions[current + 1];
|
||||
}
|
||||
int DocumentMapping::getListNumCache(int fc, int fc_end)
|
||||
{
|
||||
if ( !m_document->ListPlex ) return -1;
|
||||
|
||||
for (int i = 1; i < m_document->ListPlex->CharacterPositions.size(); i++)
|
||||
{
|
||||
if ((fc >= m_document->ListPlex->CharacterPositions[i-1]) && (fc_end <= m_document->ListPlex->CharacterPositions[i]))
|
||||
{
|
||||
ListNumCache* listNum = dynamic_cast<ListNumCache*> (m_document->ListPlex->Elements[i-1]);
|
||||
|
||||
return listNum->value;
|
||||
}
|
||||
}
|
||||
|
||||
return -1;
|
||||
}
|
||||
bool DocumentMapping::isSectionEnd(int cp)
|
||||
{
|
||||
bool result = false;
|
||||
@ -180,8 +194,8 @@ namespace DocFileFormat
|
||||
|
||||
// get all CHPX between these boundaries to determine the count of runs
|
||||
|
||||
std::list<CharacterPropertyExceptions*>* chpxs = m_document->GetCharacterPropertyExceptions(fc, fcEnd);
|
||||
std::vector<int>* chpxFcs = m_document->GetFileCharacterPositions(fc, fcEnd);
|
||||
std::list<CharacterPropertyExceptions*>* chpxs = m_document->GetCharacterPropertyExceptions(fc, fcEnd);
|
||||
std::vector<int>* chpxFcs = m_document->GetFileCharacterPositions(fc, fcEnd);
|
||||
|
||||
CharacterPropertyExceptions* paraEndChpx = NULL;
|
||||
|
||||
@ -198,7 +212,7 @@ namespace DocFileFormat
|
||||
|
||||
// start paragraph
|
||||
|
||||
m_pXmlWriter->WriteNodeBegin(_T("w:p"), TRUE);
|
||||
m_pXmlWriter->WriteNodeBegin(_T("w:p"), true);
|
||||
writeParagraphRsid(papx);
|
||||
|
||||
// ----------- check for section properties
|
||||
@ -208,8 +222,8 @@ namespace DocFileFormat
|
||||
{
|
||||
isBidi = currentSection->isBidi;
|
||||
}
|
||||
|
||||
//-----------------------------------------------------------
|
||||
//_cacheListNum = getListNumCache(fc, fcEnd);
|
||||
_isSectionPageBreak = 0;
|
||||
if (sectionEnd)
|
||||
{
|
||||
@ -339,7 +353,7 @@ namespace DocFileFormat
|
||||
}
|
||||
}
|
||||
|
||||
m_pXmlWriter->WriteNodeEnd(_T(""), TRUE, FALSE);
|
||||
m_pXmlWriter->WriteNodeEnd(_T(""), true, false);
|
||||
}
|
||||
|
||||
// Writes a run with the given characters and CHPX
|
||||
@ -356,23 +370,23 @@ namespace DocFileFormat
|
||||
if (Deleted == rev.Type)
|
||||
{
|
||||
//If it's a deleted run
|
||||
m_pXmlWriter->WriteNodeBegin(_T("w:del"), TRUE);
|
||||
m_pXmlWriter->WriteNodeBegin(_T("w:del"), true);
|
||||
m_pXmlWriter->WriteAttribute(_T("w:author"), _T("[b2x: could not retrieve author]"));
|
||||
m_pXmlWriter->WriteAttribute(_T("w:date"), _T("[b2x: could not retrieve date]"));
|
||||
m_pXmlWriter->WriteNodeEnd(_T(""), TRUE, FALSE);
|
||||
m_pXmlWriter->WriteNodeEnd(_T(""), true, false);
|
||||
}
|
||||
else if ( rev.Type == Inserted )
|
||||
{
|
||||
WideString* author = dynamic_cast<WideString*>(m_document->RevisionAuthorTable->operator[](rev.Isbt));
|
||||
//if it's a inserted run
|
||||
m_pXmlWriter->WriteNodeBegin(_T("w:ins"), TRUE);
|
||||
m_pXmlWriter->WriteNodeBegin(_T("w:ins"), true);
|
||||
m_pXmlWriter->WriteAttribute(_T("w:author"), FormatUtils::XmlEncode(*author).c_str());
|
||||
m_pXmlWriter->WriteNodeEnd(_T(""), TRUE, FALSE);
|
||||
m_pXmlWriter->WriteNodeEnd(_T(""), true, false);
|
||||
//rev.Dttm.Convert(new DateMapping(m_pXmlWriter));
|
||||
}
|
||||
|
||||
//start run
|
||||
m_pXmlWriter->WriteNodeBegin(_T("w:r"), TRUE);
|
||||
m_pXmlWriter->WriteNodeBegin(_T("w:r"), true);
|
||||
|
||||
//append rsids
|
||||
if (0 != rev.Rsid)
|
||||
@ -396,7 +410,7 @@ namespace DocFileFormat
|
||||
m_context->AddRsid(rsidProp);
|
||||
}
|
||||
|
||||
m_pXmlWriter->WriteNodeEnd(_T(""), TRUE, FALSE);
|
||||
m_pXmlWriter->WriteNodeEnd(_T(""), true, false);
|
||||
|
||||
/// <w:rPr>
|
||||
CharacterPropertiesMapping* rPr = new CharacterPropertiesMapping(m_pXmlWriter, m_document, &rev, _lastValidPapx, false);
|
||||
@ -564,9 +578,9 @@ namespace DocFileFormat
|
||||
|
||||
if ( bFORM )
|
||||
{
|
||||
m_pXmlWriter->WriteNodeBegin( _T( "w:fldChar" ), TRUE );
|
||||
m_pXmlWriter->WriteNodeBegin( _T( "w:fldChar" ), true );
|
||||
m_pXmlWriter->WriteAttribute( _T( "w:fldCharType" ), _T( "begin" ) );
|
||||
m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
|
||||
m_pXmlWriter->WriteNodeEnd( _T( "" ), true, false );
|
||||
|
||||
int cpPic = searchNextTextMark( m_document->Text, cpFieldStart, TextMark::Picture );
|
||||
|
||||
@ -589,9 +603,9 @@ namespace DocFileFormat
|
||||
&&
|
||||
( ( bEMBED || bLINK ) && bChart) )
|
||||
{
|
||||
m_pXmlWriter->WriteNodeBegin( _T( "w:fldChar" ), TRUE );
|
||||
m_pXmlWriter->WriteNodeBegin( _T( "w:fldChar" ), true );
|
||||
m_pXmlWriter->WriteAttribute( _T( "w:fldCharType" ), _T( "begin" ) );
|
||||
m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
|
||||
m_pXmlWriter->WriteNodeEnd( _T( "" ), true, false );
|
||||
|
||||
int cpPic = searchNextTextMark( m_document->Text, cpFieldStart, TextMark::Picture );
|
||||
|
||||
@ -608,9 +622,9 @@ namespace DocFileFormat
|
||||
|
||||
if ((search( f.begin(), f.end(), TOC.begin(), TOC.end()) != f.end()) || bPAGE)
|
||||
{
|
||||
m_pXmlWriter->WriteNodeBegin( _T( "w:fldChar" ), TRUE );
|
||||
m_pXmlWriter->WriteNodeBegin( _T( "w:fldChar" ), true );
|
||||
m_pXmlWriter->WriteAttribute( _T( "w:fldCharType" ), _T( "begin" ) );
|
||||
m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_pXmlWriter->WriteNodeEnd( _T( "" ), true );
|
||||
|
||||
_writeInstrText = true;
|
||||
_fldCharCounter++;
|
||||
@ -638,9 +652,9 @@ namespace DocFileFormat
|
||||
|
||||
//if (_writeInstrText == true)
|
||||
//{
|
||||
// m_pXmlWriter->WriteNodeBegin( _T( "w:fldChar" ), TRUE );
|
||||
// m_pXmlWriter->WriteNodeBegin( _T( "w:fldChar" ), true );
|
||||
// m_pXmlWriter->WriteAttribute( _T( "w:fldCharType" ), _T( "separate" ) );
|
||||
// m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE );
|
||||
// m_pXmlWriter->WriteNodeEnd( _T( "" ), true );
|
||||
//}
|
||||
_writeInstrText = false;
|
||||
|
||||
@ -671,31 +685,38 @@ namespace DocFileFormat
|
||||
chpxObj->Convert(rPr);
|
||||
RELEASEOBJECT(rPr);
|
||||
}
|
||||
XMLTools::CStringXmlWriter OleWriter;
|
||||
VMLPictureMapping oVmlMapper (m_context, &OleWriter, true, _caller);
|
||||
XMLTools::CStringXmlWriter oleWriter;
|
||||
XMLTools::CStringXmlWriter oleObjectWriter;
|
||||
|
||||
VMLPictureMapping oVmlMapper (m_context, &oleWriter, true, _caller);
|
||||
|
||||
if (!m_shapeIdOwner.empty()) //4571833.doc
|
||||
oVmlMapper.m_shapeId = m_shapeIdOwner;
|
||||
|
||||
if (m_document->bOlderVersion)
|
||||
{
|
||||
OleObject ole ( chpxObj, m_document->GetStorage(), m_document->bOlderVersion);
|
||||
|
||||
OleWriter.WriteNodeBegin (_T( "w:object" ), TRUE);
|
||||
OleWriter.WriteAttribute( _T( "w:dxaOrig" ), FormatUtils::IntToWideString( ( ole.pictureDesciptor.dxaGoal + ole.pictureDesciptor.dxaOrigin ) ).c_str() );
|
||||
OleWriter.WriteAttribute( _T( "w:dyaOrig" ), FormatUtils::IntToWideString( ( ole.pictureDesciptor.dyaGoal + ole.pictureDesciptor.dyaOrigin ) ).c_str() );
|
||||
OleWriter.WriteNodeEnd( _T( "" ), TRUE, FALSE );
|
||||
oleWriter.WriteNodeBegin (_T( "w:object" ), true);
|
||||
oleWriter.WriteAttribute( _T( "w:dxaOrig" ), FormatUtils::IntToWideString( ( ole.pictureDesciptor.dxaGoal + ole.pictureDesciptor.dxaOrigin ) ).c_str() );
|
||||
oleWriter.WriteAttribute( _T( "w:dyaOrig" ), FormatUtils::IntToWideString( ( ole.pictureDesciptor.dyaGoal + ole.pictureDesciptor.dyaOrigin ) ).c_str() );
|
||||
oleWriter.WriteNodeEnd( _T( "" ), true, false );
|
||||
|
||||
ole.pictureDesciptor.Convert(&oVmlMapper);
|
||||
OleObjectMapping oleObjectMapping( &OleWriter, m_context, &ole.pictureDesciptor, _caller, oVmlMapper.GetShapeId() );
|
||||
OleObjectMapping oleObjectMapping( &oleObjectWriter, m_context, &ole.pictureDesciptor, _caller, oVmlMapper.m_shapeId);
|
||||
|
||||
ole.Convert( &oleObjectMapping );
|
||||
|
||||
_lastOLEObject = oleObjectWriter.GetXmlString();
|
||||
}
|
||||
else
|
||||
{
|
||||
PictureDescriptor pic(chpxObj, m_document->DataStream, 0x7fffffff, m_document->bOlderVersion);
|
||||
|
||||
OleWriter.WriteNodeBegin (_T( "w:object" ), TRUE);
|
||||
OleWriter.WriteAttribute( _T( "w:dxaOrig" ), FormatUtils::IntToWideString( ( pic.dxaGoal + pic.dxaOrigin ) ).c_str() );
|
||||
OleWriter.WriteAttribute( _T( "w:dyaOrig" ), FormatUtils::IntToWideString( ( pic.dyaGoal + pic.dyaOrigin ) ).c_str() );
|
||||
OleWriter.WriteNodeEnd( _T( "" ), TRUE, FALSE );
|
||||
oleWriter.WriteNodeBegin (_T( "w:object" ), true);
|
||||
oleWriter.WriteAttribute( _T( "w:dxaOrig" ), FormatUtils::IntToWideString( ( pic.dxaGoal + pic.dxaOrigin ) ).c_str() );
|
||||
oleWriter.WriteAttribute( _T( "w:dyaOrig" ), FormatUtils::IntToWideString( ( pic.dyaGoal + pic.dyaOrigin ) ).c_str() );
|
||||
oleWriter.WriteNodeEnd( _T( "" ), true, false );
|
||||
|
||||
pic.Convert(&oVmlMapper);
|
||||
RELEASEOBJECT(chpxs);
|
||||
@ -709,7 +730,7 @@ namespace DocFileFormat
|
||||
CharacterPropertyExceptions* chpxSep = chpxs->front();
|
||||
|
||||
OleObject ole ( chpxSep, m_document->GetStorage(), m_document->bOlderVersion);
|
||||
OleObjectMapping oleObjectMapping( &OleWriter, m_context, &pic, _caller, oVmlMapper.GetShapeId() );
|
||||
OleObjectMapping oleObjectMapping( &oleObjectWriter, m_context, &pic, _caller, oVmlMapper.m_shapeId );
|
||||
|
||||
if (oVmlMapper.m_isEmbedded)
|
||||
{
|
||||
@ -718,11 +739,14 @@ namespace DocFileFormat
|
||||
ole.emeddedData = oVmlMapper.m_embeddedData;
|
||||
}
|
||||
ole.Convert( &oleObjectMapping );
|
||||
|
||||
_lastOLEObject = oleObjectWriter.GetXmlString();
|
||||
|
||||
RELEASEOBJECT( chpxs );
|
||||
}
|
||||
}
|
||||
OleWriter.WriteNodeEnd( _T( "w:object" ) );
|
||||
oleWriter.WriteString( _lastOLEObject );
|
||||
oleWriter.WriteNodeEnd( _T( "w:object" ) );
|
||||
|
||||
if (!oVmlMapper.m_isEmbedded && oVmlMapper.m_isEquation)
|
||||
{
|
||||
@ -732,7 +756,7 @@ namespace DocFileFormat
|
||||
}
|
||||
else
|
||||
{
|
||||
m_pXmlWriter->WriteString(OleWriter.GetXmlString());
|
||||
m_pXmlWriter->WriteString(oleWriter.GetXmlString());
|
||||
}
|
||||
}
|
||||
|
||||
@ -741,9 +765,9 @@ namespace DocFileFormat
|
||||
}
|
||||
else
|
||||
{
|
||||
m_pXmlWriter->WriteNodeBegin( _T( "w:fldChar" ), TRUE );
|
||||
m_pXmlWriter->WriteNodeBegin( _T( "w:fldChar" ), true );
|
||||
m_pXmlWriter->WriteAttribute( _T( "w:fldCharType" ), _T( "begin" ) );
|
||||
m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_pXmlWriter->WriteNodeEnd( _T( "" ), true );
|
||||
|
||||
_writeInstrText = true;
|
||||
_fldCharCounter++;
|
||||
@ -787,10 +811,10 @@ namespace DocFileFormat
|
||||
{
|
||||
Symbol s = getSymbol( chpx );
|
||||
|
||||
m_pXmlWriter->WriteNodeBegin(_T("w:sym"), TRUE);
|
||||
m_pXmlWriter->WriteNodeBegin(_T("w:sym"), true);
|
||||
m_pXmlWriter->WriteAttribute(_T("w:font"), FormatUtils::XmlEncode(s.FontName).c_str());
|
||||
m_pXmlWriter->WriteAttribute(_T("w:char"), FormatUtils::XmlEncode(s.HexValue).c_str());
|
||||
m_pXmlWriter->WriteNodeEnd(_T(""), TRUE);
|
||||
m_pXmlWriter->WriteNodeEnd(_T(""), true);
|
||||
}
|
||||
else if ((TextMark::DrawnObject == code) && fSpec)
|
||||
{
|
||||
@ -807,20 +831,23 @@ namespace DocFileFormat
|
||||
|
||||
if (pSpa)
|
||||
{
|
||||
PictureDescriptor pictDiscr(chpx, m_document->WordDocumentStream, 0x7fffffff, m_document->bOlderVersion);
|
||||
ShapeContainer* pShape = m_document->GetOfficeArt()->GetShapeContainer(pSpa->GetShapeID());
|
||||
|
||||
if (pShape)
|
||||
{
|
||||
m_pXmlWriter->WriteNodeBegin (_T("w:pict"));
|
||||
VMLShapeMapping oVmlWriter (m_context, m_pXmlWriter, pSpa, NULL, _caller);
|
||||
VMLShapeMapping oVmlWriter (m_context, m_pXmlWriter, pSpa, &pictDiscr, _caller);
|
||||
|
||||
m_pXmlWriter->WriteNodeBegin (L"w:pict");
|
||||
|
||||
pShape->Convert(&oVmlWriter);
|
||||
m_pXmlWriter->WriteNodeEnd (_T("w:pict"));
|
||||
m_pXmlWriter->WriteNodeEnd (L"w:pict");
|
||||
}
|
||||
|
||||
if (!pSpa->primitives.empty())
|
||||
{
|
||||
m_pXmlWriter->WriteNodeBegin (_T("w:pict"));
|
||||
VMLShapeMapping oVmlWriter (m_context, m_pXmlWriter, pSpa, NULL, _caller);
|
||||
VMLShapeMapping oVmlWriter (m_context, m_pXmlWriter, pSpa, &pictDiscr, _caller);
|
||||
pSpa->primitives.Convert(&oVmlWriter);
|
||||
m_pXmlWriter->WriteNodeEnd (_T("w:pict"));
|
||||
}
|
||||
@ -865,7 +892,7 @@ namespace DocFileFormat
|
||||
if (oVmlMapper.m_isEmbedded)
|
||||
{
|
||||
OleObject ole ( chpx, m_document->GetStorage(), m_document->bOlderVersion);
|
||||
OleObjectMapping oleObjectMapping( &pictWriter, m_context, &oPicture, _caller, oVmlMapper.GetShapeId() );
|
||||
OleObjectMapping oleObjectMapping( &pictWriter, m_context, &oPicture, _caller, oVmlMapper.m_shapeId );
|
||||
|
||||
ole.isEquation = oVmlMapper.m_isEquation;
|
||||
ole.isEmbedded = oVmlMapper.m_isEmbedded;
|
||||
@ -897,40 +924,40 @@ namespace DocFileFormat
|
||||
{
|
||||
if ((m_document->FootnoteReferenceCharactersPlex != NULL) && (m_document->FootnoteReferenceCharactersPlex->IsCpExists(cp)))
|
||||
{
|
||||
m_pXmlWriter->WriteNodeBegin( _T( "w:footnoteReference" ), TRUE );
|
||||
m_pXmlWriter->WriteNodeBegin( _T( "w:footnoteReference" ), true );
|
||||
m_pXmlWriter->WriteAttribute( _T( "w:id" ), FormatUtils::IntToWideString(_footnoteNr++ ).c_str() );
|
||||
m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_pXmlWriter->WriteNodeEnd( _T( "" ), true );
|
||||
}
|
||||
else if ((m_document->IndividualFootnotesPlex != NULL) && (m_document->IndividualFootnotesPlex->IsCpExists(cp - m_document->FIB->m_RgLw97.ccpText)))
|
||||
{
|
||||
m_pXmlWriter->WriteNodeBegin( _T( "w:footnoteRef" ), TRUE );
|
||||
m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_pXmlWriter->WriteNodeBegin( _T( "w:footnoteRef" ), true );
|
||||
m_pXmlWriter->WriteNodeEnd( _T( "" ), true );
|
||||
}
|
||||
else if ((m_document->EndnoteReferenceCharactersPlex != NULL) && (m_document->EndnoteReferenceCharactersPlex->IsCpExists(cp)))
|
||||
{
|
||||
m_pXmlWriter->WriteNodeBegin( _T( "w:endnoteReference" ), TRUE );
|
||||
m_pXmlWriter->WriteNodeBegin( _T( "w:endnoteReference" ), true );
|
||||
m_pXmlWriter->WriteAttribute( _T( "w:id" ), FormatUtils::IntToWideString(_endnoteNr++ ).c_str() );
|
||||
m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_pXmlWriter->WriteNodeEnd( _T( "" ), true );
|
||||
}
|
||||
else if ((m_document->IndividualEndnotesPlex != NULL) &&
|
||||
(m_document->IndividualEndnotesPlex->IsCpExists(cp - m_document->FIB->m_RgLw97.ccpAtn - m_document->FIB->m_RgLw97.ccpHdr - m_document->FIB->m_RgLw97.ccpFtn - m_document->FIB->m_RgLw97.ccpText)))
|
||||
{
|
||||
m_pXmlWriter->WriteNodeBegin( _T( "w:endnoteRef" ), TRUE );
|
||||
m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_pXmlWriter->WriteNodeBegin( _T( "w:endnoteRef" ), true );
|
||||
m_pXmlWriter->WriteNodeEnd( _T( "" ), true );
|
||||
}
|
||||
}
|
||||
else if (TextMark::AnnotationReference == code)
|
||||
{
|
||||
if (typeid(*this) != typeid(CommentsMapping))
|
||||
{
|
||||
m_pXmlWriter->WriteNodeBegin( _T( "w:commentReference" ), TRUE );
|
||||
m_pXmlWriter->WriteNodeBegin( _T( "w:commentReference" ), true );
|
||||
m_pXmlWriter->WriteAttribute( _T( "w:id" ), FormatUtils::IntToWideString( _commentNr ).c_str() );
|
||||
m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_pXmlWriter->WriteNodeEnd( _T( "" ), true );
|
||||
}
|
||||
else
|
||||
{
|
||||
m_pXmlWriter->WriteNodeBegin( _T( "w:annotationRef" ), TRUE );
|
||||
m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_pXmlWriter->WriteNodeBegin( _T( "w:annotationRef" ), true );
|
||||
m_pXmlWriter->WriteNodeEnd( _T( "" ), true );
|
||||
}
|
||||
|
||||
_commentNr++;
|
||||
@ -976,12 +1003,12 @@ namespace DocFileFormat
|
||||
{
|
||||
std::wstring str = ( std::wstring( _T( "w:" ) ) + textType );
|
||||
|
||||
m_pXmlWriter->WriteNodeBegin( str.c_str(), TRUE );
|
||||
m_pXmlWriter->WriteNodeBegin( str.c_str(), true );
|
||||
if (preserve_space)
|
||||
{
|
||||
m_pXmlWriter->WriteAttribute( _T( "xml:space" ), _T( "preserve" ) );
|
||||
}
|
||||
m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
|
||||
m_pXmlWriter->WriteNodeEnd( _T( "" ), true, false );
|
||||
}
|
||||
|
||||
void DocumentMapping::writeTextEnd(const std::wstring& textType)
|
||||
|
||||
@ -70,68 +70,70 @@ namespace DocFileFormat
|
||||
public:
|
||||
DocumentMapping(ConversionContext* context, IMapping* caller);
|
||||
DocumentMapping(ConversionContext* context, XMLTools::CStringXmlWriter* writer, IMapping* caller);
|
||||
|
||||
virtual ~DocumentMapping();
|
||||
virtual void Apply( IVisitable* visited ) = 0;
|
||||
|
||||
//--------------------------------- 4571833.doc
|
||||
std::wstring m_shapeIdOwner;
|
||||
std::wstring getOLEObject() { return _lastOLEObject; }
|
||||
protected:
|
||||
|
||||
/// Looks into the section table to find out if this CP is the current of a section
|
||||
int getCurrentSection(int cp);
|
||||
/// Looks into the section table to find out if this CP is the end of a section
|
||||
bool isSectionEnd( int cp );
|
||||
/// Writes a Paragraph that starts at the given cp and
|
||||
/// ends at the next paragraph end mark or section end mark
|
||||
int getListNumCache (int fc, int fc_end);
|
||||
int getCurrentSection (int cp);
|
||||
//---------------------------------
|
||||
bool isSectionEnd ( int cp );
|
||||
// Writes a Paragraph that starts at the given cp and
|
||||
// ends at the next paragraph end mark or section end mark
|
||||
int writeParagraph( int cp );
|
||||
/// Writes a Paragraph that starts at the given cpStart and
|
||||
/// ends at the given cpEnd
|
||||
// Writes a Paragraph that starts at the given cpStart and
|
||||
// ends at the given cpEnd
|
||||
int writeParagraph( int initialCp, int cpEnd, bool sectionEnd, bool lastBad = false );
|
||||
/// Writes a Paragraph RSID
|
||||
// Writes a Paragraph RSID
|
||||
void writeParagraphRsid( const ParagraphPropertyExceptions* papx );
|
||||
/// Writes a run with the given characters and CHPX
|
||||
// Writes a run with the given characters and CHPX
|
||||
int writeRun( std::vector<wchar_t>* chars, CharacterPropertyExceptions* chpx, int initialCp );
|
||||
/// Writes the given text to the document
|
||||
// Writes the given text to the document
|
||||
int writeText ( std::vector<wchar_t>* chars, int initialCp, CharacterPropertyExceptions* chpx, bool writeDeletedText );
|
||||
void writeTextElement ( const std::wstring& text, const std::wstring& textType );
|
||||
void writeTextStart ( const std::wstring& textType, bool preserve_space);
|
||||
void writeTextEnd ( const std::wstring& textType );
|
||||
|
||||
int writeText( std::vector<wchar_t>* chars, int initialCp, CharacterPropertyExceptions* chpx, bool writeDeletedText );
|
||||
void writeTextElement( const std::wstring& text, const std::wstring& textType );
|
||||
void writeTextStart( const std::wstring& textType, bool preserve_space);
|
||||
void writeTextEnd( const std::wstring& textType );
|
||||
|
||||
/// Searches for bookmarks in the list of characters.
|
||||
// Searches for bookmarks in the list of characters.
|
||||
std::vector<int> searchBookmarks( std::vector<wchar_t>* chars, int initialCp );
|
||||
ParagraphPropertyExceptions* findValidPapx( int fc );
|
||||
/// Splits a list of characters into several lists
|
||||
// Splits a list of characters into several lists
|
||||
std::list<std::vector<wchar_t> >* splitCharList( std::vector<wchar_t>* chars, std::vector<int>* splitIndices );
|
||||
/// Writes the table starts at the given cp value
|
||||
int writeTable( int initialCp, unsigned int nestingLevel );
|
||||
/// Builds a list that contains the width of the several columns of the table.
|
||||
// Writes the table starts at the given cp value
|
||||
int writeTable ( int initialCp, unsigned int nestingLevel );
|
||||
// Builds a list that contains the width of the several columns of the table.
|
||||
std::vector<short>* buildTableGrid( int initialCp, unsigned int nestingLevel );
|
||||
/// Finds the FC of the next row end mark.
|
||||
int findRowEndFc( int initialCp, int& rowEndCp, unsigned int nestingLevel );
|
||||
/// Finds the FC of the next row end mark.
|
||||
int findRowEndFc( int initialCp, unsigned int nestingLevel );
|
||||
/// Writes the table row that starts at the given cp value and ends at the next row end mark
|
||||
int writeTableRow( int initialCp, std::vector<short>* grid, unsigned int nestingLevel );
|
||||
/// Writes the table cell that starts at the given cp value and ends at the next cell end mark
|
||||
int writeTableCell( int initialCp, TablePropertyExceptions* tapx, std::vector<short>* grid, int& gridIndex, int cellIndex, unsigned int nestingLevel );
|
||||
int findCellEndCp( int initialCp, unsigned int nestingLevel );
|
||||
bool writeBookmarks( int cp );
|
||||
bool writeBookmarkStart( short id );
|
||||
bool writeBookmarkEnd( short id );
|
||||
/// Checks if the CHPX is special
|
||||
// Finds the FC of the next row end mark.
|
||||
int findRowEndFc ( int initialCp, int& rowEndCp, unsigned int nestingLevel );
|
||||
// Finds the FC of the next row end mark.
|
||||
int findRowEndFc ( int initialCp, unsigned int nestingLevel );
|
||||
// Writes the table row that starts at the given cp value and ends at the next row end mark
|
||||
int writeTableRow ( int initialCp, std::vector<short>* grid, unsigned int nestingLevel );
|
||||
// Writes the table cell that starts at the given cp value and ends at the next cell end mark
|
||||
int writeTableCell ( int initialCp, TablePropertyExceptions* tapx, std::vector<short>* grid, int& gridIndex, int cellIndex, unsigned int nestingLevel );
|
||||
int findCellEndCp ( int initialCp, unsigned int nestingLevel );
|
||||
|
||||
bool writeBookmarks ( int cp );
|
||||
bool writeBookmarkStart ( short id );
|
||||
bool writeBookmarkEnd ( short id );
|
||||
// Checks if the CHPX is special
|
||||
bool isSpecial( CharacterPropertyExceptions* chpx );
|
||||
/// Finds the SEPX that is valid for the given CP.
|
||||
// Finds the SEPX that is valid for the given CP.
|
||||
SectionPropertyExceptions* findValidSepx( int cp );
|
||||
/// Searches the given vector for the next FieldEnd character.
|
||||
// Searches the given vector for the next FieldEnd character.
|
||||
int searchNextTextMark( std::vector<wchar_t>* chars, int initialCp, wchar_t mark );
|
||||
|
||||
private:
|
||||
Symbol getSymbol( const CharacterPropertyExceptions* chpx );
|
||||
Symbol getSymbol ( const CharacterPropertyExceptions* chpx );
|
||||
//----------------------------------------------------------------------------------------------------------------------
|
||||
bool m_bInternalXmlWriter;
|
||||
|
||||
protected:
|
||||
|
||||
WordDocument* m_document;
|
||||
ConversionContext* m_context;
|
||||
|
||||
IMapping* _caller;
|
||||
|
||||
ParagraphPropertyExceptions* _lastValidPapx;
|
||||
@ -149,5 +151,7 @@ namespace DocFileFormat
|
||||
bool _writeWebHidden;
|
||||
unsigned int _fldCharCounter;
|
||||
std::wstring _writeAfterRun;
|
||||
std::wstring _lastOLEObject;
|
||||
int _cacheListNum;
|
||||
};
|
||||
}
|
||||
|
||||
@ -43,7 +43,8 @@ namespace DocFileFormat
|
||||
|
||||
/*========================================================================================================*/
|
||||
|
||||
WordDocumentProperties::WordDocumentProperties(FileInformationBlock* fib, POLE::Stream* tableStream) : doptypography(NULL), dogrid(NULL), asumyi(NULL)
|
||||
WordDocumentProperties::WordDocumentProperties(FileInformationBlock* fib, POLE::Stream* tableStream) :
|
||||
doptypography(NULL), dogrid(NULL), asumyi(NULL), bDisplayBackgroundShape(false)
|
||||
{
|
||||
Initialize();
|
||||
|
||||
@ -226,7 +227,7 @@ namespace DocFileFormat
|
||||
dywDispPag = FormatUtils::BytesToInt16( bytes, 498, size );
|
||||
|
||||
//WORD 2000, 2002, 2003 PART
|
||||
if ( size > 500 )
|
||||
if ( size > 500/* && fib->m_FibNew.nFibNew > Fib1997*/)
|
||||
{
|
||||
ilvlLastBulletMain = bytes[500];
|
||||
ilvlLastNumberMain = bytes[501];
|
||||
@ -266,138 +267,158 @@ namespace DocFileFormat
|
||||
fDntULTrlSpc = FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 14 );
|
||||
fDntBlnSbDbWid = FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 15 );
|
||||
fSuppressTopSpacingMac5 = FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 16 );
|
||||
fTruncDxaExpand = FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 17 );
|
||||
fPrintBodyBeforeHdr = FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 18 );
|
||||
fNoLeading = FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 19 );
|
||||
fMakeSpaceForUL = FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 20 );
|
||||
fMWSmallCaps = FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 21 );
|
||||
f2ptExtLeadingOnly = FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 22 );
|
||||
fTruncFontHeight = FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 23 );
|
||||
fSubOnSize = FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 24 );
|
||||
fLineWrapLikeWord6 = FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 25 );
|
||||
fWW6BorderRules = FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 26 );
|
||||
fExactOnTop = FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 27 );
|
||||
fExtraAfter = FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 28 );
|
||||
fWPSpace = FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 29 );
|
||||
fWPJust = FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 30 );
|
||||
fPrintMet = FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 31 );
|
||||
fTruncDxaExpand = FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 17 );
|
||||
fPrintBodyBeforeHdr = FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 18 );
|
||||
fNoLeading = FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 19 );
|
||||
fMakeSpaceForUL = FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 20 );
|
||||
fMWSmallCaps = FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 21 );
|
||||
f2ptExtLeadingOnly = FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 22 );
|
||||
fTruncFontHeight = FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 23 );
|
||||
fSubOnSize = FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 24 );
|
||||
fLineWrapLikeWord6 = FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 25 );
|
||||
fWW6BorderRules = FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 26 );
|
||||
fExactOnTop = FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 27 );
|
||||
fExtraAfter = FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 28 );
|
||||
fWPSpace = FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 29 );
|
||||
fWPJust = FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 30 );
|
||||
fPrintMet = FormatUtils::GetBitFromBytes( ( bytes + 508 ), 4, 31 );
|
||||
|
||||
//split bytes 512,513,514,515 into bits
|
||||
fSpLayoutLikeWW8 = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 0 );
|
||||
fFtnLayoutLikeWW8 = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 1 );
|
||||
fDontUseHTMLParagraphAutoSpacing = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 2 );
|
||||
fDontAdjustLineHeightInTable = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 3 );
|
||||
fForgetLastTabAlign = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 4 );
|
||||
fUseAutoSpaceForFullWidthAlpha = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 5 );
|
||||
fAlignTablesRowByRow = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 6 );
|
||||
fLayoutRawTableWidth = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 7 );
|
||||
fLayoutTableRowsApart = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 8 );
|
||||
fUserWord97LineBreakingRules = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 9 );
|
||||
fDontBreakWrappedTables = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 10 );
|
||||
fDontSnapToGridInCell = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 11 );
|
||||
fDontAllowFieldEndSelect = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 12 );
|
||||
fApplyBreakingRules = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 13 );
|
||||
fDontWrapTextWithPunct = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 14 );
|
||||
fDontUseAsianBreakRules = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 15 );
|
||||
fUseWord2002TableStyleRules = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 16 );
|
||||
fGrowAutofit = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 17 );
|
||||
fUseNormalStyleForList = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 18 );
|
||||
fDontUseIndentAsNumberingTabStop = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 19 );
|
||||
fFELineBreak11 = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 20 );
|
||||
fAllowSpaceOfSameStyleInTable = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 21 );
|
||||
fWW11IndentRules = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 22 );
|
||||
fDontAutofitConstrainedTables = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 23 );
|
||||
fAutofitLikeWW11 = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 24 );
|
||||
fUnderlineTabInNumList = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 25 );
|
||||
fHangulWidthLikeWW11 = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 26 );
|
||||
fSplitPgBreakAndParaMark = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 27 );
|
||||
fDontVertAlignCellWithSp = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 28 );
|
||||
fDontBreakConstrainedForcedTables = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 29 );
|
||||
fDontVertAlignInTxbx = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 30 );
|
||||
fWord11KerningPairs = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 31 );
|
||||
fCachedColBalance = FormatUtils::GetBitFromBytes( ( bytes + 516 ), 4, 0 );
|
||||
//split bytes 512,513,514,515 into bits
|
||||
fSpLayoutLikeWW8 = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 0 );
|
||||
fFtnLayoutLikeWW8 = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 1 );
|
||||
fDontUseHTMLParagraphAutoSpacing = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 2 );
|
||||
fDontAdjustLineHeightInTable = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 3 );
|
||||
fForgetLastTabAlign = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 4 );
|
||||
fUseAutoSpaceForFullWidthAlpha = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 5 );
|
||||
fAlignTablesRowByRow = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 6 );
|
||||
fLayoutRawTableWidth = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 7 );
|
||||
fLayoutTableRowsApart = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 8 );
|
||||
fUserWord97LineBreakingRules = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 9 );
|
||||
fDontBreakWrappedTables = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 10 );
|
||||
fDontSnapToGridInCell = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 11 );
|
||||
fDontAllowFieldEndSelect = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 12 );
|
||||
fApplyBreakingRules = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 13 );
|
||||
fDontWrapTextWithPunct = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 14 );
|
||||
fDontUseAsianBreakRules = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 15 );
|
||||
fUseWord2002TableStyleRules = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 16 );
|
||||
fGrowAutofit = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 17 );
|
||||
fUseNormalStyleForList = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 18 );
|
||||
fDontUseIndentAsNumberingTabStop = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 19 );
|
||||
fFELineBreak11 = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 20 );
|
||||
fAllowSpaceOfSameStyleInTable = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 21 );
|
||||
fWW11IndentRules = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 22 );
|
||||
fDontAutofitConstrainedTables = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 23 );
|
||||
fAutofitLikeWW11 = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 24 );
|
||||
fUnderlineTabInNumList = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 25 );
|
||||
fHangulWidthLikeWW11 = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 26 );
|
||||
fSplitPgBreakAndParaMark = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 27 );
|
||||
fDontVertAlignCellWithSp = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 28 );
|
||||
fDontBreakConstrainedForcedTables = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 29 );
|
||||
fDontVertAlignInTxbx = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 30 );
|
||||
fWord11KerningPairs = FormatUtils::GetBitFromBytes( ( bytes + 512 ), 4, 31 );
|
||||
|
||||
fCachedColBalance = FormatUtils::GetBitFromBytes( ( bytes + 516 ), 4, 0 );
|
||||
|
||||
//bytes 517-539 are unused
|
||||
//bytes 517-539 are unused
|
||||
|
||||
verCompatPreW10 = (unsigned short)FormatUtils::GetUIntFromBytesBits( ( bytes + 540 ), 4, 0, 16 );
|
||||
fNoMargPgvwSaved = FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 16 );
|
||||
fNoMargPgvWPag = FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 17 );
|
||||
fWebViewPag = FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 18 );
|
||||
fSeeDrawingsPag = FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 19 );
|
||||
fBulletProofed = FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 20 );
|
||||
fCorrupted = FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 21 );
|
||||
fSaveUim = FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 22 );
|
||||
fFilterPrivacy = FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 23 );
|
||||
fInFReplaceNoRM = FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 24 );
|
||||
fSeenRepairs = FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 25 );
|
||||
fHasXML = FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 26 );
|
||||
fSeeScriptAnchorsPag = FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 27 );
|
||||
fValidateXML = FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 28 );
|
||||
fSaveIfInvalidXML = FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 29 );
|
||||
fShowXMLErrors = FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 30 );
|
||||
fAlwaysMergeEmptyNamespace = FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 31 );
|
||||
verCompatPreW10 = (unsigned short)FormatUtils::GetUIntFromBytesBits( ( bytes + 540 ), 4, 0, 16 );
|
||||
fNoMargPgvwSaved = FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 16 );
|
||||
fNoMargPgvWPag = FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 17 );
|
||||
fWebViewPag = FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 18 );
|
||||
fSeeDrawingsPag = FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 19 );
|
||||
fBulletProofed = FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 20 );
|
||||
fCorrupted = FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 21 );
|
||||
fSaveUim = FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 22 );
|
||||
fFilterPrivacy = FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 23 );
|
||||
fInFReplaceNoRM = FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 24 );
|
||||
fSeenRepairs = FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 25 );
|
||||
fHasXML = FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 26 );
|
||||
fSeeScriptAnchorsPag = FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 27 );
|
||||
fValidateXML = FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 28 );
|
||||
fSaveIfInvalidXML = FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 29 );
|
||||
fShowXMLErrors = FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 30 );
|
||||
fAlwaysMergeEmptyNamespace = FormatUtils::GetBitFromBytes( ( bytes + 540 ), 4, 31 );
|
||||
|
||||
if ( size > 544/* && fib->m_FibNew.nFibNew > Fib2000*/)
|
||||
{
|
||||
cpMaxListCacheMainDoc = FormatUtils::BytesToInt32( bytes, 544, size ); //unused
|
||||
|
||||
cpMaxListCacheMainDoc = FormatUtils::BytesToInt32( bytes, 544, size );
|
||||
//split bytes 548,549 into bits
|
||||
fDoNotEmbedSystemFont = FormatUtils::GetBitFromBytes( ( bytes + 548 ), 2, 0 );
|
||||
fWordCompact = FormatUtils::GetBitFromBytes( ( bytes + 548 ), 2, 1 );
|
||||
fLiveRecover = FormatUtils::GetBitFromBytes( ( bytes + 548 ), 2, 2 );
|
||||
fEmbedFactoids = FormatUtils::GetBitFromBytes( ( bytes + 548 ), 2, 3 );
|
||||
fFactoidXML = FormatUtils::GetBitFromBytes( ( bytes + 548 ), 2, 4 );
|
||||
fFactoidAllDone = FormatUtils::GetBitFromBytes( ( bytes + 548 ), 2, 5 );
|
||||
fFolioPrint = FormatUtils::GetBitFromBytes( ( bytes + 548 ), 2, 6 );
|
||||
fReverseFolio = FormatUtils::GetBitFromBytes( ( bytes + 548 ), 2, 7 );
|
||||
iTextLineEnding = (short)FormatUtils::GetUIntFromBytesBits( ( bytes + 548 ), 2, 8, 3 );
|
||||
fHideFcc = FormatUtils::GetBitFromBytes( ( bytes + 548 ), 2, 11 );
|
||||
fAcetateShowMarkup = FormatUtils::GetBitFromBytes( ( bytes + 548 ), 2, 12 );
|
||||
fAcetateShowAtn = FormatUtils::GetBitFromBytes( ( bytes + 548 ), 2, 13 );
|
||||
fAcetateShowInsDel = FormatUtils::GetBitFromBytes( ( bytes + 548 ), 2, 14 );
|
||||
fAcetateShowProps = FormatUtils::GetBitFromBytes( ( bytes + 548 ), 2, 15 );
|
||||
|
||||
//split bytes 548,549 into bits
|
||||
fDoNotEmbedSystemFont = FormatUtils::GetBitFromBytes( ( bytes + 548 ), 2, 0 );
|
||||
fWordCompact = FormatUtils::GetBitFromBytes( ( bytes + 548 ), 2, 1 );
|
||||
fLiveRecover = FormatUtils::GetBitFromBytes( ( bytes + 548 ), 2, 2 );
|
||||
fEmbedFactoids = FormatUtils::GetBitFromBytes( ( bytes + 548 ), 2, 3 );
|
||||
fFactoidXML = FormatUtils::GetBitFromBytes( ( bytes + 548 ), 2, 4 );
|
||||
fFactoidAllDone = FormatUtils::GetBitFromBytes( ( bytes + 548 ), 2, 5 );
|
||||
fFolioPrint = FormatUtils::GetBitFromBytes( ( bytes + 548 ), 2, 6 );
|
||||
fReverseFolio = FormatUtils::GetBitFromBytes( ( bytes + 548 ), 2, 7 );
|
||||
iTextLineEnding = (short)FormatUtils::GetUIntFromBytesBits( ( bytes + 548 ), 2, 8, 3 );
|
||||
fHideFcc = FormatUtils::GetBitFromBytes( ( bytes + 548 ), 2, 11 );
|
||||
fAcetateShowMarkup = FormatUtils::GetBitFromBytes( ( bytes + 548 ), 2, 12 );
|
||||
fAcetateShowAtn = FormatUtils::GetBitFromBytes( ( bytes + 548 ), 2, 13 );
|
||||
fAcetateShowInsDel = FormatUtils::GetBitFromBytes( ( bytes + 548 ), 2, 14 );
|
||||
fAcetateShowProps = FormatUtils::GetBitFromBytes( ( bytes + 548 ), 2, 15 );
|
||||
istdTableDflt = FormatUtils::BytesToUInt16( bytes, 550, size );
|
||||
verCompat = FormatUtils::BytesToUInt16( bytes, 552, size );
|
||||
grfFmtFilter = FormatUtils::BytesToUInt16( bytes, 554, size );
|
||||
iFolioPages = FormatUtils::BytesToInt16 ( bytes, 556, size );
|
||||
cpgText = FormatUtils::BytesToUInt16( bytes, 558, size );
|
||||
cpMinRMText = FormatUtils::BytesToInt32 ( bytes, 560, size );
|
||||
cpMinRMFtn = FormatUtils::BytesToInt32 ( bytes, 564, size );
|
||||
cpMinRMHdd = FormatUtils::BytesToInt32 ( bytes, 568, size );
|
||||
cpMinRMAtn = FormatUtils::BytesToInt32 ( bytes, 572, size );
|
||||
cpMinRMEdn = FormatUtils::BytesToInt32 ( bytes, 576, size );
|
||||
cpMinRMTxbx = FormatUtils::BytesToInt32 ( bytes, 580, size );
|
||||
cpMinRMHdrTxbx = FormatUtils::BytesToInt32 ( bytes, 584, size );
|
||||
rsidRoot = FormatUtils::BytesToInt32 ( bytes, 588, size );
|
||||
//unused 2
|
||||
|
||||
istdTableDflt = FormatUtils::BytesToUInt16( bytes, 550, size );
|
||||
verCompat = FormatUtils::BytesToUInt16( bytes, 552, size );
|
||||
grfFmtFilter = FormatUtils::BytesToUInt16( bytes, 554, size );
|
||||
iFolioPages = FormatUtils::BytesToInt16( bytes, 556, size );
|
||||
cpgText = FormatUtils::BytesToUInt16( bytes, 558, size );
|
||||
cpMinRMText = FormatUtils::BytesToInt32( bytes, 560, size );
|
||||
cpMinRMFtn = FormatUtils::BytesToInt32( bytes, 564, size );
|
||||
cpMinRMHdd = FormatUtils::BytesToInt32( bytes, 568, size );
|
||||
cpMinRMAtn = FormatUtils::BytesToInt32( bytes, 572, size );
|
||||
cpMinRMEdn = FormatUtils::BytesToInt32( bytes, 576, size );
|
||||
cpMinRMTxbx = FormatUtils::BytesToInt32( bytes, 580, size );
|
||||
cpMinRMHdrTxbx = FormatUtils::BytesToInt32( bytes, 584, size );
|
||||
rsidRoot = FormatUtils::BytesToInt32( bytes, 588, size );
|
||||
if ( size > 594/* && fib->m_FibNew.nFibNew > Fib2002*/)
|
||||
{
|
||||
//split bytes 592,593,594,595 into bits
|
||||
fTreatLockAtnAsReadOnly = FormatUtils::GetBitFromBytes( ( bytes + 592 ), 4, 0 );
|
||||
fStyleLock = FormatUtils::GetBitFromBytes( ( bytes + 592 ), 4, 1 );
|
||||
fAutoFmtOverride = FormatUtils::GetBitFromBytes( ( bytes + 592 ), 4, 2 );
|
||||
fRemoveWordML = FormatUtils::GetBitFromBytes( ( bytes + 592 ), 4, 3 );
|
||||
fApplyCustomXForm = FormatUtils::GetBitFromBytes( ( bytes + 592 ), 4, 4 );
|
||||
fStyeLockEnforced = FormatUtils::GetBitFromBytes( ( bytes + 592 ), 4, 5 );
|
||||
fFakeLockAtn = FormatUtils::GetBitFromBytes( ( bytes + 592 ), 4, 6 );
|
||||
fIgnoreMixedContent = FormatUtils::GetBitFromBytes( ( bytes + 592 ), 4, 7 );
|
||||
fShowPlaceholderText = FormatUtils::GetBitFromBytes( ( bytes + 592 ), 4, 8 );
|
||||
grf = FormatUtils::GetUIntFromBytesBits( ( bytes + 592 ), 4, 9, 23 );
|
||||
|
||||
if ( size == 610 )
|
||||
{
|
||||
//split bytes 592,593,594,595 into bits
|
||||
fTreatLockAtnAsReadOnly = FormatUtils::GetBitFromBytes( ( bytes + 592 ), 4, 0 );
|
||||
fStyleLock = FormatUtils::GetBitFromBytes( ( bytes + 592 ), 4, 1 );
|
||||
fAutoFmtOverride = FormatUtils::GetBitFromBytes( ( bytes + 592 ), 4, 2 );
|
||||
fRemoveWordML = FormatUtils::GetBitFromBytes( ( bytes + 592 ), 4, 3 );
|
||||
fApplyCustomXForm = FormatUtils::GetBitFromBytes( ( bytes + 592 ), 4, 4 );
|
||||
fStyeLockEnforced = FormatUtils::GetBitFromBytes( ( bytes + 592 ), 4, 5 );
|
||||
fFakeLockAtn = FormatUtils::GetBitFromBytes( ( bytes + 592 ), 4, 6 );
|
||||
fIgnoreMixedContent = FormatUtils::GetBitFromBytes( ( bytes + 592 ), 4, 7 );
|
||||
fShowPlaceholderText = FormatUtils::GetBitFromBytes( ( bytes + 592 ), 4, 8 );
|
||||
grf = FormatUtils::GetUIntFromBytesBits( ( bytes + 592 ), 4, 9, 23 );
|
||||
//split bytes 596 and 597 into bits
|
||||
fReadingModeInkLockDown = FormatUtils::GetBitFromBytes( ( bytes + 596 ), 2, 0 );
|
||||
fAcetateShowInkAtn = FormatUtils::GetBitFromBytes( ( bytes + 596 ), 2, 1 );
|
||||
fFilterDttm = FormatUtils::GetBitFromBytes( ( bytes + 596 ), 2, 2 );
|
||||
fEnforceDocProt = FormatUtils::GetBitFromBytes( ( bytes + 596 ), 2, 3 );
|
||||
iDocProtCur = (unsigned short)FormatUtils::GetUIntFromBytesBits( ( bytes + 596 ), 2, 4, 3 );
|
||||
fDispBkSpSaved = FormatUtils::GetBitFromBytes( ( bytes + 596 ), 2, 7 );
|
||||
|
||||
//split bytes 596 and 597 into bits
|
||||
fReadingModeInkLockDown = FormatUtils::GetBitFromBytes( ( bytes + 596 ), 2, 0 );
|
||||
fAcetateShowInkAtn = FormatUtils::GetBitFromBytes( ( bytes + 596 ), 2, 1 );
|
||||
fFilterDttm = FormatUtils::GetBitFromBytes( ( bytes + 596 ), 2, 2 );
|
||||
fEnforceDocProt = FormatUtils::GetBitFromBytes( ( bytes + 596 ), 2, 3 );
|
||||
iDocProtCur = (unsigned short)FormatUtils::GetUIntFromBytesBits( ( bytes + 596 ), 2, 4, 3 );
|
||||
fDispBkSpSaved = FormatUtils::GetBitFromBytes( ( bytes + 596 ), 2, 7 );
|
||||
|
||||
dxaPageLock = FormatUtils::BytesToInt16( bytes, 598, size );
|
||||
dyaPageLock = FormatUtils::BytesToInt16( bytes, 600, size );
|
||||
pctFontLock = FormatUtils::BytesToInt32( bytes, 602, size );
|
||||
grfitbid = bytes[606];
|
||||
//unsigned char 607 is unused
|
||||
ilfoMacAtCleanup = FormatUtils::BytesToUInt16( bytes, 608, size );
|
||||
}
|
||||
dxaPageLock = FormatUtils::BytesToInt16( bytes, 598, size );
|
||||
dyaPageLock = FormatUtils::BytesToInt16( bytes, 600, size );
|
||||
pctFontLock = FormatUtils::BytesToInt32( bytes, 602, size );
|
||||
grfitbid = bytes[606];
|
||||
//unsigned char 607 is unused
|
||||
ilfoMacAtCleanup = FormatUtils::BytesToUInt16( bytes, 608, size );
|
||||
|
||||
if ( size > 616/* && fib->m_FibNew.nFibNew > Fib2003*/)
|
||||
{
|
||||
//4 bytes reserved
|
||||
bool fRMTrackFormatting = FormatUtils::GetBitFromBytes( ( bytes + 620 ), 2, 0 );
|
||||
bool fRMTrackMoves = FormatUtils::GetBitFromBytes( ( bytes + 620 ), 2, 1 );
|
||||
//dopMth = 34 bytes from 624 = 658
|
||||
|
||||
if ( size > 674/* && fib->m_FibNew.nFibNew > Fib2007*/)
|
||||
{
|
||||
if ( size > 690/* && fib->m_FibNew.nFibNew > Fib2010*/)
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -54,6 +54,7 @@ namespace DocFileFormat
|
||||
|
||||
friend class SettingsMapping;
|
||||
|
||||
bool bDisplayBackgroundShape;
|
||||
private:
|
||||
// True when facing pages should be printed
|
||||
bool fFacingPages;
|
||||
|
||||
@ -49,39 +49,46 @@ namespace DocFileFormat
|
||||
unsigned char fNested:1;
|
||||
unsigned char fHasSep:1;
|
||||
};
|
||||
|
||||
public:
|
||||
static const int STRUCTURE_SIZE = 2;
|
||||
|
||||
FieldCharacter():
|
||||
fldch(0), grffld(0)
|
||||
{
|
||||
}
|
||||
|
||||
virtual ~FieldCharacter()
|
||||
{
|
||||
}
|
||||
FieldCharacter() : fldch(0), grffld(0) {}
|
||||
virtual ~FieldCharacter() {}
|
||||
|
||||
virtual ByteStructure* ConstructObject (VirtualStreamReader* pReader, int length)
|
||||
{
|
||||
FieldCharacter* pFldChar = new FieldCharacter();
|
||||
FieldCharacter* pFldChar = new FieldCharacter();
|
||||
if (pFldChar)
|
||||
{
|
||||
pFldChar->fldch = pReader->ReadByte();
|
||||
pFldChar->grffld = pReader->ReadByte();
|
||||
|
||||
#ifdef _DEBUG
|
||||
grffldEnd* __grffldEnd = (grffldEnd*)(&pFldChar->grffld);
|
||||
int dbg = 0;
|
||||
#endif
|
||||
pFldChar->fldch = pReader->ReadByte();
|
||||
pFldChar->grffld = pReader->ReadByte();
|
||||
}
|
||||
|
||||
return static_cast<ByteStructure*>(pFldChar);
|
||||
}
|
||||
|
||||
private:
|
||||
|
||||
unsigned char fldch;
|
||||
unsigned char grffld;
|
||||
};
|
||||
|
||||
class ListNumCache: public ByteStructure
|
||||
{
|
||||
public:
|
||||
static const int STRUCTURE_SIZE = 4;
|
||||
|
||||
ListNumCache() : value(-1) {}
|
||||
virtual ~ListNumCache() {}
|
||||
|
||||
virtual ByteStructure* ConstructObject (VirtualStreamReader* pReader, int length)
|
||||
{
|
||||
ListNumCache* pList = new ListNumCache();
|
||||
if (pList)
|
||||
{
|
||||
pList->value = pReader->ReadInt32();
|
||||
}
|
||||
|
||||
return static_cast<ByteStructure*>(pList);
|
||||
}
|
||||
|
||||
int value;
|
||||
};
|
||||
}
|
||||
@ -1162,6 +1162,8 @@ namespace DocFileFormat
|
||||
{
|
||||
//Read the FibRgCswNew
|
||||
m_FibNew.nFibNew = (FibVersion)reader.ReadUInt16();
|
||||
|
||||
if (m_FibNew.nFibNew == 0) m_FibNew.nFibNew = Fib1997;
|
||||
m_FibNew.cQuickSavesNew = reader.ReadUInt16();
|
||||
}
|
||||
}
|
||||
|
||||
@ -53,33 +53,47 @@ namespace DocFileFormat
|
||||
m_context->_docx->RegisterDocument();
|
||||
|
||||
// Header
|
||||
m_pXmlWriter->WriteNodeBegin(_T("?xml version=\"1.0\" encoding=\"UTF-8\"?"));
|
||||
m_pXmlWriter->WriteNodeBegin(_T("w:document"), TRUE );
|
||||
m_pXmlWriter->WriteNodeBegin(L"?xml version=\"1.0\" encoding=\"UTF-8\"?");
|
||||
m_pXmlWriter->WriteNodeBegin(L"w:document", TRUE );
|
||||
|
||||
// Namespaces
|
||||
m_pXmlWriter->WriteAttribute(_T("xmlns:w"), OpenXmlNamespaces::WordprocessingML );
|
||||
m_pXmlWriter->WriteAttribute(_T("xmlns:v"), OpenXmlNamespaces::VectorML );
|
||||
m_pXmlWriter->WriteAttribute(_T("xmlns:o"), OpenXmlNamespaces::Office );
|
||||
m_pXmlWriter->WriteAttribute(_T("xmlns:w10"), OpenXmlNamespaces::OfficeWord );
|
||||
m_pXmlWriter->WriteAttribute(_T("xmlns:r"), OpenXmlNamespaces::Relationships );
|
||||
m_pXmlWriter->WriteAttribute(_T("xmlns:m"), _T("http://schemas.openxmlformats.org/officeDocument/2006/math"));
|
||||
m_pXmlWriter->WriteAttribute(L"xmlns:w", OpenXmlNamespaces::WordprocessingML );
|
||||
m_pXmlWriter->WriteAttribute(L"xmlns:v", OpenXmlNamespaces::VectorML );
|
||||
m_pXmlWriter->WriteAttribute(L"xmlns:o", OpenXmlNamespaces::Office );
|
||||
m_pXmlWriter->WriteAttribute(L"xmlns:w10", OpenXmlNamespaces::OfficeWord );
|
||||
m_pXmlWriter->WriteAttribute(L"xmlns:r", OpenXmlNamespaces::Relationships );
|
||||
m_pXmlWriter->WriteAttribute(L"xmlns:m", L"http://schemas.openxmlformats.org/officeDocument/2006/math");
|
||||
|
||||
//m_pXmlWriter->WriteAttribute(_T("xmlns:wpc"), _T("http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas"));
|
||||
//m_pXmlWriter->WriteAttribute(_T("xmlns:mc"), _T("http://schemas.openxmlformats.org/markup-compatibility/2006"));
|
||||
//m_pXmlWriter->WriteAttribute(_T("xmlns:wp14"),_T("http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing"));
|
||||
//m_pXmlWriter->WriteAttribute(_T("xmlns:wp"), _T("http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing"));
|
||||
//m_pXmlWriter->WriteAttribute(_T("xmlns:w14"), _T("http://schemas.microsoft.com/office/word/2010/wordml"));
|
||||
//m_pXmlWriter->WriteAttribute(_T("xmlns:wpg"), _T("http://schemas.microsoft.com/office/word/2010/wordprocessingGroup"));
|
||||
//m_pXmlWriter->WriteAttribute(_T("xmlns:wpi"), _T("http://schemas.microsoft.com/office/word/2010/wordprocessingInk"));
|
||||
//m_pXmlWriter->WriteAttribute(_T("xmlns:wne"), _T("http://schemas.microsoft.com/office/word/2006/wordml"));
|
||||
//m_pXmlWriter->WriteAttribute(_T("xmlns:wps"), _T("http://schemas.microsoft.com/office/word/2010/wordprocessingShape"));
|
||||
//m_pXmlWriter->WriteAttribute(_T("mc:Ignorable"), _T("w14 wp14"));
|
||||
//m_pXmlWriter->WriteAttribute(L"xmlns:wpc", L"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas");
|
||||
//m_pXmlWriter->WriteAttribute(L"xmlns:mc", L"http://schemas.openxmlformats.org/markup-compatibility/2006");
|
||||
//m_pXmlWriter->WriteAttribute(L"xmlns:wp14", L"http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing");
|
||||
//m_pXmlWriter->WriteAttribute(L"xmlns:wp", L"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing");
|
||||
//m_pXmlWriter->WriteAttribute(L"xmlns:w14", L"http://schemas.microsoft.com/office/word/2010/wordml");
|
||||
//m_pXmlWriter->WriteAttribute(L"xmlns:wpg", L"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup");
|
||||
//m_pXmlWriter->WriteAttribute(L"xmlns:wpi", L"http://schemas.microsoft.com/office/word/2010/wordprocessingInk");
|
||||
//m_pXmlWriter->WriteAttribute(L"xmlns:wne", L"http://schemas.microsoft.com/office/word/2006/wordml");
|
||||
//m_pXmlWriter->WriteAttribute(L"xmlns:wps", L"http://schemas.microsoft.com/office/word/2010/wordprocessingShape");
|
||||
//m_pXmlWriter->WriteAttribute(L"mc:Ignorable", L"w14 wp14");
|
||||
|
||||
m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
|
||||
m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
|
||||
|
||||
m_pXmlWriter->WriteNodeBegin( _T("w:body"), FALSE );
|
||||
if ((m_document->GetOfficeArt()) && (m_document->GetOfficeArt()->GetShapeBackgound()))
|
||||
{
|
||||
m_document->DocProperties->bDisplayBackgroundShape = true;
|
||||
ShapeContainer* pShape = m_document->GetOfficeArt()->GetShapeBackgound();
|
||||
|
||||
// Convert the document
|
||||
m_pXmlWriter->WriteNodeBegin ( L"w:background", TRUE);
|
||||
m_pXmlWriter->WriteAttribute ( L"w:color", L"FFFFFF");
|
||||
m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
|
||||
|
||||
VMLShapeMapping oVmlWriter (m_context, m_pXmlWriter, NULL, NULL, _caller);
|
||||
pShape->Convert(&oVmlWriter);
|
||||
m_pXmlWriter->WriteNodeEnd (L"w:background");
|
||||
}
|
||||
|
||||
m_pXmlWriter->WriteNodeBegin( L"w:body", FALSE );
|
||||
|
||||
// Convert the document
|
||||
_lastValidPapx = NULL;
|
||||
if (m_document->AllPapxFkps->empty() == false)
|
||||
{
|
||||
@ -175,8 +189,8 @@ namespace DocFileFormat
|
||||
}
|
||||
}
|
||||
|
||||
m_pXmlWriter->WriteNodeEnd( _T( "w:body" ) );
|
||||
m_pXmlWriter->WriteNodeEnd( _T( "w:document" ) );
|
||||
m_pXmlWriter->WriteNodeEnd( L"w:body" );
|
||||
m_pXmlWriter->WriteNodeEnd( L"w:document" );
|
||||
|
||||
m_context->_docx->DocumentXML = std::wstring(m_pXmlWriter->GetXmlString());
|
||||
}
|
||||
|
||||
@ -34,6 +34,7 @@
|
||||
#include "OfficeDrawing/RecordFactory.h"
|
||||
|
||||
#include "OfficeDrawing/DrawingContainer.h"
|
||||
#include "OfficeDrawing/DrawingRecord.h"
|
||||
#include "OfficeDrawing/DrawingGroup.h"
|
||||
#include "OfficeDrawing/GroupContainer.h"
|
||||
#include "OfficeDrawing/Shape.h"
|
||||
@ -57,7 +58,7 @@ namespace DocFileFormat
|
||||
|
||||
public:
|
||||
|
||||
OfficeArtContent (const FileInformationBlock* pFIB, POLE::Stream* pStream): m_pDrawingGroupData(NULL)
|
||||
OfficeArtContent (const FileInformationBlock* pFIB, POLE::Stream* pStream): m_pDrawingGroupData(NULL), m_pBackgroud(NULL)
|
||||
{
|
||||
VirtualStreamReader oStearmReader(pStream, 0 , pFIB->m_bOlderVersion);
|
||||
|
||||
@ -87,15 +88,23 @@ namespace DocFileFormat
|
||||
{
|
||||
// the child is a subgroup
|
||||
GroupContainer* group = static_cast<GroupContainer*>(groupChild);
|
||||
group->Index = i;
|
||||
drawing.container->Children[i] = group;
|
||||
if (group)
|
||||
{
|
||||
group->Index = i;
|
||||
}
|
||||
}
|
||||
else if (ShapeContainer::TYPE_CODE_0xF004 == groupChild->TypeCode)
|
||||
{
|
||||
// the child is a shape
|
||||
ShapeContainer* shape = static_cast<ShapeContainer*>(groupChild);
|
||||
shape->Index = i;
|
||||
drawing.container->Children[i] = shape;
|
||||
if (shape)
|
||||
{
|
||||
shape->Index = i;
|
||||
if (shape->isBackground())
|
||||
{
|
||||
m_pBackgroud = shape;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -112,7 +121,10 @@ namespace DocFileFormat
|
||||
for ( std::list<OfficeArtWordDrawing>::iterator iter = m_arrDrawings.begin(); iter != m_arrDrawings.end(); ++iter)
|
||||
RELEASEOBJECT(iter->container);
|
||||
}
|
||||
|
||||
inline ShapeContainer* GetShapeBackgound()
|
||||
{
|
||||
return m_pBackgroud;
|
||||
}
|
||||
inline ShapeContainer* GetShapeContainer (int spid)
|
||||
{
|
||||
ShapeContainer* ret = NULL;
|
||||
@ -138,7 +150,6 @@ namespace DocFileFormat
|
||||
if (shape->GetShapeID() == spid)
|
||||
{
|
||||
ret = container;
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
@ -150,7 +161,7 @@ namespace DocFileFormat
|
||||
|
||||
if (shape->GetShapeID() == spid)
|
||||
{
|
||||
ret = container;
|
||||
ret = container;
|
||||
break;
|
||||
}
|
||||
}
|
||||
@ -174,7 +185,7 @@ namespace DocFileFormat
|
||||
}
|
||||
|
||||
private:
|
||||
|
||||
ShapeContainer* m_pBackgroud;
|
||||
DrawingGroup* m_pDrawingGroupData;
|
||||
std::list<OfficeArtWordDrawing> m_arrDrawings;
|
||||
};
|
||||
|
||||
@ -39,11 +39,9 @@ namespace DocFileFormat
|
||||
{
|
||||
public:
|
||||
static const unsigned short TYPE_CODE_0xF008 = 0xF008;
|
||||
|
||||
/// The number of shapes in this drawing
|
||||
unsigned int csp;
|
||||
/// The last MSOSPID given to an SP in this DG
|
||||
int spidCur;
|
||||
|
||||
unsigned int csp; // The number of shapes in this drawing
|
||||
int spidCur; // The last MSOSPID given to an SP in this DG
|
||||
|
||||
DrawingRecord():
|
||||
Record(), csp(0), spidCur(0)
|
||||
@ -53,8 +51,8 @@ namespace DocFileFormat
|
||||
DrawingRecord( IBinaryReader* _reader, unsigned int size, unsigned int typeCode, unsigned int version, unsigned int instance ):
|
||||
Record( _reader, size, typeCode, version, instance )
|
||||
{
|
||||
this->csp = this->Reader->ReadUInt32();
|
||||
this->spidCur = this->Reader->ReadInt32();
|
||||
csp = Reader->ReadUInt32();
|
||||
spidCur = Reader->ReadInt32();
|
||||
}
|
||||
|
||||
virtual ~DrawingRecord()
|
||||
|
||||
@ -93,29 +93,23 @@ namespace DocFileFormat
|
||||
{
|
||||
case ShapeContainer::TYPE_CODE_0xF004:
|
||||
return new ShapeContainer();
|
||||
break;
|
||||
|
||||
case Shape::TYPE_CODE_0xF00A:
|
||||
return new Shape();
|
||||
break;
|
||||
|
||||
case ShapeOptions::TYPE_CODE_0xF00B:
|
||||
case ShapeOptions::TYPE_CODE_0xF121:
|
||||
case ShapeOptions::TYPE_CODE_0xF122:
|
||||
return new ShapeOptions();
|
||||
break;
|
||||
|
||||
case ClientAnchor::TYPE_CODE_0xF010:
|
||||
return new ClientAnchor();
|
||||
break;
|
||||
|
||||
case ChildAnchor::TYPE_CODE_0xF00F:
|
||||
return new ChildAnchor();
|
||||
break;
|
||||
|
||||
case BlipStoreEntry::TYPE_CODE_0xF007:
|
||||
return new BlipStoreEntry();
|
||||
break;
|
||||
|
||||
case BitmapBlip::TYPE_CODE_0xF01D: //OfficeArtBlipJPEG
|
||||
case BitmapBlip::TYPE_CODE_0xF01E: //OfficeArtBlipPNG
|
||||
@ -125,25 +119,25 @@ namespace DocFileFormat
|
||||
case BitmapBlip::TYPE_CODE_0xF029: //OfficeArtBlipTIFF
|
||||
case BitmapBlip::TYPE_CODE_0xF02A: //OfficeArtBlipJPEG
|
||||
return new BitmapBlip();
|
||||
break;
|
||||
|
||||
case MetafilePictBlip::TYPE_CODE_0xF01A: //OfficeArtBlipEMF
|
||||
case MetafilePictBlip::TYPE_CODE_0xF01B: //OfficeArtBlipWMF
|
||||
case MetafilePictBlip::TYPE_CODE_0xF01C : //OfficeArtBlipPICT
|
||||
return new MetafilePictBlip(); break;
|
||||
return new MetafilePictBlip();
|
||||
|
||||
case DrawingGroup::TYPE_CODE_0xF000 : return new DrawingGroup(); break;
|
||||
case DrawingGroupRecord::TYPE_CODE_0xF006 : return new DrawingGroupRecord(); break;
|
||||
case BlipStoreContainer::TYPE_CODE_0xF001 : return new BlipStoreContainer(); break;
|
||||
case SplitMenuColorContainer::TYPE_CODE_0xF11E : return new SplitMenuColorContainer(); break;
|
||||
case ClientData::TYPE_CODE_0xF011 : return new ClientData(); break;
|
||||
case DrawingContainer::TYPE_CODE_0xF002 : return new DrawingContainer(); break;
|
||||
case DrawingRecord::TYPE_CODE_0xF008 : return new DrawingRecord(); break;
|
||||
case GroupContainer::TYPE_CODE_0xF003 : return new GroupContainer(); break;
|
||||
case GroupShapeRecord::TYPE_CODE_0xF009 : return new GroupShapeRecord (); break;
|
||||
case OfficeArtClientTextbox::TYPE_CODE_0xF00D : return new OfficeArtClientTextbox (); break;
|
||||
case DrawingGroup::TYPE_CODE_0xF000 : return new DrawingGroup();
|
||||
case DrawingGroupRecord::TYPE_CODE_0xF006 : return new DrawingGroupRecord();
|
||||
case BlipStoreContainer::TYPE_CODE_0xF001 : return new BlipStoreContainer();
|
||||
case SplitMenuColorContainer::TYPE_CODE_0xF11E : return new SplitMenuColorContainer();
|
||||
case ClientData::TYPE_CODE_0xF011 : return new ClientData();
|
||||
case DrawingContainer::TYPE_CODE_0xF002 : return new DrawingContainer();
|
||||
case DrawingRecord::TYPE_CODE_0xF008 : return new DrawingRecord();
|
||||
case GroupContainer::TYPE_CODE_0xF003 : return new GroupContainer();
|
||||
case GroupShapeRecord::TYPE_CODE_0xF009 : return new GroupShapeRecord ();
|
||||
case OfficeArtClientTextbox::TYPE_CODE_0xF00D : return new OfficeArtClientTextbox ();
|
||||
|
||||
default: return new UnknownRecord(); break;
|
||||
default:
|
||||
return new UnknownRecord();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -39,33 +39,20 @@ namespace DocFileFormat
|
||||
class Shape: public Record
|
||||
{
|
||||
public:
|
||||
int spid;
|
||||
/// This shape is a group shape
|
||||
bool fGroup;
|
||||
/// Not a top-level shape
|
||||
bool fChild;
|
||||
/// This is the topmost group shape.
|
||||
/// Exactly one of these per drawing.
|
||||
bool fPatriarch;
|
||||
/// The shape has been deleted
|
||||
bool fDeleted;
|
||||
/// The shape is an OLE object
|
||||
bool fOleShape;
|
||||
/// Shape has a hspMaster property
|
||||
bool fHaveMaster;
|
||||
/// Shape is flipped horizontally
|
||||
bool fFlipH;
|
||||
/// Shape is flipped vertically
|
||||
bool fFlipV;
|
||||
/// Connector type of shape
|
||||
bool fConnector;
|
||||
/// Shape has an anchor of some kind
|
||||
bool fHaveAnchor;
|
||||
/// Background shape
|
||||
bool fBackground;
|
||||
/// Shape has a shape type property
|
||||
bool fHaveSpt;
|
||||
/// The shape type of the shape
|
||||
int spid;
|
||||
bool fGroup;
|
||||
bool fChild;
|
||||
bool fPatriarch; // This is the topmost group shape. Exactly one of these per drawing.
|
||||
bool fDeleted; // The shape has been deleted
|
||||
bool fOleShape; // The shape is an OLE object
|
||||
bool fHaveMaster;
|
||||
bool fFlipH;
|
||||
bool fFlipV;
|
||||
bool fConnector;
|
||||
bool fHaveAnchor;
|
||||
bool fBackground;
|
||||
bool fHaveSpt;
|
||||
|
||||
ShapeType* shapeType;
|
||||
|
||||
public:
|
||||
@ -80,7 +67,7 @@ namespace DocFileFormat
|
||||
|
||||
virtual ~Shape()
|
||||
{
|
||||
RELEASEOBJECT( this->shapeType );
|
||||
RELEASEOBJECT( shapeType );
|
||||
}
|
||||
|
||||
Shape( IBinaryReader* _reader, unsigned int size, unsigned int typeCode, unsigned int version, unsigned int instance ):
|
||||
@ -120,12 +107,12 @@ namespace DocFileFormat
|
||||
|
||||
inline int GetShapeID() const
|
||||
{
|
||||
return this->spid;
|
||||
return spid;
|
||||
}
|
||||
|
||||
inline ShapeType* GetShapeType() const
|
||||
{
|
||||
return this->shapeType;
|
||||
return shapeType;
|
||||
}
|
||||
|
||||
template<class T> bool is() const
|
||||
|
||||
@ -69,7 +69,34 @@ namespace DocFileFormat
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
bool isBackground()
|
||||
{
|
||||
int ret = 0;
|
||||
|
||||
for ( std::vector<Record*>::const_iterator iter = this->Children.begin(); iter != this->Children.end(); iter++ )
|
||||
{
|
||||
Shape* sh = dynamic_cast<Shape*>( *iter );
|
||||
if (sh)
|
||||
{
|
||||
return sh->fBackground;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
bool isOLE()
|
||||
{
|
||||
int ret = 0;
|
||||
|
||||
for ( std::vector<Record*>::const_iterator iter = this->Children.begin(); iter != this->Children.end(); iter++ )
|
||||
{
|
||||
Shape* sh = dynamic_cast<Shape*>( *iter );
|
||||
if (sh)
|
||||
{
|
||||
return sh->fOleShape;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
virtual ~ShapeContainer()
|
||||
{
|
||||
}
|
||||
@ -79,7 +106,6 @@ namespace DocFileFormat
|
||||
return new ShapeContainer( _reader, bodySize, typeCode, version, instance );
|
||||
}
|
||||
|
||||
/// Searches all OptionEntry in the ShapeContainer and puts them into a list.
|
||||
std::list<OptionEntry> ExtractOptions() const
|
||||
{
|
||||
std::list<OptionEntry> ret;
|
||||
|
||||
303
ASCOfficeDocFile/DocDocxConverter/OleObject.cpp
Normal file
303
ASCOfficeDocFile/DocDocxConverter/OleObject.cpp
Normal file
@ -0,0 +1,303 @@
|
||||
/*
|
||||
* (c) Copyright Ascensio System SIA 2010-2016
|
||||
*
|
||||
* This program is a free software product. You can redistribute it and/or
|
||||
* modify it under the terms of the GNU Affero General Public License (AGPL)
|
||||
* version 3 as published by the Free Software Foundation. In accordance with
|
||||
* Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
|
||||
* that Ascensio System SIA expressly excludes the warranty of non-infringement
|
||||
* of any third-party rights.
|
||||
*
|
||||
* This program is distributed WITHOUT ANY WARRANTY; without even the implied
|
||||
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For
|
||||
* details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
|
||||
*
|
||||
* You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
|
||||
* EU, LV-1021.
|
||||
*
|
||||
* The interactive user interfaces in modified source and object code versions
|
||||
* of the Program must display Appropriate Legal Notices, as required under
|
||||
* Section 5 of the GNU AGPL version 3.
|
||||
*
|
||||
* Pursuant to Section 7(b) of the License you must retain the original Product
|
||||
* logo when distributing the program. Pursuant to Section 7(e) we decline to
|
||||
* grant you any rights under trademark law for use of our trademarks.
|
||||
*
|
||||
* All the Product's GUI elements, including illustrations and icon sets, as
|
||||
* well as technical writing content are licensed under the terms of the
|
||||
* Creative Commons Attribution-ShareAlike 4.0 International. See the License
|
||||
* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
|
||||
*
|
||||
*/
|
||||
#pragma once
|
||||
|
||||
#include "OleObject.h"
|
||||
|
||||
namespace DocFileFormat
|
||||
{
|
||||
OleObject::OleObject( const CharacterPropertyExceptions* chpx, StructuredStorageReader* docStorage, bool bOlderVersion_ )
|
||||
: bLinked(false), updateMode(NoLink), bOlderVersion(bOlderVersion_), isEquation(false), isEmbedded (false)
|
||||
{
|
||||
if (!docStorage) return;
|
||||
if (!chpx) return;
|
||||
|
||||
oleStorage = docStorage->GetStorage();
|
||||
if (!oleStorage) return;
|
||||
|
||||
HRESULT res = S_OK;
|
||||
|
||||
POLE::Stream* ObjectPoolStorage = new POLE::Stream(oleStorage, "ObjectPool");
|
||||
|
||||
if (ObjectPoolStorage)
|
||||
{
|
||||
ObjectId = getOleEntryName( chpx );
|
||||
|
||||
std::string sObjectId( ObjectId.begin(), ObjectId.end() );
|
||||
{
|
||||
std::string name = "ObjectPool/" + sObjectId + "/";
|
||||
processOleStream( name + "Ole" );
|
||||
|
||||
if ( bLinked )
|
||||
{
|
||||
processLinkInfoStream( name + "LinkInfo" );
|
||||
}
|
||||
else
|
||||
{
|
||||
processCompObjStream( name + "CompObj" );
|
||||
}
|
||||
|
||||
processPICStream( name + "PIC" );
|
||||
|
||||
processEquationNativeStream( name + "Equation Native" );
|
||||
}
|
||||
delete ObjectPoolStorage;
|
||||
}
|
||||
}
|
||||
|
||||
void OleObject::processLinkInfoStream( const std::string& linkStream )
|
||||
{
|
||||
try
|
||||
{
|
||||
POLE::Stream* pLinkStream = NULL;
|
||||
HRESULT res = S_OK;
|
||||
|
||||
pLinkStream = //oleStorage->stream(linkStream);
|
||||
new POLE::Stream(oleStorage, linkStream);
|
||||
|
||||
if ( pLinkStream )
|
||||
{
|
||||
VirtualStreamReader reader( pLinkStream, 0, false);
|
||||
|
||||
//there are two versions of the Link string, one contains ANSI characters, the other contains
|
||||
//unicode characters.
|
||||
//Both strings seem not to be standardized:
|
||||
//The length prefix is a character count EXCLUDING the terminating zero
|
||||
|
||||
//Read the ANSI version
|
||||
short cch = reader.ReadInt16();
|
||||
unsigned char* str = reader.ReadBytes( cch, true );
|
||||
FormatUtils::GetSTLCollectionFromBytes<std::wstring>( &this->Link, str, cch, ENCODING_WINDOWS_1250 );
|
||||
RELEASEARRAYOBJECTS( str );
|
||||
|
||||
//skip the terminating zero of the ANSI string
|
||||
//even if the characters are ANSI chars, the terminating zero has 2 bytes
|
||||
reader.ReadBytes( 2, false );
|
||||
|
||||
//skip the next 4 bytes (flags?)
|
||||
reader.ReadBytes( 4, false );
|
||||
|
||||
//Read the Unicode version
|
||||
this->Link.clear();
|
||||
|
||||
cch = reader.ReadInt16();
|
||||
str = reader.ReadBytes( ( cch * 2 ), true );
|
||||
FormatUtils::GetSTLCollectionFromBytes<std::wstring>( &this->Link, str, ( cch * 2 ), ENCODING_UTF16 );
|
||||
RELEASEARRAYOBJECTS( str );
|
||||
|
||||
//skip the terminating zero of the Unicode string
|
||||
reader.ReadBytes( 2, false );
|
||||
|
||||
delete pLinkStream;
|
||||
}
|
||||
}
|
||||
catch (...)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
void OleObject::processEquationNativeStream( const std::string& eqStream )
|
||||
{
|
||||
try
|
||||
{
|
||||
POLE::Stream* pCompStream = NULL;
|
||||
HRESULT res = S_OK;
|
||||
|
||||
pCompStream = new POLE::Stream(oleStorage, eqStream);
|
||||
|
||||
if ( pCompStream )
|
||||
{
|
||||
VirtualStreamReader reader( pCompStream, 0, false);
|
||||
|
||||
int sz = reader.GetSize();
|
||||
|
||||
unsigned char *Buffer = reader.ReadBytes( sz, true );
|
||||
|
||||
if (Buffer && sz > 0)
|
||||
{
|
||||
isEquation = true;
|
||||
delete []Buffer;
|
||||
}
|
||||
|
||||
delete pCompStream;
|
||||
}
|
||||
}
|
||||
catch (...)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
void OleObject::processPICStream( const std::string& picStream )
|
||||
{
|
||||
try
|
||||
{
|
||||
HRESULT res = S_OK;
|
||||
|
||||
POLE::Stream* pPICStream = new POLE::Stream(oleStorage, picStream);
|
||||
|
||||
if ( pPICStream )
|
||||
{
|
||||
VirtualStreamReader reader( pPICStream, 0, false);
|
||||
|
||||
int sz = reader.GetSize();
|
||||
|
||||
int cbHeader = reader.ReadUInt32();
|
||||
|
||||
reader.ReadBytes(4, false);
|
||||
|
||||
int x = reader.ReadUInt32();
|
||||
int y = reader.ReadUInt32();
|
||||
pictureDesciptor.dyaGoal = reader.ReadUInt32();
|
||||
pictureDesciptor.dxaGoal = reader.ReadUInt32();
|
||||
|
||||
reader.ReadBytes(20, false);
|
||||
|
||||
pictureDesciptor.mx = reader.ReadUInt32();
|
||||
pictureDesciptor.my = reader.ReadUInt32();
|
||||
|
||||
}
|
||||
}
|
||||
catch (...)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
void OleObject::processCompObjStream( const std::string& compStream )
|
||||
{
|
||||
try
|
||||
{
|
||||
HRESULT res = S_OK;
|
||||
|
||||
POLE::Stream* pCompStream = new POLE::Stream(oleStorage, compStream);
|
||||
|
||||
if ( pCompStream )
|
||||
{
|
||||
VirtualStreamReader reader( pCompStream, 0, false);
|
||||
|
||||
//skip the CompObjHeader
|
||||
reader.ReadBytes( 28, false );
|
||||
|
||||
int sz_obj = reader.GetSize() - reader.GetPosition();
|
||||
|
||||
if (sz_obj > 4)
|
||||
{
|
||||
UserType = reader.ReadLengthPrefixedAnsiString(sz_obj);
|
||||
|
||||
sz_obj = reader.GetSize() - reader.GetPosition();
|
||||
if (sz_obj > 4)
|
||||
ClipboardFormat = reader.ReadLengthPrefixedAnsiString(sz_obj);
|
||||
|
||||
sz_obj = reader.GetSize() - reader.GetPosition();
|
||||
if (sz_obj > 4)
|
||||
Program = reader.ReadLengthPrefixedAnsiString(sz_obj);
|
||||
}
|
||||
delete pCompStream;
|
||||
}
|
||||
}
|
||||
catch (...)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
void OleObject::processOleStream( const std::string& oleStreamName )
|
||||
{
|
||||
try
|
||||
{
|
||||
POLE::Stream* pOleStream;
|
||||
HRESULT res = S_OK;
|
||||
|
||||
pOleStream = new POLE::Stream(oleStorage, oleStreamName);
|
||||
|
||||
if ( pOleStream )
|
||||
{
|
||||
VirtualStreamReader reader( pOleStream, 0, false );
|
||||
|
||||
//skip version
|
||||
reader.ReadBytes( 4, false );
|
||||
|
||||
//read the embedded/linked flag
|
||||
int flag = reader.ReadInt32();
|
||||
bLinked = FormatUtils::BitmaskToBool( flag, 0x1 );
|
||||
|
||||
//Link update option
|
||||
this->updateMode = (LinkUpdateOption)reader.ReadInt32();
|
||||
|
||||
switch ( this->updateMode )
|
||||
{
|
||||
case NoLink:
|
||||
{
|
||||
this->UpdateMode = L"NoLink";
|
||||
}
|
||||
break;
|
||||
|
||||
case Always:
|
||||
{
|
||||
this->UpdateMode = L"Always";
|
||||
}
|
||||
break;
|
||||
|
||||
case OnCall:
|
||||
{
|
||||
this->UpdateMode = L"OnCall";
|
||||
}
|
||||
break;
|
||||
}
|
||||
delete pOleStream;
|
||||
}
|
||||
}
|
||||
catch (...)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
std::wstring OleObject::getOleEntryName( const CharacterPropertyExceptions* chpx )
|
||||
{
|
||||
std::wstring ret;
|
||||
|
||||
if ( chpx != NULL )
|
||||
{
|
||||
for ( std::list<SinglePropertyModifier>::const_iterator iter = chpx->grpprl->begin(); iter != chpx->grpprl->end(); iter++ )
|
||||
{
|
||||
if ( iter->OpCode == sprmCPicLocation || iter->OpCode == sprmOldCPicLocation)
|
||||
{
|
||||
ret = ( L"_" + FormatUtils::IntToWideString( FormatUtils::BytesToUInt32( iter->Arguments, 0, iter->argumentsSize ) ) );
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
@ -68,276 +68,18 @@ namespace DocFileFormat
|
||||
|
||||
PictureDescriptor pictureDesciptor;
|
||||
|
||||
OleObject( const CharacterPropertyExceptions* chpx, StructuredStorageReader* docStorage, bool bOlderVersion_ )
|
||||
: bLinked(false), updateMode(NoLink), bOlderVersion(bOlderVersion_)
|
||||
{
|
||||
isEquation = isEmbedded = false;
|
||||
|
||||
oleStorage = docStorage->GetStorage();
|
||||
|
||||
if ( ( chpx != NULL ) && ( docStorage != NULL ) )
|
||||
{
|
||||
HRESULT res = S_OK;
|
||||
|
||||
POLE::Stream* ObjectPoolStorage = new POLE::Stream(oleStorage, "ObjectPool");
|
||||
|
||||
if (ObjectPoolStorage)
|
||||
{
|
||||
ObjectId = getOleEntryName( chpx );
|
||||
|
||||
std::string sObjectId( ObjectId.begin(), ObjectId.end() );
|
||||
{
|
||||
std::string name = "ObjectPool/" + sObjectId + "/";
|
||||
processOleStream( name + "Ole" );
|
||||
|
||||
if ( bLinked )
|
||||
{
|
||||
processLinkInfoStream( name + "LinkInfo" );
|
||||
}
|
||||
else
|
||||
{
|
||||
processCompObjStream( name + "CompObj" );
|
||||
}
|
||||
|
||||
processPICStream( name + "PIC" );
|
||||
|
||||
processEquationNativeStream( name + "Equation Native" );
|
||||
}
|
||||
delete ObjectPoolStorage;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
virtual ~OleObject()
|
||||
{
|
||||
}
|
||||
OleObject( const CharacterPropertyExceptions* chpx, StructuredStorageReader* docStorage, bool bOlderVersion_ );
|
||||
virtual ~OleObject() {}
|
||||
|
||||
private:
|
||||
POLE::Storage *oleStorage;
|
||||
|
||||
void processLinkInfoStream( const std::string& linkStream )
|
||||
{
|
||||
try
|
||||
{
|
||||
POLE::Stream* pLinkStream = NULL;
|
||||
HRESULT res = S_OK;
|
||||
void processLinkInfoStream ( const std::string& linkStream );
|
||||
void processEquationNativeStream( const std::string& eqStream );
|
||||
void processPICStream ( const std::string& picStream );
|
||||
void processCompObjStream ( const std::string& compStream );
|
||||
void processOleStream ( const std::string& oleStreamName );
|
||||
|
||||
pLinkStream = //oleStorage->stream(linkStream);
|
||||
new POLE::Stream(oleStorage, linkStream);
|
||||
|
||||
if ( pLinkStream )
|
||||
{
|
||||
VirtualStreamReader reader( pLinkStream, 0, false);
|
||||
|
||||
//there are two versions of the Link string, one contains ANSI characters, the other contains
|
||||
//unicode characters.
|
||||
//Both strings seem not to be standardized:
|
||||
//The length prefix is a character count EXCLUDING the terminating zero
|
||||
|
||||
//Read the ANSI version
|
||||
short cch = reader.ReadInt16();
|
||||
unsigned char* str = reader.ReadBytes( cch, true );
|
||||
FormatUtils::GetSTLCollectionFromBytes<std::wstring>( &this->Link, str, cch, ENCODING_WINDOWS_1250 );
|
||||
RELEASEARRAYOBJECTS( str );
|
||||
|
||||
//skip the terminating zero of the ANSI string
|
||||
//even if the characters are ANSI chars, the terminating zero has 2 bytes
|
||||
reader.ReadBytes( 2, false );
|
||||
|
||||
//skip the next 4 bytes (flags?)
|
||||
reader.ReadBytes( 4, false );
|
||||
|
||||
//Read the Unicode version
|
||||
this->Link.clear();
|
||||
|
||||
cch = reader.ReadInt16();
|
||||
str = reader.ReadBytes( ( cch * 2 ), true );
|
||||
FormatUtils::GetSTLCollectionFromBytes<std::wstring>( &this->Link, str, ( cch * 2 ), ENCODING_UTF16 );
|
||||
RELEASEARRAYOBJECTS( str );
|
||||
|
||||
//skip the terminating zero of the Unicode string
|
||||
reader.ReadBytes( 2, false );
|
||||
|
||||
delete pLinkStream;
|
||||
}
|
||||
}
|
||||
catch (...)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
void processEquationNativeStream( const std::string& eqStream )
|
||||
{
|
||||
try
|
||||
{
|
||||
POLE::Stream* pCompStream = NULL;
|
||||
HRESULT res = S_OK;
|
||||
|
||||
pCompStream = new POLE::Stream(oleStorage, eqStream);
|
||||
|
||||
if ( pCompStream )
|
||||
{
|
||||
VirtualStreamReader reader( pCompStream, 0, false);
|
||||
|
||||
int sz = reader.GetSize();
|
||||
|
||||
unsigned char *Buffer = reader.ReadBytes( sz, true );
|
||||
|
||||
if (Buffer && sz > 0)
|
||||
{
|
||||
isEquation = true;
|
||||
delete []Buffer;
|
||||
}
|
||||
|
||||
delete pCompStream;
|
||||
}
|
||||
}
|
||||
catch (...)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
void processPICStream( const std::string& picStream )
|
||||
{
|
||||
try
|
||||
{
|
||||
HRESULT res = S_OK;
|
||||
|
||||
POLE::Stream* pPICStream = new POLE::Stream(oleStorage, picStream);
|
||||
|
||||
if ( pPICStream )
|
||||
{
|
||||
VirtualStreamReader reader( pPICStream, 0, false);
|
||||
|
||||
int sz = reader.GetSize();
|
||||
|
||||
int cbHeader = reader.ReadUInt32();
|
||||
|
||||
reader.ReadBytes(4, false);
|
||||
|
||||
int x = reader.ReadUInt32();
|
||||
int y = reader.ReadUInt32();
|
||||
pictureDesciptor.dyaGoal = reader.ReadUInt32();
|
||||
pictureDesciptor.dxaGoal = reader.ReadUInt32();
|
||||
|
||||
reader.ReadBytes(20, false);
|
||||
|
||||
pictureDesciptor.mx = reader.ReadUInt32();
|
||||
pictureDesciptor.my = reader.ReadUInt32();
|
||||
|
||||
}
|
||||
}
|
||||
catch (...)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
void processCompObjStream( const std::string& compStream )
|
||||
{
|
||||
try
|
||||
{
|
||||
HRESULT res = S_OK;
|
||||
|
||||
POLE::Stream* pCompStream = new POLE::Stream(oleStorage, compStream);
|
||||
|
||||
if ( pCompStream )
|
||||
{
|
||||
VirtualStreamReader reader( pCompStream, 0, false);
|
||||
|
||||
//skip the CompObjHeader
|
||||
reader.ReadBytes( 28, false );
|
||||
|
||||
int sz_obj = reader.GetSize() - reader.GetPosition();
|
||||
|
||||
if (sz_obj > 4)
|
||||
{
|
||||
UserType = reader.ReadLengthPrefixedAnsiString(sz_obj);
|
||||
|
||||
sz_obj = reader.GetSize() - reader.GetPosition();
|
||||
if (sz_obj > 4)
|
||||
ClipboardFormat = reader.ReadLengthPrefixedAnsiString(sz_obj);
|
||||
|
||||
sz_obj = reader.GetSize() - reader.GetPosition();
|
||||
if (sz_obj > 4)
|
||||
Program = reader.ReadLengthPrefixedAnsiString(sz_obj);
|
||||
}
|
||||
delete pCompStream;
|
||||
}
|
||||
}
|
||||
catch (...)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
void processOleStream( const std::string& oleStreamName )
|
||||
{
|
||||
try
|
||||
{
|
||||
POLE::Stream* pOleStream;
|
||||
HRESULT res = S_OK;
|
||||
|
||||
pOleStream = new POLE::Stream(oleStorage, oleStreamName);
|
||||
|
||||
if ( pOleStream )
|
||||
{
|
||||
VirtualStreamReader reader( pOleStream, 0, false );
|
||||
|
||||
//skip version
|
||||
reader.ReadBytes( 4, false );
|
||||
|
||||
//read the embedded/linked flag
|
||||
int flag = reader.ReadInt32();
|
||||
bLinked = FormatUtils::BitmaskToBool( flag, 0x1 );
|
||||
|
||||
//Link update option
|
||||
this->updateMode = (LinkUpdateOption)reader.ReadInt32();
|
||||
|
||||
switch ( this->updateMode )
|
||||
{
|
||||
case NoLink:
|
||||
{
|
||||
this->UpdateMode = _T( "NoLink" );
|
||||
}
|
||||
break;
|
||||
|
||||
case Always:
|
||||
{
|
||||
this->UpdateMode = _T( "Always" );
|
||||
}
|
||||
break;
|
||||
|
||||
case OnCall:
|
||||
{
|
||||
this->UpdateMode = _T( "OnCall" );
|
||||
}
|
||||
break;
|
||||
}
|
||||
delete pOleStream;
|
||||
}
|
||||
}
|
||||
catch (...)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
||||
std::wstring getOleEntryName( const CharacterPropertyExceptions* chpx )
|
||||
{
|
||||
std::wstring ret;
|
||||
|
||||
if ( chpx != NULL )
|
||||
{
|
||||
for ( std::list<SinglePropertyModifier>::const_iterator iter = chpx->grpprl->begin(); iter != chpx->grpprl->end(); iter++ )
|
||||
{
|
||||
if ( iter->OpCode == sprmCPicLocation || iter->OpCode == sprmOldCPicLocation)
|
||||
{
|
||||
ret = ( _T( "_" ) + FormatUtils::IntToWideString( FormatUtils::BytesToUInt32( iter->Arguments, 0, iter->argumentsSize ) ) );
|
||||
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return ret;
|
||||
}
|
||||
};
|
||||
std::wstring getOleEntryName ( const CharacterPropertyExceptions* chpx );
|
||||
};
|
||||
}
|
||||
|
||||
@ -67,7 +67,6 @@ namespace DocFileFormat
|
||||
}
|
||||
m_pXmlWriter->WriteNodeBegin( _T( "o:OLEObject" ), TRUE );
|
||||
|
||||
//type
|
||||
if ( ole->bLinked )
|
||||
{
|
||||
int relID = m_context->_docx->RegisterExternalOLEObject(_caller, ole->ClipboardFormat, ole->Link);
|
||||
@ -88,22 +87,13 @@ namespace DocFileFormat
|
||||
m_pXmlWriter->WriteAttribute( _T( "r:id" ), ( std::wstring( _T( "rId" ) ) + FormatUtils::IntToWideString( relID ) ).c_str() );
|
||||
m_pXmlWriter->WriteAttribute( _T( "Type" ), _T( "Embed" ) );
|
||||
|
||||
//copy the object
|
||||
copyEmbeddedObject( ole );
|
||||
}
|
||||
|
||||
//ProgID
|
||||
m_pXmlWriter->WriteAttribute( _T( "ProgID" ), ole->Program.c_str() );
|
||||
|
||||
//ShapeId
|
||||
m_pXmlWriter->WriteAttribute( _T( "ShapeID" ), _shapeId.c_str() );
|
||||
|
||||
//DrawAspect
|
||||
m_pXmlWriter->WriteAttribute( _T( "DrawAspect" ), _T( "Content" ) );
|
||||
|
||||
//ObjectID
|
||||
m_pXmlWriter->WriteAttribute( _T( "ObjectID" ), ole->ObjectId.c_str() );
|
||||
|
||||
m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE );
|
||||
|
||||
m_pXmlWriter->WriteNodeEnd( _T( "o:OLEObject" ) );
|
||||
@ -165,20 +155,15 @@ namespace DocFileFormat
|
||||
}
|
||||
|
||||
private:
|
||||
// Writes the embedded OLE object from the ObjectPool of the binary file to the OpenXml Package.
|
||||
|
||||
inline void copyEmbeddedObject( const OleObject* ole )
|
||||
{
|
||||
if ( ole != NULL )
|
||||
{
|
||||
//!!!TODO: There is issue with some Office OLE Objects. Word can't open *.xls object (Excel.Chart) with set CLSID and
|
||||
//some Power Point Presentations, and Word Documents. Open Office CAN start this objects!!!
|
||||
|
||||
std::wstring clsid;
|
||||
std::wstring exelChart = _T( "Excel.Chart" );
|
||||
|
||||
if ( std::search( ole->Program.begin(), ole->Program.end(), exelChart.begin(), exelChart.end() ) == ole->Program.end() )
|
||||
{//??
|
||||
{
|
||||
clsid = ole->ClassId;
|
||||
}
|
||||
OleObjectFileStructure object_descr(OleObjectMapping::GetTargetExt( ole->ClipboardFormat ), ole->ObjectId, clsid);
|
||||
|
||||
@ -73,10 +73,7 @@ namespace DocFileFormat
|
||||
RELEASEOBJECT(_pPr);
|
||||
RELEASEOBJECT(_framePr);
|
||||
}
|
||||
}
|
||||
|
||||
namespace DocFileFormat
|
||||
{
|
||||
int ParagraphPropertiesMapping::get_section_page_break()
|
||||
{
|
||||
return _isSectionPageBreak;
|
||||
@ -148,14 +145,12 @@ namespace DocFileFormat
|
||||
case sprmPFAutoSpaceDE:
|
||||
{
|
||||
appendFlagElement(_pPr, *iter, _T( "autoSpaceDE" ), true);
|
||||
}
|
||||
break;
|
||||
}break;
|
||||
|
||||
case sprmPFAutoSpaceDN:
|
||||
{
|
||||
appendFlagElement( _pPr, *iter, _T( "autoSpaceDN" ), true );
|
||||
}
|
||||
break;
|
||||
}break;
|
||||
|
||||
case sprmPFBiDi:
|
||||
{
|
||||
@ -248,8 +243,7 @@ namespace DocFileFormat
|
||||
}
|
||||
|
||||
appendValueAttribute( &ind, flName.c_str(), flValue );
|
||||
}
|
||||
break;
|
||||
}break;
|
||||
|
||||
case sprmPDxcLeft1:
|
||||
appendValueAttribute( &ind, _T( "w:firstLineChars" ), FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) );
|
||||
@ -305,10 +299,9 @@ namespace DocFileFormat
|
||||
|
||||
//no line rule means auto
|
||||
spacing.AppendAttribute( lineRule );
|
||||
}
|
||||
break;
|
||||
}break;
|
||||
|
||||
//justification code
|
||||
//justification code
|
||||
case sprmOldPJc:
|
||||
case sprmPJc:
|
||||
case sprmPJc80:
|
||||
@ -318,13 +311,14 @@ namespace DocFileFormat
|
||||
iter->Arguments[0] = (iter->Arguments[0] == 0 ? 2 : 0);
|
||||
}
|
||||
RELEASEOBJECT( jc );
|
||||
jc = new XMLTools::XMLElement<wchar_t>( _T( "w:jc" ) );
|
||||
XMLTools::XMLAttribute<wchar_t> jcVal( _T( "w:val" ), FormatUtils::MapValueToWideString( iter->Arguments[0], &Global::JustificationCode[0][0], 10, 15 ).c_str() );
|
||||
jc->AppendAttribute( jcVal );
|
||||
}
|
||||
break;
|
||||
|
||||
//borders
|
||||
jc = new XMLTools::XMLElement<wchar_t>( L"w:jc" );
|
||||
if ( jc )
|
||||
{
|
||||
XMLTools::XMLAttribute<wchar_t> jcVal( L"w:val", FormatUtils::MapValueToWideString( iter->Arguments[0], &Global::JustificationCode[0][0], 10, 15 ).c_str() );
|
||||
jc->AppendAttribute( jcVal );
|
||||
}
|
||||
}break;
|
||||
//borders
|
||||
//case 0x461C:
|
||||
case sprmOldPBrcTop:
|
||||
case sprmPBrcTop:
|
||||
@ -338,8 +332,7 @@ namespace DocFileFormat
|
||||
appendBorderAttributes( &bc, &topBorder );
|
||||
|
||||
addOrSetBorder( &pBdr, &topBorder );
|
||||
}
|
||||
break;
|
||||
}break;
|
||||
|
||||
//case 0x461D:
|
||||
case sprmOldPBrcLeft:
|
||||
@ -354,8 +347,7 @@ namespace DocFileFormat
|
||||
appendBorderAttributes( &bc, &leftBorder );
|
||||
|
||||
addOrSetBorder( &pBdr, &leftBorder );
|
||||
}
|
||||
break;
|
||||
}break;
|
||||
|
||||
//case 0x461E:
|
||||
case sprmOldPBrcBottom:
|
||||
@ -370,9 +362,8 @@ namespace DocFileFormat
|
||||
appendBorderAttributes( &bc, &bottomBorder );
|
||||
|
||||
addOrSetBorder( &pBdr, &bottomBorder );
|
||||
}
|
||||
break;
|
||||
|
||||
}break;
|
||||
|
||||
//case 0x461F:
|
||||
case sprmOldPBrcRight:
|
||||
case sprmPBrcRight:
|
||||
@ -386,8 +377,7 @@ namespace DocFileFormat
|
||||
appendBorderAttributes( &bc, &rightBorder );
|
||||
|
||||
addOrSetBorder( &pBdr, &rightBorder );
|
||||
}
|
||||
break;
|
||||
}break;
|
||||
|
||||
//case 0x4620:
|
||||
case sprmOldPBrcBetween:
|
||||
@ -402,8 +392,7 @@ namespace DocFileFormat
|
||||
appendBorderAttributes( &bc, &betweenBorder );
|
||||
|
||||
addOrSetBorder( &pBdr, &betweenBorder );
|
||||
}
|
||||
break;
|
||||
}break;
|
||||
|
||||
//case 0x4621:
|
||||
case sprmOldPBrcBar:
|
||||
@ -418,18 +407,17 @@ namespace DocFileFormat
|
||||
appendBorderAttributes( &bc, &barBorder );
|
||||
|
||||
addOrSetBorder( &pBdr, &barBorder );
|
||||
}
|
||||
break;
|
||||
}break;
|
||||
|
||||
//shading
|
||||
//shading
|
||||
case sprmPShd80:
|
||||
case sprmPShd:
|
||||
{
|
||||
ShadingDescriptor desc( iter->Arguments, iter->argumentsSize );
|
||||
|
||||
appendShading( _pPr, desc );
|
||||
}
|
||||
break;
|
||||
}break;
|
||||
|
||||
|
||||
//numbering
|
||||
case sprmOldPAnld:
|
||||
@ -467,8 +455,10 @@ namespace DocFileFormat
|
||||
}break;
|
||||
|
||||
case sprmPIlfo:
|
||||
{
|
||||
{
|
||||
//Если numbering.xml пустой, то не пищем свойство
|
||||
//Todo разобраться с закоментированным кодом
|
||||
if (NULL != m_document->listTable && false == m_document->listTable->listData.empty())
|
||||
{
|
||||
appendValueElement( &numPr, _T( "numId" ), FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize ), true );
|
||||
}
|
||||
@ -485,8 +475,8 @@ namespace DocFileFormat
|
||||
// appendValueElement(numPr, "ilvl", "0", true);
|
||||
// }
|
||||
//}
|
||||
}
|
||||
break;
|
||||
}
|
||||
break;
|
||||
|
||||
|
||||
case sprmOldPChgTabs: //tabs
|
||||
@ -663,28 +653,24 @@ namespace DocFileFormat
|
||||
|
||||
//append indent
|
||||
if ( ind.GetAttributeCount() > 0 )
|
||||
{
|
||||
_pPr->AppendChild( ind );
|
||||
}
|
||||
{
|
||||
_pPr->AppendChild( ind );
|
||||
}
|
||||
|
||||
if ( spacing.GetAttributeCount() > 0 )//append spacing
|
||||
{
|
||||
_pPr->AppendChild( spacing );
|
||||
}
|
||||
{
|
||||
_pPr->AppendChild( spacing );
|
||||
}
|
||||
|
||||
if ( jc ) //append justification
|
||||
{
|
||||
_pPr->AppendChild( *jc );
|
||||
RELEASEOBJECT( jc );
|
||||
}
|
||||
_pPr->AppendChild( *jc );
|
||||
RELEASEOBJECT( jc );
|
||||
}
|
||||
|
||||
if ( numPr.GetChildCount() > 0 )//append numPr
|
||||
{
|
||||
_pPr->AppendChild( numPr );
|
||||
}
|
||||
{
|
||||
_pPr->AppendChild( numPr );
|
||||
}
|
||||
|
||||
if ( pBdr.GetChildCount() > 0 ) //append borders
|
||||
|
||||
@ -46,26 +46,25 @@ namespace DocFileFormat
|
||||
class ParagraphPropertiesMapping: public PropertiesMapping, public IMapping
|
||||
{
|
||||
public:
|
||||
ParagraphPropertiesMapping( XMLTools::CStringXmlWriter* writer, ConversionContext* ctx, WordDocument* document, CharacterPropertyExceptions* paraEndChpx, bool isBidi, bool isParagraphStyleNeeded = true );
|
||||
ParagraphPropertiesMapping( XMLTools::CStringXmlWriter* writer, ConversionContext* ctx, WordDocument* document, CharacterPropertyExceptions* paraEndChpx, bool isBidi, SectionPropertyExceptions* sepx, int sectionNr, bool isParagraphStyleNeeded = true );
|
||||
ParagraphPropertiesMapping ( XMLTools::CStringXmlWriter* writer, ConversionContext* ctx, WordDocument* document, CharacterPropertyExceptions* paraEndChpx, bool isBidi, bool isParagraphStyleNeeded = true );
|
||||
ParagraphPropertiesMapping ( XMLTools::CStringXmlWriter* writer, ConversionContext* ctx, WordDocument* document, CharacterPropertyExceptions* paraEndChpx, bool isBidi, SectionPropertyExceptions* sepx, int sectionNr, bool isParagraphStyleNeeded = true );
|
||||
virtual ~ParagraphPropertiesMapping();
|
||||
void Apply(IVisitable* visited);
|
||||
|
||||
int get_section_page_break();
|
||||
|
||||
private:
|
||||
WordDocument* m_document;
|
||||
ConversionContext* m_context;
|
||||
WordDocument* m_document;
|
||||
ConversionContext* m_context;
|
||||
|
||||
XMLTools::XMLElement<wchar_t>* _pPr;
|
||||
XMLTools::XMLElement<wchar_t>* _framePr;
|
||||
SectionPropertyExceptions* _sepx;
|
||||
CharacterPropertyExceptions* _paraEndChpx;
|
||||
int _sectionNr;
|
||||
XMLTools::XMLElement<wchar_t>* _pPr;
|
||||
XMLTools::XMLElement<wchar_t>* _framePr;
|
||||
SectionPropertyExceptions* _sepx;
|
||||
CharacterPropertyExceptions* _paraEndChpx;
|
||||
int _sectionNr;
|
||||
|
||||
bool _isParagraphStyleNeeded;
|
||||
bool _isBidi;
|
||||
|
||||
int _isSectionPageBreak;
|
||||
bool _isParagraphStyleNeeded;
|
||||
bool _isBidi;
|
||||
int _isSectionPageBreak;
|
||||
};
|
||||
}
|
||||
|
||||
@ -79,8 +79,8 @@ namespace DocFileFormat
|
||||
//rgbColor6.Format( _T( "%02x%02x%02x" ), /*R*/this->Red, /*G*/this->Green, /*B*/this->Blue );
|
||||
//rgbColor8.Format( _T( "%02x%02x%02x%02x" ), /*R*/this->Red, /*G*/this->Green, /*B*/this->Blue, /*A*/this->Alpha );
|
||||
|
||||
//SixDigitHexCode = string2std_string( rgbColor6 );
|
||||
//EightDigitHexCode = string2std_string( rgbColor8 );
|
||||
//SixDigitHexCode = rgbColor6;
|
||||
//EightDigitHexCode = rgbColor8;
|
||||
rgbColor6 << boost::wformat( L"%02x%02x%02x" ) % /*R*/this->Red % /*G*/this->Green % /*B*/this->Blue;
|
||||
rgbColor8 << boost::wformat( L"%02x%02x%02x%02x" ) % /*R*/this->Red % /*G*/this->Green % /*B*/this->Blue % /*A*/this->Alpha;
|
||||
|
||||
@ -101,8 +101,8 @@ namespace DocFileFormat
|
||||
//rgbColor6.Format( _T( "%02x%02x%02x" ), /*R*/this->Red, /*G*/this->Green, /*B*/this->Blue );
|
||||
//rgbColor8.Format( _T( "%02x%02x%02x%02x" ), /*R*/this->Red, /*G*/this->Green, /*B*/this->Blue, /*A*/this->Alpha );
|
||||
|
||||
//SixDigitHexCode = string2std_string( rgbColor6 );
|
||||
//EightDigitHexCode = string2std_string( rgbColor8 );
|
||||
//SixDigitHexCode = rgbColor6;
|
||||
//EightDigitHexCode = rgbColor8;
|
||||
rgbColor6 << boost::wformat( L"%02x%02x%02x" ) % /*R*/this->Red % /*G*/this->Green % /*B*/this->Blue;
|
||||
rgbColor8 << boost::wformat( L"%02x%02x%02x%02x" ) % /*R*/this->Red % /*G*/this->Green % /*B*/this->Blue % /*A*/this->Alpha;
|
||||
|
||||
|
||||
@ -35,7 +35,6 @@
|
||||
|
||||
namespace DocFileFormat
|
||||
{
|
||||
// Creates a new SectionPropertiesMapping which writes the properties to the given writer
|
||||
SectionPropertiesMapping::SectionPropertiesMapping (XMLTools::CStringXmlWriter* pWriter, ConversionContext* pContext, int nSelectProperties) : PropertiesMapping (pWriter)
|
||||
{
|
||||
m_bDeleteNode = TRUE;
|
||||
@ -54,7 +53,6 @@ namespace DocFileFormat
|
||||
_type = std::wstring (_T("nextPage"));
|
||||
}
|
||||
|
||||
// Creates a new SectionPropertiesMapping which appends the properties to a given node.
|
||||
SectionPropertiesMapping::SectionPropertiesMapping (XMLTools::XMLElement<wchar_t>* pBaseNode, ConversionContext* pContext, int nSelectProperties) : PropertiesMapping(NULL)
|
||||
{
|
||||
m_bDeleteNode = FALSE;
|
||||
@ -85,7 +83,6 @@ namespace DocFileFormat
|
||||
|
||||
namespace DocFileFormat
|
||||
{
|
||||
// Converts the given SectionPropertyExceptions
|
||||
void SectionPropertiesMapping::Apply (IVisitable* visited)
|
||||
{
|
||||
SectionPropertyExceptions* sepx = static_cast<SectionPropertyExceptions*>(visited);
|
||||
@ -156,60 +153,56 @@ namespace DocFileFormat
|
||||
{
|
||||
switch (iter->OpCode)
|
||||
{
|
||||
//page margins
|
||||
case sprmOldSDxaLeft:
|
||||
case sprmSDxaLeft:
|
||||
{
|
||||
//left margin
|
||||
_marLeft = FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize );
|
||||
appendValueAttribute( &pgMar, _T( "w:left" ), FormatUtils::IntToWideString( _marLeft ).c_str() );
|
||||
}
|
||||
break;
|
||||
{
|
||||
_marLeft = FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize );
|
||||
appendValueAttribute( &pgMar, _T( "w:left" ), FormatUtils::IntToWideString( _marLeft ).c_str() );
|
||||
}
|
||||
break;
|
||||
|
||||
case sprmOldSDxaRight:
|
||||
case sprmSDxaRight:
|
||||
{
|
||||
//right margin
|
||||
_marRight = FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize );
|
||||
appendValueAttribute( &pgMar, _T( "w:right" ), FormatUtils::IntToWideString( _marRight ).c_str() );
|
||||
}
|
||||
break;
|
||||
{
|
||||
_marRight = FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize );
|
||||
appendValueAttribute( &pgMar, _T( "w:right" ), FormatUtils::IntToWideString( _marRight ).c_str() );
|
||||
}
|
||||
break;
|
||||
|
||||
case sprmOldSDyaTop:
|
||||
case sprmSDyaTop:
|
||||
//top margin
|
||||
//top margin
|
||||
appendValueAttribute( &pgMar, _T( "w:top" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ).c_str() );
|
||||
break;
|
||||
|
||||
case sprmOldSDyaBottom:
|
||||
case sprmSDyaBottom:
|
||||
//bottom margin
|
||||
//bottom margin
|
||||
appendValueAttribute( &pgMar, _T( "w:bottom" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ).c_str() );
|
||||
break;
|
||||
|
||||
case sprmOldSDzaGutter:
|
||||
case sprmSDzaGutter:
|
||||
//gutter margin
|
||||
//gutter margin
|
||||
appendValueAttribute( &pgMar, _T( "w:gutter" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ).c_str() );
|
||||
break;
|
||||
|
||||
case sprmOldSDyaHdrTop:
|
||||
case sprmSDyaHdrTop:
|
||||
//header margin
|
||||
//header margin
|
||||
appendValueAttribute( &pgMar, _T( "w:header"), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ).c_str() );
|
||||
break;
|
||||
|
||||
case sprmOldSDyaHdrBottom:
|
||||
case sprmSDyaHdrBottom:
|
||||
//footer margin
|
||||
//footer margin
|
||||
appendValueAttribute( &pgMar, _T( "w:footer" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ).c_str() );
|
||||
break;
|
||||
|
||||
//page size and orientation
|
||||
//page size and orientation
|
||||
case sprmOldSXaPage:
|
||||
case sprmSXaPage:
|
||||
{
|
||||
//width
|
||||
_pgWidth = FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize );
|
||||
appendValueAttribute( &pgSz, _T( "w:w" ), FormatUtils::IntToWideString( _pgWidth ).c_str() );
|
||||
}
|
||||
@ -217,7 +210,6 @@ namespace DocFileFormat
|
||||
|
||||
case sprmOldSYaPage:
|
||||
case sprmSYaPage:
|
||||
//height
|
||||
appendValueAttribute( &pgSz, _T( "w:h" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ).c_str() );
|
||||
break;
|
||||
|
||||
@ -227,7 +219,7 @@ namespace DocFileFormat
|
||||
appendValueAttribute( &pgSz, _T( "w:orient" ), FormatUtils::MapValueToWideString( iter->Arguments[0], &PageOrientationMap[0][0], 3, 10 ).c_str() );
|
||||
break;
|
||||
|
||||
//paper source
|
||||
//paper source
|
||||
case sprmOldSDmBinFirst:
|
||||
case sprmSDmBinFirst:
|
||||
appendValueAttribute( &paperSrc, _T( "w:first" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ).c_str() );
|
||||
@ -238,91 +230,85 @@ namespace DocFileFormat
|
||||
appendValueAttribute( &paperSrc, _T( "w:other" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ).c_str() );
|
||||
break;
|
||||
|
||||
//page borders
|
||||
//page borders
|
||||
case sprmSBrcTop80:
|
||||
case sprmSBrcTop:
|
||||
{
|
||||
//top
|
||||
XMLTools::XMLElement<wchar_t> topBorder( _T( "w:top" ) );
|
||||
BorderCode bc( iter->Arguments, iter->argumentsSize );
|
||||
appendBorderAttributes( &bc, &topBorder );
|
||||
addOrSetBorder( &pgBorders, &topBorder);
|
||||
}
|
||||
break;
|
||||
{
|
||||
//top
|
||||
XMLTools::XMLElement<wchar_t> topBorder( _T( "w:top" ) );
|
||||
BorderCode bc( iter->Arguments, iter->argumentsSize );
|
||||
appendBorderAttributes( &bc, &topBorder );
|
||||
addOrSetBorder( &pgBorders, &topBorder);
|
||||
}
|
||||
break;
|
||||
|
||||
case sprmSBrcLeft80:
|
||||
case sprmSBrcLeft:
|
||||
{
|
||||
//left
|
||||
XMLTools::XMLElement<wchar_t> leftBorder( _T( "w:left" ) );
|
||||
BorderCode bc( iter->Arguments, iter->argumentsSize );
|
||||
appendBorderAttributes( &bc, &leftBorder);
|
||||
addOrSetBorder( &pgBorders, &leftBorder);
|
||||
}
|
||||
break;
|
||||
{
|
||||
XMLTools::XMLElement<wchar_t> leftBorder( _T( "w:left" ) );
|
||||
BorderCode bc( iter->Arguments, iter->argumentsSize );
|
||||
appendBorderAttributes( &bc, &leftBorder);
|
||||
addOrSetBorder( &pgBorders, &leftBorder);
|
||||
}
|
||||
break;
|
||||
|
||||
case sprmSBrcBottom80:
|
||||
case sprmSBrcBottom:
|
||||
{
|
||||
//left
|
||||
XMLTools::XMLElement<wchar_t> bottomBorder( _T( "w:bottom" ) );
|
||||
BorderCode bc( iter->Arguments, iter->argumentsSize );
|
||||
appendBorderAttributes( &bc, &bottomBorder );
|
||||
addOrSetBorder( &pgBorders, &bottomBorder);
|
||||
}
|
||||
break;
|
||||
{
|
||||
//left
|
||||
XMLTools::XMLElement<wchar_t> bottomBorder( _T( "w:bottom" ) );
|
||||
BorderCode bc( iter->Arguments, iter->argumentsSize );
|
||||
appendBorderAttributes( &bc, &bottomBorder );
|
||||
addOrSetBorder( &pgBorders, &bottomBorder);
|
||||
}
|
||||
break;
|
||||
|
||||
case sprmSBrcRight80:
|
||||
case sprmSBrcRight:
|
||||
{
|
||||
//left
|
||||
XMLTools::XMLElement<wchar_t> rightBorder( _T( "w:right" ) );
|
||||
BorderCode bc( iter->Arguments, iter->argumentsSize );
|
||||
appendBorderAttributes( &bc, &rightBorder);
|
||||
addOrSetBorder( &pgBorders, &rightBorder);
|
||||
}
|
||||
break;
|
||||
{
|
||||
//left
|
||||
XMLTools::XMLElement<wchar_t> rightBorder( _T( "w:right" ) );
|
||||
BorderCode bc( iter->Arguments, iter->argumentsSize );
|
||||
appendBorderAttributes( &bc, &rightBorder);
|
||||
addOrSetBorder( &pgBorders, &rightBorder);
|
||||
}
|
||||
break;
|
||||
|
||||
//footnote properties
|
||||
case sprmSRncFtn:
|
||||
//restart code
|
||||
appendValueElement( &footnotePr, _T( "numRestart" ), FormatUtils::MapValueToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ), &FootnoteRestartCodeMap[0][0], 3, 11 ).c_str(), true );
|
||||
break;
|
||||
|
||||
//endnote properties
|
||||
case sprmSRncEdn:
|
||||
//restart code
|
||||
appendValueElement( &endnotePr, _T( "numRestart" ), FormatUtils::MapValueToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ), &EndnoteRestartCodeMap[0][0], 3, 11 ).c_str(), true );
|
||||
break;
|
||||
|
||||
case sprmSFpc:
|
||||
{
|
||||
//position code
|
||||
short fpc = 0;
|
||||
|
||||
if ( iter->argumentsSize == 2 )
|
||||
{
|
||||
//position code
|
||||
short fpc = 0;
|
||||
|
||||
if ( iter->argumentsSize == 2 )
|
||||
{
|
||||
fpc = FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize );
|
||||
}
|
||||
else
|
||||
{
|
||||
fpc = (short)iter->Arguments[0];
|
||||
}
|
||||
|
||||
if ( fpc == 2 )
|
||||
{
|
||||
appendValueElement( &footnotePr, _T( "pos" ), _T( "beneathText" ), true );
|
||||
}
|
||||
fpc = FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize );
|
||||
}
|
||||
break;
|
||||
else
|
||||
{
|
||||
fpc = (short)iter->Arguments[0];
|
||||
}
|
||||
|
||||
if ( fpc == 2 )
|
||||
{
|
||||
appendValueElement( &footnotePr, _T( "pos" ), _T( "beneathText" ), true );
|
||||
}
|
||||
}break;
|
||||
|
||||
case sprmSNfcFtnRef:
|
||||
//number format
|
||||
appendValueElement( &footnotePr, _T( "numFmt" ), NumberingMapping::GetNumberFormatWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ).c_str(), true );
|
||||
break;
|
||||
|
||||
case sprmSNfcEdnRef:
|
||||
//number format
|
||||
appendValueElement( &endnotePr, _T( "numFmt" ), NumberingMapping::GetNumberFormatWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ).c_str(), true );
|
||||
break;
|
||||
|
||||
@ -334,7 +320,6 @@ namespace DocFileFormat
|
||||
appendValueElement( &endnotePr, _T( "numStart" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ).c_str(), true );
|
||||
break;
|
||||
|
||||
//doc grid
|
||||
case sprmSDyaLinePitch:
|
||||
appendValueAttribute( &docGrid, _T( "w:linePitch" ), FormatUtils::IntToWideString( FormatUtils::BytesToInt16( iter->Arguments, 0, iter->argumentsSize ) ).c_str() );
|
||||
break;
|
||||
@ -347,18 +332,17 @@ namespace DocFileFormat
|
||||
appendValueAttribute( &docGrid, _T( "w:type" ), FormatUtils::MapValueToWideString( FormatUtils::BytesToUInt16( iter->Arguments, 0, iter->argumentsSize ), &DocGridTypeMap[0][0], 4, 14 ).c_str() );
|
||||
break;
|
||||
|
||||
// Columns
|
||||
case sprmOldSCcolumns:
|
||||
case sprmSCcolumns:
|
||||
{
|
||||
m_nColumns = static_cast<int> (FormatUtils::BytesToInt16 (iter->Arguments, 0, iter->argumentsSize) + 1);
|
||||
{
|
||||
m_nColumns = static_cast<int> (FormatUtils::BytesToInt16 (iter->Arguments, 0, iter->argumentsSize) + 1);
|
||||
|
||||
RELEASEARRAYOBJECTS (m_arrSpace);
|
||||
m_arrSpace = new short [m_nColumns];
|
||||
RELEASEARRAYOBJECTS (m_arrSpace);
|
||||
m_arrSpace = new short [m_nColumns];
|
||||
|
||||
appendValueAttribute (&cols, _T( "w:num" ), FormatUtils::IntToWideString (m_nColumns).c_str());
|
||||
}
|
||||
break;
|
||||
appendValueAttribute (&cols, _T( "w:num" ), FormatUtils::IntToWideString (m_nColumns).c_str());
|
||||
}
|
||||
break;
|
||||
|
||||
case sprmOldSDxaColumns:
|
||||
case sprmSDxaColumns:
|
||||
@ -368,65 +352,60 @@ namespace DocFileFormat
|
||||
|
||||
case sprmOldSDxaColWidth:
|
||||
case sprmSDxaColWidth:
|
||||
{
|
||||
if (m_nColumns) // there is at least one width set, so create the array
|
||||
{
|
||||
// there is at least one width set, so create the array
|
||||
if (m_nColumns)
|
||||
{
|
||||
if (NULL == m_arrWidth)
|
||||
m_arrWidth = new short [m_nColumns];
|
||||
if (NULL == m_arrWidth)
|
||||
m_arrWidth = new short [m_nColumns];
|
||||
|
||||
unsigned char nInd = iter->Arguments[0];
|
||||
m_arrWidth[nInd] = FormatUtils::BytesToInt16 (iter->Arguments, 1, iter->argumentsSize);
|
||||
}
|
||||
unsigned char nInd = iter->Arguments[0];
|
||||
m_arrWidth[nInd] = FormatUtils::BytesToInt16 (iter->Arguments, 1, iter->argumentsSize);
|
||||
}
|
||||
break;
|
||||
}
|
||||
break;
|
||||
|
||||
case sprmOldSDxaColSpacing:
|
||||
case sprmSDxaColSpacing:
|
||||
{
|
||||
// there is at least one space set, so create the array
|
||||
if (m_nColumns)
|
||||
{
|
||||
// there is at least one space set, so create the array
|
||||
if (m_nColumns)
|
||||
{
|
||||
if (NULL == m_arrSpace)
|
||||
m_arrSpace = new short[m_nColumns];
|
||||
if (NULL == m_arrSpace)
|
||||
m_arrSpace = new short[m_nColumns];
|
||||
|
||||
unsigned char nInd = iter->Arguments[0];
|
||||
m_arrSpace [nInd] = FormatUtils::BytesToInt16 (iter->Arguments, 1, iter->argumentsSize);
|
||||
}
|
||||
unsigned char nInd = iter->Arguments[0];
|
||||
m_arrSpace [nInd] = FormatUtils::BytesToInt16 (iter->Arguments, 1, iter->argumentsSize);
|
||||
}
|
||||
break;
|
||||
}break;
|
||||
|
||||
//bidi
|
||||
case sprmSFBiDi:
|
||||
appendFlagElement (m_pXmlNode, *iter, _T( "bidi" ), true );
|
||||
break;
|
||||
{
|
||||
appendFlagElement (m_pXmlNode, *iter, _T( "bidi" ), iter->argumentsSize > 0 ? iter->Arguments[0] : true );
|
||||
}break;
|
||||
|
||||
//title page
|
||||
case sprmOldSFTitlePage:
|
||||
case sprmSFTitlePage:
|
||||
appendFlagElement (m_pXmlNode, *iter, _T( "titlePg" ), true );
|
||||
break;
|
||||
{
|
||||
appendFlagElement (m_pXmlNode, *iter, _T( "titlePg" ), iter->argumentsSize > 0 ? iter->Arguments[0] : true );
|
||||
}break;
|
||||
|
||||
//RTL gutter
|
||||
case sprmSFRTLGutter:
|
||||
appendFlagElement (m_pXmlNode, *iter, _T( "rtlGutter" ), true );
|
||||
break;
|
||||
|
||||
//type
|
||||
{
|
||||
appendFlagElement (m_pXmlNode, *iter, _T( "rtlGutter" ), iter->argumentsSize > 0 ? iter->Arguments[0] : true );
|
||||
}break;
|
||||
|
||||
case sprmOldSBkc:
|
||||
case sprmSBkc:
|
||||
{
|
||||
_type = FormatUtils::MapValueToWideString( iter->Arguments[0], &SectionTypeMap[0][0], 5, 11 );
|
||||
}
|
||||
break;
|
||||
{
|
||||
_type = FormatUtils::MapValueToWideString( iter->Arguments[0], &SectionTypeMap[0][0], 5, 11 );
|
||||
}
|
||||
break;
|
||||
|
||||
//align
|
||||
case sprmOldSVjc:
|
||||
case sprmSVjc:
|
||||
appendValueElement (m_pXmlNode, _T( "vAlign" ), FormatUtils::MapValueToWideString( iter->Arguments[0], &TextVerticalAlignment[0][0], 4, 7 ).c_str(), true );
|
||||
break;
|
||||
|
||||
//pgNumType
|
||||
case sprmOldSNfcPgn:
|
||||
case sprmSNfcPgn:
|
||||
appendValueAttribute( &pgNumType, _T( "w:fmt" ), FormatUtils::MapValueToWideString( iter->Arguments[0], &PageNumberFormatCodeMap[0][0], 42, 29 ).c_str() );
|
||||
@ -442,7 +421,7 @@ namespace DocFileFormat
|
||||
bWasSprmSFPgnRestart = true;
|
||||
break;
|
||||
|
||||
// <w:lnNumType> - Line Numbering Settings
|
||||
// <w:lnNumType> - Line Numbering Settings
|
||||
|
||||
case sprmOldSLnnMin :
|
||||
case sprmSLnnMin :
|
||||
@ -476,6 +455,7 @@ namespace DocFileFormat
|
||||
|
||||
default:
|
||||
{
|
||||
int sz = iter->argumentsSize;
|
||||
}break;
|
||||
}
|
||||
}
|
||||
@ -486,7 +466,6 @@ namespace DocFileFormat
|
||||
// build the columns
|
||||
if (m_arrWidth)
|
||||
{
|
||||
//set to unequal width
|
||||
XMLTools::XMLAttribute<wchar_t> equalWidth( _T( "w:equalWidth" ), _T( "0" ) );
|
||||
cols.AppendAttribute( equalWidth );
|
||||
|
||||
@ -505,7 +484,6 @@ namespace DocFileFormat
|
||||
m_arrWidth [m_nColumns - 1] = lastColWidth;
|
||||
}
|
||||
|
||||
// append the xml elements
|
||||
for (int i = 0; i < m_nColumns; ++i)
|
||||
{
|
||||
XMLTools::XMLElement<wchar_t> col (_T( "w:col" ));
|
||||
@ -518,46 +496,35 @@ namespace DocFileFormat
|
||||
}
|
||||
}
|
||||
|
||||
//append the section type
|
||||
appendValueElement (m_pXmlNode, _T( "type" ), _type.c_str(), true );
|
||||
|
||||
// Document-Wide Footnote Properties
|
||||
if (footnotePr.GetChildCount())
|
||||
m_pXmlNode->AppendChild (footnotePr);
|
||||
|
||||
// Document-Wide Endnote Properties
|
||||
if (endnotePr.GetChildCount())
|
||||
m_pXmlNode->AppendChild (endnotePr);
|
||||
|
||||
// Page Size
|
||||
if (pgSz.GetAttributeCount())
|
||||
m_pXmlNode->AppendChild (pgSz);
|
||||
|
||||
// Page Borders
|
||||
if (pgBorders.GetChildCount())
|
||||
m_pXmlNode->AppendChild (pgBorders);
|
||||
|
||||
// Page Margins
|
||||
if (pgMar.GetAttributeCount())
|
||||
m_pXmlNode->AppendChild (pgMar);
|
||||
|
||||
// Line Numbering Settings
|
||||
if (lnNumType.GetAttributeCount())
|
||||
m_pXmlNode->AppendChild (lnNumType);
|
||||
|
||||
// Paper Source Information
|
||||
if (paperSrc.GetAttributeCount())
|
||||
m_pXmlNode->AppendChild (paperSrc);
|
||||
|
||||
// Single Column Definition)
|
||||
if (cols.GetAttributeCount() || cols.GetChildCount())
|
||||
m_pXmlNode->AppendChild (cols);
|
||||
|
||||
// Document Grid
|
||||
if (docGrid.GetAttributeCount())
|
||||
m_pXmlNode->AppendChild (docGrid);
|
||||
|
||||
// Page Numbering Settings
|
||||
if (pgNumType.GetAttributeCount())
|
||||
m_pXmlNode->AppendChild (pgNumType);
|
||||
|
||||
|
||||
@ -42,11 +42,11 @@ namespace DocFileFormat
|
||||
SectionPropertyExceptions( unsigned char* bytes, int size, bool oldVersion ):
|
||||
PropertyExceptions( bytes, size, oldVersion ), isBidi(false)
|
||||
{
|
||||
for ( std::list<SinglePropertyModifier>::iterator iter = this->grpprl->begin(); iter != this->grpprl->end(); iter++ )
|
||||
for ( std::list<SinglePropertyModifier>::iterator iter = grpprl->begin(); iter != grpprl->end(); iter++ )
|
||||
{
|
||||
SinglePropertyModifier sprm( *iter );
|
||||
|
||||
if( sprm.OpCode == sprmSFBiDi )
|
||||
if( sprm.OpCode == sprmSFBiDi && sprm.Arguments[0] != 0)
|
||||
{
|
||||
isBidi = true;
|
||||
}
|
||||
|
||||
@ -44,27 +44,31 @@ namespace DocFileFormat
|
||||
{
|
||||
WordDocumentProperties* dop = static_cast<WordDocumentProperties*>( visited );
|
||||
|
||||
this->_ctx->_docx->RegisterSettings();
|
||||
_ctx->_docx->RegisterSettings();
|
||||
|
||||
//start w:settings
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "?xml version=\"1.0\" encoding=\"UTF-8\"?" ) );
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:settings" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"?xml version=\"1.0\" encoding=\"UTF-8\"?" );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:settings", TRUE );
|
||||
|
||||
//write namespaces
|
||||
m_oXmlWriter.WriteAttribute( _T( "xmlns:w" ), OpenXmlNamespaces::WordprocessingML );
|
||||
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE, FALSE );
|
||||
m_oXmlWriter.WriteAttribute( L"xmlns:w", OpenXmlNamespaces::WordprocessingML );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE, FALSE );
|
||||
|
||||
//zoom
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:zoom" ), TRUE );
|
||||
m_oXmlWriter.WriteAttribute( _T( "w:percent" ), FormatUtils::IntToWideString( dop->wScaleSaved ).c_str() );
|
||||
m_oXmlWriter.WriteNodeBegin ( L"w:zoom", TRUE );
|
||||
m_oXmlWriter.WriteAttribute ( L"w:percent", FormatUtils::IntToWideString( dop->wScaleSaved ).c_str() );
|
||||
|
||||
if ( dop->zkSaved != 0 )
|
||||
{
|
||||
m_oXmlWriter.WriteAttribute( _T( "w:val" ), FormatUtils::MapValueToWideString( dop->zkSaved, &ZoomTypeMap[0][0], 3, 9 ).c_str() );
|
||||
m_oXmlWriter.WriteAttribute( L"w:val", FormatUtils::MapValueToWideString( dop->zkSaved, &ZoomTypeMap[0][0], 3, 9 ).c_str() );
|
||||
}
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
if (dop->bDisplayBackgroundShape)
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin ( L"w:displayBackgroundShape", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd ( L"", TRUE );
|
||||
}
|
||||
|
||||
//doc protection
|
||||
//<w:documentProtection w:edit="forms" w:enforcement="1"/>
|
||||
@ -72,30 +76,30 @@ namespace DocFileFormat
|
||||
//embed system fonts
|
||||
if( !dop->fDoNotEmbedSystemFont )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:embedSystemFonts" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:embedSystemFonts", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
//mirror margins
|
||||
if ( dop->fMirrorMargins )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:mirrorMargins" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:mirrorMargins", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
//evenAndOddHeaders
|
||||
if ( dop->fFacingPages )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:evenAndOddHeaders" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:evenAndOddHeaders", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
//proof state
|
||||
XMLTools::XMLElement<wchar_t> proofState( _T( "w:proofState" ) );
|
||||
XMLTools::XMLElement<wchar_t> proofState( L"w:proofState" );
|
||||
|
||||
if ( dop->fGramAllClean )
|
||||
{
|
||||
appendValueAttribute( &proofState, _T( "w:grammar" ), _T( "clean" ) );
|
||||
appendValueAttribute( &proofState, L"w:grammar", L"clean" );
|
||||
}
|
||||
|
||||
if ( proofState.GetAttributeCount() > 0 )
|
||||
@ -106,31 +110,31 @@ namespace DocFileFormat
|
||||
//stylePaneFormatFilter
|
||||
if ( dop->grfFmtFilter != 0 )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:stylePaneFormatFilter" ), TRUE );
|
||||
m_oXmlWriter.WriteAttribute( _T( "w:val" ), FormatUtils::IntToFormattedWideString( dop->grfFmtFilter, _T( "%04x" ) ).c_str() );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:stylePaneFormatFilter", TRUE );
|
||||
m_oXmlWriter.WriteAttribute( L"w:val", FormatUtils::IntToFormattedWideString( dop->grfFmtFilter, L"%04x" ).c_str() );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
//default tab stop
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:defaultTabStop" ), TRUE );
|
||||
m_oXmlWriter.WriteAttribute( _T( "w:val" ), FormatUtils::IntToWideString( dop->dxaTab ).c_str() );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:defaultTabStop", TRUE );
|
||||
m_oXmlWriter.WriteAttribute( L"w:val", FormatUtils::IntToWideString( dop->dxaTab ).c_str() );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
|
||||
//drawing grid
|
||||
if( dop->dogrid != NULL )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:displayHorizontalDrawingGridEvery" ), TRUE );
|
||||
m_oXmlWriter.WriteAttribute( _T( "w:val" ), FormatUtils::IntToWideString( dop->dogrid->dxGridDisplay ).c_str() );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:displayHorizontalDrawingGridEvery", TRUE );
|
||||
m_oXmlWriter.WriteAttribute( L"w:val", FormatUtils::IntToWideString( dop->dogrid->dxGridDisplay ).c_str() );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:displayVerticalDrawingGridEvery" ), TRUE );
|
||||
m_oXmlWriter.WriteAttribute( _T( "w:val" ), FormatUtils::IntToWideString( dop->dogrid->dyGridDisplay ).c_str() );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:displayVerticalDrawingGridEvery", TRUE );
|
||||
m_oXmlWriter.WriteAttribute( L"w:val", FormatUtils::IntToWideString( dop->dogrid->dyGridDisplay ).c_str() );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
|
||||
if ( dop->dogrid->fFollowMargins == false )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:doNotUseMarginsForDrawingGridOrigin" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:doNotUseMarginsForDrawingGridOrigin", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
}
|
||||
|
||||
@ -139,27 +143,27 @@ namespace DocFileFormat
|
||||
{
|
||||
if ( dop->doptypography->fKerningPunct == false )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:noPunctuationKerning" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:noPunctuationKerning", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
}
|
||||
|
||||
//footnote properties
|
||||
XMLTools::XMLElement<wchar_t> footnotePr( _T( "w:footnotePr" ) );
|
||||
XMLTools::XMLElement<wchar_t> footnotePr( L"w:footnotePr" );
|
||||
|
||||
if ( dop->nFtn != 0 )
|
||||
{
|
||||
appendValueAttribute( &footnotePr, _T( "w:numStart" ), FormatUtils::IntToWideString( dop->nFtn ).c_str() );
|
||||
appendValueAttribute( &footnotePr, L"w:numStart", FormatUtils::IntToWideString( dop->nFtn ).c_str() );
|
||||
}
|
||||
|
||||
if ( dop->rncFtn != 0 )
|
||||
{
|
||||
appendValueAttribute( &footnotePr, _T( "w:numRestart" ), FormatUtils::IntToWideString( dop->rncFtn ).c_str() );
|
||||
appendValueAttribute( &footnotePr, L"w:numRestart", FormatUtils::IntToWideString( dop->rncFtn ).c_str() );
|
||||
}
|
||||
|
||||
if ( dop->Fpc != 0 )
|
||||
{
|
||||
appendValueAttribute( &footnotePr, _T( "w:pos" ), FormatUtils::MapValueToWideString( dop->Fpc, &FootnotePositionMap[0][0], 4, 12 ).c_str() );
|
||||
appendValueAttribute( &footnotePr, L"w:pos", FormatUtils::MapValueToWideString( dop->Fpc, &FootnotePositionMap[0][0], 4, 12 ).c_str() );
|
||||
}
|
||||
|
||||
if ( footnotePr.GetAttributeCount() > 0 )
|
||||
@ -173,7 +177,7 @@ namespace DocFileFormat
|
||||
writeRsidList();
|
||||
|
||||
//close w:settings
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "w:settings" ) );
|
||||
m_oXmlWriter.WriteNodeEnd( L"w:settings" );
|
||||
|
||||
this->_ctx->_docx->SettingsXML = std::wstring( m_oXmlWriter.GetXmlString() );
|
||||
}
|
||||
@ -181,368 +185,368 @@ namespace DocFileFormat
|
||||
void SettingsMapping::writeRsidList()
|
||||
{
|
||||
//convert the rsid list
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:rsids" ) );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:rsids" );
|
||||
|
||||
for ( std::set<std::wstring>::iterator iter = this->_ctx->AllRsids.begin(); iter != this->_ctx->AllRsids.end(); iter++ )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:rsid" ), TRUE );
|
||||
m_oXmlWriter.WriteAttribute( _T( "w:val" ), iter->c_str() );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:rsid", TRUE );
|
||||
m_oXmlWriter.WriteAttribute( L"w:val", iter->c_str() );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "w:rsids" ) );
|
||||
m_oXmlWriter.WriteNodeEnd( L"w:rsids" );
|
||||
}
|
||||
|
||||
void SettingsMapping::writeCompatibilitySettings(const WordDocumentProperties* dop)
|
||||
{
|
||||
//compatibility settings
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:compat" ) );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:compat" );
|
||||
|
||||
//some settings must always be written
|
||||
|
||||
if ( dop->fUseNormalStyleForList )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:useNormalStyleForList" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:useNormalStyleForList", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( dop->fDontUseIndentAsNumberingTabStop )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:doNotUseIndentAsNumberingTabStop" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:doNotUseIndentAsNumberingTabStop", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( dop->fFELineBreak11 )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:useAltKinsokuLineBreakRules" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:useAltKinsokuLineBreakRules", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( dop->fAllowSpaceOfSameStyleInTable )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:allowSpaceOfSameStyleInTable" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:allowSpaceOfSameStyleInTable", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( dop->fWW11IndentRules )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:doNotSuppressIndentation" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:doNotSuppressIndentation", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( dop->fDontAutofitConstrainedTables )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:doNotAutofitConstrainedTables" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:doNotAutofitConstrainedTables", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( dop->fAutofitLikeWW11 )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:autofitToFirstFixedWidthCell" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:autofitToFirstFixedWidthCell", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( dop->fUnderlineTabInNumList )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:underlineTabInNumList" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:underlineTabInNumList", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( dop->fHangulWidthLikeWW11 )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:displayHangulFixedWidth" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:displayHangulFixedWidth", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( dop->fSplitPgBreakAndParaMark )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:splitPgBreakAndParaMark" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:splitPgBreakAndParaMark", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( dop->fDontVertAlignCellWithSp )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:doNotVertAlignCellWithSp" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:doNotVertAlignCellWithSp", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( dop->fDontBreakConstrainedForcedTables )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:doNotBreakConstrainedForcedTable" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:doNotBreakConstrainedForcedTable", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( dop->fDontVertAlignInTxbx )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:doNotVertAlignInTxbx" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:doNotVertAlignInTxbx", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( dop->fWord11KerningPairs )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:useAnsiKerningPairs" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:useAnsiKerningPairs", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( dop->fCachedColBalance )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:cachedColBalance" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:cachedColBalance", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
//others are saved in the file
|
||||
if ( !dop->fDontAdjustLineHeightInTable )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:adjustLineHeightInTable" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:adjustLineHeightInTable", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( dop->fAlignTablesRowByRow )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:alignTablesRowByRow" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:alignTablesRowByRow", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( dop->fApplyBreakingRules )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:applyBreakingRules" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:applyBreakingRules", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( dop->fUseAutoSpaceForFullWidthAlpha )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:autoSpaceLikeWord95" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:autoSpaceLikeWord95", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( !dop->fDntBlnSbDbWid )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:balanceSingleByteDoubleByteWidth" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:balanceSingleByteDoubleByteWidth", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( dop->fConvMailMergeEsc )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:convMailMergeEsc" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:convMailMergeEsc", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( dop->fDontBreakWrappedTables )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:doNotBreakWrappedTables" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:doNotBreakWrappedTables", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( !dop->fExpShRtn )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:doNotExpandShiftReturn" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:doNotExpandShiftReturn", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( !dop->fLeaveBackslashAlone )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:doNotLeaveBackslashAlone" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:doNotLeaveBackslashAlone", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( dop->fDontSnapToGridInCell )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:doNotSnapToGridInCell" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:doNotSnapToGridInCell", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( dop->fDontUseAsianBreakRules )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:doNotUseEastAsianBreakRules" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:doNotUseEastAsianBreakRules", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( dop->fDontUseHTMLParagraphAutoSpacing )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:doNotUseHTMLParagraphAutoSpacing" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:doNotUseHTMLParagraphAutoSpacing", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( dop->fDontWrapTextWithPunct )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:doNotWrapTextWithPunct" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:doNotWrapTextWithPunct", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( dop->fFtnLayoutLikeWW8 )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:footnoteLayoutLikeWW8" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:footnoteLayoutLikeWW8", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( dop->fForgetLastTabAlign )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:forgetLastTabAlignment" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:forgetLastTabAlignment", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( dop->fGrowAutofit )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:growAutofit" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:growAutofit", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( dop->fLayoutRawTableWidth )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:layoutRawTableWidth" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:layoutRawTableWidth", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( dop->fLayoutTableRowsApart )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:layoutTableRowsApart" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:layoutTableRowsApart", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( dop->fLineWrapLikeWord6 )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:lineWrapLikeWord6" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:lineWrapLikeWord6", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( dop->fMWSmallCaps )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:mwSmallCaps" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:mwSmallCaps", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( dop->fNoColumnBalance )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:noColumnBalance" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:noColumnBalance", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( dop->fNoLeading )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:noLeading" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:noLeading", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( dop->fNoSpaceRaiseLower )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:noSpaceRaiseLower" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:noSpaceRaiseLower", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( dop->fNoTabForInd )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:noTabHangInd" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:noTabHangInd", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( dop->fPrintBodyBeforeHdr )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:printBodyTextBeforeHeader" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:printBodyTextBeforeHeader", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( dop->fMapPrintTextColor )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:printColBlack" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:printColBlack", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( dop->fDontAllowFieldEndSelect )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:selectFldWithFirstOrLastChar" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:selectFldWithFirstOrLastChar", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( dop->fSpLayoutLikeWW8 )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:shapeLayoutLikeWW8" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:shapeLayoutLikeWW8", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( dop->fShowBreaksInFrames )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:showBreaksInFrames" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:showBreaksInFrames", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( dop->fMakeSpaceForUL )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:spaceForUL" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:spaceForUL", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( dop->fTruncDxaExpand )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:spacingInWholePoints" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:spacingInWholePoints", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( dop->fSubOnSize )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:subFontBySize" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:subFontBySize", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( dop->fSuppressSpbfAfterPageBreak )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:suppressSpBfAfterPgBrk" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:suppressSpBfAfterPgBrk", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( dop->fSuppressTopSpacing )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:suppressTopSpacing" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:suppressTopSpacing", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( dop->fSwapBordersFacingPgs )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:swapBordersFacingPages" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:swapBordersFacingPages", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( !dop->fDntULTrlSpc )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:ulTrailSpace" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:ulTrailSpace", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( dop->fPrintMet )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:usePrinterMetrics" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:usePrinterMetrics", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( dop->fUseWord2002TableStyleRules )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:useWord2002TableStyleRules" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:useWord2002TableStyleRules", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( dop->fUserWord97LineBreakingRules )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:useWord97LineBreakRules" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:useWord97LineBreakRules", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( dop->fWPJust )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:wpJustification" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:wpJustification", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( dop->fWPSpace )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:wpSpaceWidth" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:wpSpaceWidth", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
if ( dop->fWrapTrailSpaces )
|
||||
{
|
||||
m_oXmlWriter.WriteNodeBegin( _T( "w:wrapTrailSpaces" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "" ), TRUE );
|
||||
m_oXmlWriter.WriteNodeBegin( L"w:wrapTrailSpaces", TRUE );
|
||||
m_oXmlWriter.WriteNodeEnd( L"", TRUE );
|
||||
}
|
||||
|
||||
m_oXmlWriter.WriteNodeEnd( _T( "w:compat" ) );
|
||||
m_oXmlWriter.WriteNodeEnd( L"w:compat" );
|
||||
}
|
||||
}
|
||||
@ -112,23 +112,14 @@ namespace DocFileFormat
|
||||
friend class PropertiesMapping;
|
||||
|
||||
private:
|
||||
/// 24-bit foreground color
|
||||
unsigned int cvFore;
|
||||
bool cvForeAuto;
|
||||
/// Foreground color.
|
||||
/// Only used if cvFore is not set
|
||||
int icoFore;
|
||||
/// 24-bit background color
|
||||
unsigned int cvBack;
|
||||
bool cvBackAuto;
|
||||
/// Background color.
|
||||
/// Only used if cvBack is not set.
|
||||
int icoBack;
|
||||
/// Shading pattern
|
||||
ShadingPattern ipat;
|
||||
/// Shading type
|
||||
ShadingType shadingType;
|
||||
/// Shading special vale
|
||||
unsigned int cvFore; // 24-bit foreground color
|
||||
bool cvForeAuto;
|
||||
int icoFore; // Foreground color.
|
||||
unsigned int cvBack;
|
||||
bool cvBackAuto;
|
||||
int icoBack;
|
||||
ShadingPattern ipat;
|
||||
ShadingType shadingType;
|
||||
ShadingSpecialValue shadingSpecialValue;
|
||||
|
||||
public:
|
||||
@ -236,7 +227,7 @@ namespace DocFileFormat
|
||||
else if (0x0F == icoBack) { cvBack = RGB2 (0x80, 0x80, 0x80); }
|
||||
else if (0x10 == icoBack) { cvBack = RGB2 (0xC0, 0xC0, 0xC0); }
|
||||
|
||||
// TODO : если будут документы с такими цветовыми палитрами
|
||||
// .... если будут документы с такими цветовыми палитрами
|
||||
|
||||
//if ((cvFore == 0) && (icoFore == 0x0) && (cvBack == 0) && (icoBack == 0x0) && (ipat == Automatic))
|
||||
//{
|
||||
@ -250,7 +241,6 @@ namespace DocFileFormat
|
||||
}
|
||||
else
|
||||
{
|
||||
//throw new ByteParseException("Cannot parse the struct SHD, the length of the struct doesn't match");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -96,6 +96,8 @@ namespace DocFileFormat
|
||||
{
|
||||
friend class TextboxMapping;
|
||||
public:
|
||||
static const int STRUCTURE_SIZE = 22;
|
||||
|
||||
struct FTXBXSReusable
|
||||
{
|
||||
int iNextReuse;
|
||||
@ -108,8 +110,6 @@ namespace DocFileFormat
|
||||
int cTxbxEdit; // This value MUST be zero and MUST be ignored.
|
||||
};
|
||||
|
||||
static const int STRUCTURE_SIZE = 22;
|
||||
|
||||
FTXBXS ()
|
||||
{
|
||||
|
||||
|
||||
@ -50,9 +50,8 @@ namespace DocFileFormat
|
||||
void SetTextboxStyle(const std::wstring & style);
|
||||
|
||||
private:
|
||||
static int TextboxCount;
|
||||
|
||||
static int TextboxCount;
|
||||
|
||||
int m_nTBIndex;
|
||||
|
||||
double m_dxTextLeft;
|
||||
|
||||
@ -189,7 +189,6 @@ namespace DocFileFormat
|
||||
return res;
|
||||
}
|
||||
//---------------------------------------------------------------
|
||||
static int count_vml_objects = 0;
|
||||
void VMLPictureMapping::appendStyleProperty(std::wstring* b, const std::wstring& propName, const std::wstring& propValue) const
|
||||
{
|
||||
if ( b != NULL )
|
||||
@ -215,8 +214,6 @@ namespace DocFileFormat
|
||||
m_isEmbedded = false;
|
||||
|
||||
m_imageData = new XMLTools::XMLElement<wchar_t>( _T( "v:imagedata" ) );
|
||||
|
||||
m_ShapeId = std::wstring(L"_x0000_i") + FormatUtils::IntToWideString(1024 + (count_vml_objects++));
|
||||
}
|
||||
|
||||
VMLPictureMapping::~VMLPictureMapping()
|
||||
@ -263,7 +260,12 @@ namespace DocFileFormat
|
||||
|
||||
m_pXmlWriter->WriteAttribute( _T( "type" ), std::wstring( _T( "#" ) + VMLShapeTypeMapping::GenerateTypeId(&type)).c_str());
|
||||
|
||||
m_pXmlWriter->WriteAttribute( _T( "id" ), m_ShapeId.c_str() );
|
||||
count_vml_objects++;
|
||||
|
||||
if (m_shapeId.empty())
|
||||
m_shapeId = std::wstring(L"_x0000_s") + FormatUtils::IntToWideString(1024 + count_vml_objects);
|
||||
|
||||
m_pXmlWriter->WriteAttribute( _T( "id" ), m_shapeId.c_str() );
|
||||
|
||||
if (m_isOlePreview)
|
||||
{
|
||||
@ -426,11 +428,6 @@ namespace DocFileFormat
|
||||
m_pXmlWriter->WriteNodeEnd( _T( "v:shape" ) );
|
||||
}
|
||||
|
||||
std::wstring VMLPictureMapping::GetShapeId () const
|
||||
{
|
||||
return m_ShapeId;
|
||||
}
|
||||
|
||||
void VMLPictureMapping::writePictureBorder( const std::wstring & name, const BorderCode* brc )
|
||||
{
|
||||
if (!brc || name.empty()) return;
|
||||
|
||||
@ -54,8 +54,6 @@ namespace DocFileFormat
|
||||
VMLPictureMapping( ConversionContext* ctx, XMLTools::CStringXmlWriter* writer, bool olePreview, IMapping* caller, bool isInlinePicture = false );
|
||||
virtual ~VMLPictureMapping();
|
||||
virtual void Apply( IVisitable* visited );
|
||||
std::wstring GetShapeId() const;
|
||||
|
||||
private:
|
||||
/// Writes a border element
|
||||
void writePictureBorder (const std::wstring & name, const BorderCode* brc);
|
||||
@ -75,12 +73,13 @@ namespace DocFileFormat
|
||||
bool m_isEmbedded;
|
||||
std::string m_embeddedData;
|
||||
std::wstring m_equationXml;
|
||||
|
||||
std::wstring m_shapeId;
|
||||
private:
|
||||
|
||||
ConversionContext* m_ctx;
|
||||
IMapping* m_caller;
|
||||
int m_nImageId;
|
||||
std::wstring m_ShapeId;
|
||||
|
||||
bool m_isOlePreview;
|
||||
bool m_isInlinePicture;
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -68,7 +68,8 @@ namespace DocFileFormat
|
||||
static std::wstring mapHorizontalPosition (PositionHorizontal hPos );
|
||||
static std::wstring mapHorizontalPositionRelative(int hRel );
|
||||
|
||||
bool m_isBullete;
|
||||
bool m_isBullete;
|
||||
std::wstring m_shapeId;
|
||||
private:
|
||||
|
||||
void ApplyPrimitives (DrawingPrimitives * primitives );
|
||||
@ -129,7 +130,7 @@ namespace DocFileFormat
|
||||
BlipStoreContainer* m_pBlipStore;
|
||||
int m_nImageId;
|
||||
std::wstring m_textPathStyle;
|
||||
ConversionContext* m_ctx;
|
||||
ConversionContext* m_context;
|
||||
PictureDescriptor* m_pict;
|
||||
|
||||
XMLTools::XMLElement<wchar_t> m_fill;
|
||||
|
||||
@ -37,6 +37,8 @@
|
||||
|
||||
namespace DocFileFormat
|
||||
{
|
||||
static int count_vml_objects = 0;
|
||||
|
||||
class VMLShapeTypeMapping: public PropertiesMapping, public IMapping
|
||||
{
|
||||
private:
|
||||
|
||||
@ -49,7 +49,7 @@ namespace DocFileFormat
|
||||
EndnoteReferenceCharactersPlex(NULL), FieldsPlex(NULL), FootnoteDocumentFieldsPlex(NULL),
|
||||
EndnoteDocumentFieldsPlex(NULL), HeadersAndFootersDocumentFieldsPlex(NULL), HeaderStoriesPlex(NULL),
|
||||
AnnotationsReferencePlex(NULL), IndividualCommentsPlex(NULL), TextboxBreakPlex(NULL), TextboxBreakPlexHeader(NULL),
|
||||
TextboxIndividualPlex(NULL),
|
||||
TextboxIndividualPlex(NULL),AssocNames(NULL), BookmarkAnnotNames(NULL), Captions(NULL), AutoCaptions(NULL), ListPlex(NULL),
|
||||
OfficeDrawingPlex(NULL), OfficeDrawingPlexHeader(NULL), SectionPlex(NULL), BookmarkStartPlex(NULL), BookmarkEndPlex(NULL),
|
||||
AutoTextPlex(NULL), AllPapxFkps(NULL), AllChpxFkps(NULL), AllPapx(NULL), AllPapxVector(NULL), AllSepx(NULL), Styles(NULL), listTable(NULL),
|
||||
AnnotationOwners(NULL), DocProperties(NULL), listFormatOverrideTable(NULL), headerAndFooterTable(NULL), encryptionHeader(NULL)
|
||||
@ -218,10 +218,14 @@ namespace DocFileFormat
|
||||
m_pStorage->GetStream ("WordDocument", &TableStream);
|
||||
}
|
||||
|
||||
RevisionAuthorTable = new StringTable<WideString> (TableStream, FIB->m_FibWord97.fcSttbfRMark, FIB->m_FibWord97.lcbSttbfRMark, bOlderVersion);
|
||||
FontTable = new StringTable<FontFamilyName> (TableStream, FIB->m_FibWord97.fcSttbfFfn, FIB->m_FibWord97.lcbSttbfFfn, bOlderVersion);
|
||||
BookmarkNames = new StringTable<WideString> (TableStream, FIB->m_FibWord97.fcSttbfBkmk, FIB->m_FibWord97.lcbSttbfBkmk, bOlderVersion);
|
||||
AutoTextNames = new StringTable<WideString> (TableStream, FIB->m_FibWord97.fcSttbfGlsy, FIB->m_FibWord97.lcbSttbfGlsy, bOlderVersion);
|
||||
RevisionAuthorTable = new StringTable<WideString> (TableStream, FIB->m_FibWord97.fcSttbfRMark, FIB->m_FibWord97.lcbSttbfRMark, bOlderVersion);
|
||||
FontTable = new StringTable<FontFamilyName> (TableStream, FIB->m_FibWord97.fcSttbfFfn, FIB->m_FibWord97.lcbSttbfFfn, bOlderVersion);
|
||||
BookmarkNames = new StringTable<WideString> (TableStream, FIB->m_FibWord97.fcSttbfBkmk, FIB->m_FibWord97.lcbSttbfBkmk, bOlderVersion);
|
||||
AutoTextNames = new StringTable<WideString> (TableStream, FIB->m_FibWord97.fcSttbfGlsy, FIB->m_FibWord97.lcbSttbfGlsy, bOlderVersion);
|
||||
AssocNames = new StringTable<WideString> (TableStream, FIB->m_FibWord97.fcSttbfAssoc, FIB->m_FibWord97.lcbSttbfAssoc, bOlderVersion);
|
||||
BookmarkAnnotNames = new StringTable<WideString> (TableStream, FIB->m_FibWord97.fcSttbfAtnBkmk, FIB->m_FibWord97.lcbSttbfAtnBkmk, bOlderVersion);
|
||||
Captions = new StringTable<WideString> (TableStream, FIB->m_FibWord97.fcSttbfCaption, FIB->m_FibWord97.lcbSttbfCaption, bOlderVersion);
|
||||
AutoCaptions = new StringTable<WideString> (TableStream, FIB->m_FibWord97.fcSttbfAutoCaption, FIB->m_FibWord97.lcbSttbfAutoCaption, bOlderVersion);
|
||||
|
||||
if (m_pCallFunc)
|
||||
{
|
||||
@ -268,7 +272,7 @@ namespace DocFileFormat
|
||||
OfficeDrawingPlex = new Plex<Spa> (Spa::GetSize(bOlderVersion), TableStream, FIB->m_FibWord97.fcPlcSpaMom, FIB->m_FibWord97.lcbPlcSpaMom, bOlderVersion);
|
||||
OfficeDrawingPlexHeader = new Plex<Spa> (Spa::GetSize(bOlderVersion), TableStream, FIB->m_FibWord97.fcPlcSpaHdr, FIB->m_FibWord97.lcbPlcSpaHdr, bOlderVersion);
|
||||
|
||||
TextboxIndividualPlex = new Plex<EmptyStructure> (EmptyStructure::STRUCTURE_SIZE, TableStream, FIB->m_FibWord97.fcPlcftxbxTxt, FIB->m_FibWord97.lcbPlcftxbxTxt, bOlderVersion);
|
||||
TextboxIndividualPlex = new Plex<FTXBXS> (FTXBXS::STRUCTURE_SIZE, TableStream, FIB->m_FibWord97.fcPlcftxbxTxt, FIB->m_FibWord97.lcbPlcftxbxTxt, bOlderVersion);
|
||||
|
||||
SectionPlex = new Plex<SectionDescriptor> (SectionDescriptor::STRUCTURE_SIZE, TableStream, FIB->m_FibWord97.fcPlcfSed, FIB->m_FibWord97.lcbPlcfSed, bOlderVersion);
|
||||
BookmarkStartPlex = new Plex<BookmarkFirst> (BookmarkFirst::STRUCTURE_SIZE, TableStream, FIB->m_FibWord97.fcPlcfBkf, FIB->m_FibWord97.lcbPlcfBkf, bOlderVersion);
|
||||
@ -286,12 +290,13 @@ namespace DocFileFormat
|
||||
}
|
||||
}
|
||||
|
||||
AutoTextPlex = new Plex<EmptyStructure> (EmptyStructure::STRUCTURE_SIZE, TableStream, FIB->m_FibWord97.fcPlcfGlsy, FIB->m_FibWord97.lcbPlcfGlsy, bOlderVersion);
|
||||
FieldsPlex = new Plex<FieldCharacter> (FieldCharacter::STRUCTURE_SIZE, TableStream, FIB->m_FibWord97.fcPlcfFldMom, FIB->m_FibWord97.lcbPlcfFldMom, bOlderVersion);
|
||||
FootnoteDocumentFieldsPlex = new Plex<FieldCharacter> (FieldCharacter::STRUCTURE_SIZE, TableStream, FIB->m_FibWord97.fcPlcfFldFtn, FIB->m_FibWord97.lcbPlcfFldFtn, bOlderVersion);
|
||||
EndnoteDocumentFieldsPlex = new Plex<FieldCharacter> (FieldCharacter::STRUCTURE_SIZE, TableStream, FIB->m_FibWord97.fcPlcfFldEdn, FIB->m_FibWord97.lcbPlcfFldEdn, bOlderVersion);
|
||||
HeadersAndFootersDocumentFieldsPlex = new Plex<FieldCharacter> (FieldCharacter::STRUCTURE_SIZE, TableStream, FIB->m_FibWord97.fcPlcfFldHdr, FIB->m_FibWord97.lcbPlcfFldHdr, bOlderVersion);
|
||||
|
||||
AutoTextPlex = new Plex<EmptyStructure>(EmptyStructure::STRUCTURE_SIZE, TableStream, FIB->m_FibWord97.fcPlcfGlsy, FIB->m_FibWord97.lcbPlcfGlsy, bOlderVersion);
|
||||
FieldsPlex = new Plex<FieldCharacter>(FieldCharacter::STRUCTURE_SIZE, TableStream, FIB->m_FibWord97.fcPlcfFldMom, FIB->m_FibWord97.lcbPlcfFldMom, bOlderVersion);
|
||||
FootnoteDocumentFieldsPlex = new Plex<FieldCharacter>(FieldCharacter::STRUCTURE_SIZE, TableStream, FIB->m_FibWord97.fcPlcfFldFtn, FIB->m_FibWord97.lcbPlcfFldFtn, bOlderVersion);
|
||||
EndnoteDocumentFieldsPlex = new Plex<FieldCharacter>(FieldCharacter::STRUCTURE_SIZE, TableStream, FIB->m_FibWord97.fcPlcfFldEdn, FIB->m_FibWord97.lcbPlcfFldEdn, bOlderVersion);
|
||||
HeadersAndFootersDocumentFieldsPlex = new Plex<FieldCharacter>(FieldCharacter::STRUCTURE_SIZE, TableStream, FIB->m_FibWord97.fcPlcfFldHdr, FIB->m_FibWord97.lcbPlcfFldHdr, bOlderVersion);
|
||||
ListPlex = new Plex<ListNumCache> (ListNumCache::STRUCTURE_SIZE, TableStream, FIB->m_FibWord97.fcPlcfBteLvc, FIB->m_FibWord97.lcbPlcfBteLvc, bOlderVersion);
|
||||
|
||||
if (m_pCallFunc)
|
||||
{
|
||||
m_pCallFunc->OnProgress(m_pCallFunc->caller, DOC_ONPROGRESSEVENT_ID, 200000 );
|
||||
@ -592,6 +597,11 @@ namespace DocFileFormat
|
||||
RELEASEOBJECT(FontTable);
|
||||
RELEASEOBJECT(BookmarkNames);
|
||||
RELEASEOBJECT(AutoTextNames);
|
||||
RELEASEOBJECT(AutoCaptions);
|
||||
RELEASEOBJECT(Captions);
|
||||
RELEASEOBJECT(BookmarkAnnotNames);
|
||||
RELEASEOBJECT(AssocNames);
|
||||
|
||||
RELEASEOBJECT(IndividualFootnotesPlex);
|
||||
RELEASEOBJECT(FootnoteReferenceCharactersPlex);
|
||||
RELEASEOBJECT(IndividualEndnotesPlex);
|
||||
@ -613,6 +623,7 @@ namespace DocFileFormat
|
||||
RELEASEOBJECT(BookmarkStartPlex);
|
||||
RELEASEOBJECT(BookmarkEndPlex);
|
||||
RELEASEOBJECT(AutoTextPlex);
|
||||
RELEASEOBJECT(ListPlex);
|
||||
RELEASEOBJECT(Styles);
|
||||
RELEASEOBJECT(listTable);
|
||||
RELEASEOBJECT(AllPapx);
|
||||
@ -699,8 +710,7 @@ namespace DocFileFormat
|
||||
{
|
||||
FormattedDiskPageCHPX *fkp = (*iter);
|
||||
|
||||
// get the CHPX
|
||||
|
||||
// get the CHPX
|
||||
for (unsigned int j = 0; j < fkp->grpchpxSize; ++j)
|
||||
{
|
||||
if ( ( fkp->rgfc[j] < fcMin ) && ( fkp->rgfc[j + 1] > fcMin ) )
|
||||
|
||||
@ -177,6 +177,10 @@ namespace DocFileFormat
|
||||
StringTable<FontFamilyName> *FontTable; // A list of all font names, used in the doucument
|
||||
StringTable<WideString> *BookmarkNames;
|
||||
StringTable<WideString> *AutoTextNames;
|
||||
StringTable<WideString> *AssocNames;
|
||||
StringTable<WideString> *BookmarkAnnotNames;
|
||||
StringTable<WideString> *Captions;
|
||||
StringTable<WideString> *AutoCaptions;
|
||||
|
||||
Plex<EmptyStructure> *IndividualFootnotesPlex; //A plex of locations of individual footnotes
|
||||
Plex<FootnoteDescriptor> *FootnoteReferenceCharactersPlex; //A plex of footnote reference characters
|
||||
@ -187,7 +191,7 @@ namespace DocFileFormat
|
||||
Plex<EmptyStructure> *HeaderStoriesPlex; //A plex of the header document
|
||||
Plex<EmptyStructure> *IndividualCommentsPlex; // A plex with all ATRDPre10 structs
|
||||
|
||||
Plex<EmptyStructure> *TextboxIndividualPlex;
|
||||
Plex<FTXBXS> *TextboxIndividualPlex;
|
||||
Plex<Tbkd> *TextboxBreakPlex; // Describes the breaks inside the textbox subdocument
|
||||
Plex<Tbkd> *TextboxBreakPlexHeader; // Describes the breaks inside the header textbox subdocument
|
||||
|
||||
@ -200,13 +204,14 @@ namespace DocFileFormat
|
||||
Plex<BookmarkFirst> *BookmarkStartPlex;
|
||||
Plex<EmptyStructure> *BookmarkEndPlex;
|
||||
|
||||
Plex<ListNumCache> *ListPlex;
|
||||
Plex<FieldCharacter> *FieldsPlex;
|
||||
Plex<FieldCharacter> *FootnoteDocumentFieldsPlex;
|
||||
Plex<FieldCharacter> *EndnoteDocumentFieldsPlex;
|
||||
Plex<FieldCharacter> *HeadersAndFootersDocumentFieldsPlex;
|
||||
Plex<AnnotationReferenceDescriptor> *AnnotationsReferencePlex;
|
||||
Plex<EmptyStructure> *AutoTextPlex; // Each character position specifies the beginning of\
|
||||
a range of text that constitutes the contents of an AutoText item
|
||||
Plex<EmptyStructure> *AutoTextPlex;
|
||||
// Each character position specifies the beginning of a range of text that constitutes the contents of an AutoText item
|
||||
|
||||
};
|
||||
}
|
||||
|
||||
@ -40,7 +40,8 @@ SOURCES += \
|
||||
../../../Common/3dParty/pole/pole.cpp \
|
||||
../../DocDocxConverter/EncryptionHeader.cpp \
|
||||
../../DocDocxConverter/DrawingPrimitives.cpp \
|
||||
../../DocDocxConverter/Spa.cpp
|
||||
../../DocDocxConverter/Spa.cpp \
|
||||
../../DocDocxConverter/OleObject.cpp
|
||||
|
||||
build_fast {
|
||||
SOURCES += \
|
||||
|
||||
@ -555,6 +555,10 @@
|
||||
RelativePath="..\..\DocDocxConverter\OfficeArtContent.h"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\DocDocxConverter\OleObject.cpp"
|
||||
>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\DocDocxConverter\OleObject.h"
|
||||
>
|
||||
|
||||
@ -50,8 +50,10 @@
|
||||
|
||||
int _tmain(int argc, _TCHAR* argv[])
|
||||
{
|
||||
if (argc < 2) return 1;
|
||||
|
||||
std::wstring sSrcDoc = argv[1];
|
||||
std::wstring sDstDocx = argv[2];
|
||||
std::wstring sDstDocx = argc > 2 ? argv[2] : sSrcDoc + L"-my.docx";
|
||||
|
||||
std::wstring outputDir = FileSystem::Directory::GetFolderPath(sDstDocx);
|
||||
std::wstring dstTempPath = FileSystem::Directory::CreateDirectoryWithUniqueName(outputDir);
|
||||
|
||||
@ -71,7 +71,7 @@ namespace Writers
|
||||
if(false == IsEmpty())
|
||||
{
|
||||
OOX::CPath pathChartDir = m_sDir + FILE_SEPARATOR_STR + _T("word") + FILE_SEPARATOR_STR + _T("charts");
|
||||
FileSystem::Directory::CreateDirectory(string2std_string(pathChartDir.GetPath()));
|
||||
FileSystem::Directory::CreateDirectory(pathChartDir.GetPath());
|
||||
|
||||
for(int i = 0, length = m_aCharts.size(); i < length; ++i)
|
||||
{
|
||||
@ -80,7 +80,7 @@ namespace Writers
|
||||
OOX::CPath filePath = pathChartDir + FILE_SEPARATOR_STR + elem->filename;
|
||||
|
||||
NSFile::CFileBinary oFile;
|
||||
oFile.CreateFileW(string2std_string(filePath.GetPath()));
|
||||
oFile.CreateFileW(filePath.GetPath());
|
||||
oFile.WriteStringUTF8(L"<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\r\n");
|
||||
oFile.WriteStringUTF8(elem->content);
|
||||
oFile.CloseFile();
|
||||
@ -91,14 +91,15 @@ namespace Writers
|
||||
}
|
||||
}
|
||||
}
|
||||
void AddChart(std::wstring& content, CString& sRelsName, CString& sFileName, int& index)
|
||||
void AddChart(std::wstring& content, std::wstring& sRelsName, std::wstring& sFileName, int& index)
|
||||
{
|
||||
ChartElem* pChartElem = new ChartElem();
|
||||
pChartElem->content = content;
|
||||
pChartElem->index = nChartCount + 1;
|
||||
nChartCount++;
|
||||
pChartElem->filename.Format(_T("chart%d.xml"), pChartElem->index);
|
||||
sRelsName = _T("charts/") + pChartElem->filename;
|
||||
pChartElem->filename.Format(L"chart%d.xml", pChartElem->index);
|
||||
|
||||
sRelsName = L"charts/" + pChartElem->filename;
|
||||
sFileName = pChartElem->filename;
|
||||
index = pChartElem->index;
|
||||
|
||||
|
||||
@ -53,13 +53,22 @@ namespace Writers
|
||||
|
||||
CFile oFile;
|
||||
oFile.CreateFile(filePath.GetPath());
|
||||
oFile.WriteStringUTF8(CString(_T("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?><w:document xmlns:wpc=\"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas\" xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" xmlns:o=\"urn:schemas-microsoft-com:office:office\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" xmlns:m=\"http://schemas.openxmlformats.org/officeDocument/2006/math\" xmlns:v=\"urn:schemas-microsoft-com:vml\" xmlns:wp14=\"http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing\" xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\" xmlns:w10=\"urn:schemas-microsoft-com:office:word\" xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" xmlns:w14=\"http://schemas.microsoft.com/office/word/2010/wordml\" xmlns:wpg=\"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup\" xmlns:wpi=\"http://schemas.microsoft.com/office/word/2010/wordprocessingInk\" xmlns:wne=\"http://schemas.microsoft.com/office/word/2006/wordml\" xmlns:wps=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\" mc:Ignorable=\"w14 wp14\"><w:body>")));
|
||||
oFile.WriteStringUTF8(m_oContent.GetData());
|
||||
oFile.WriteStringUTF8(CString(_T("<w:sectPr >")));
|
||||
oFile.WriteStringUTF8(WriteSectPrHdrFtr());
|
||||
oFile.WriteStringUTF8(m_oSecPr.GetData());
|
||||
oFile.WriteStringUTF8(CString(_T("</w:sectPr>")));
|
||||
oFile.WriteStringUTF8(CString(_T("</w:body></w:document>")));
|
||||
oFile.WriteStringUTF8(CString(_T("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>")));
|
||||
oFile.WriteStringUTF8(CString(_T("<w:document xmlns:wpc=\"http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas\" xmlns:mc=\"http://schemas.openxmlformats.org/markup-compatibility/2006\" xmlns:o=\"urn:schemas-microsoft-com:office:office\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" xmlns:m=\"http://schemas.openxmlformats.org/officeDocument/2006/math\" xmlns:v=\"urn:schemas-microsoft-com:vml\" xmlns:wp14=\"http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing\" xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\" xmlns:w10=\"urn:schemas-microsoft-com:office:word\" xmlns:w=\"http://schemas.openxmlformats.org/wordprocessingml/2006/main\" xmlns:w14=\"http://schemas.microsoft.com/office/word/2010/wordml\" xmlns:wpg=\"http://schemas.microsoft.com/office/word/2010/wordprocessingGroup\" xmlns:wpi=\"http://schemas.microsoft.com/office/word/2010/wordprocessingInk\" xmlns:wne=\"http://schemas.microsoft.com/office/word/2006/wordml\" xmlns:wps=\"http://schemas.microsoft.com/office/word/2010/wordprocessingShape\" mc:Ignorable=\"w14 wp14\">")));
|
||||
|
||||
oFile.WriteStringUTF8(m_oBackground.GetData());
|
||||
|
||||
oFile.WriteStringUTF8(CString(_T("<w:body>")));
|
||||
oFile.WriteStringUTF8(m_oContent.GetData());
|
||||
|
||||
oFile.WriteStringUTF8(CString(_T("<w:sectPr >")));
|
||||
oFile.WriteStringUTF8(WriteSectPrHdrFtr());
|
||||
oFile.WriteStringUTF8(m_oSecPr.GetData());
|
||||
oFile.WriteStringUTF8(CString(_T("</w:sectPr>")));
|
||||
|
||||
oFile.WriteStringUTF8(CString(_T("</w:body>")));
|
||||
|
||||
oFile.WriteStringUTF8(CString(_T("</w:document>")));
|
||||
oFile.CloseFile();
|
||||
}
|
||||
CString WriteSectPrHdrFtr()
|
||||
|
||||
@ -39,7 +39,8 @@ namespace Writers
|
||||
class ContentWriter
|
||||
{
|
||||
public:
|
||||
XmlUtils::CStringWriter m_oContent;
|
||||
XmlUtils::CStringWriter m_oBackground;
|
||||
XmlUtils::CStringWriter m_oContent;
|
||||
XmlUtils::CStringWriter m_oSecPr;
|
||||
};
|
||||
class HdrFtrItem
|
||||
|
||||
@ -74,10 +74,10 @@ namespace Writers
|
||||
{
|
||||
CString sNewImagePath = AddImageGetNewPath();
|
||||
NSFile::CFileBinary oFile;
|
||||
oFile.CreateFileW(string2std_string(sNewImagePath));
|
||||
oFile.CreateFileW(sNewImagePath);
|
||||
oFile.WriteFile(pData, dwSizeRead);
|
||||
oFile.CloseFile();
|
||||
CString sFilename = NSSystemPath::GetFileName(string2std_string(sNewImagePath)).c_str();
|
||||
CString sFilename = NSSystemPath::GetFileName(sNewImagePath);
|
||||
m_aImageNames.push_back(sFilename);
|
||||
}
|
||||
RELEASEARRAYOBJECTS(pData);
|
||||
@ -87,8 +87,8 @@ namespace Writers
|
||||
{
|
||||
OOX::CPath pathNewImg = AddImageGetNewPath();
|
||||
|
||||
NSFile::CFileBinary::Copy(string2std_string(sImg), string2std_string(pathNewImg.GetPath()));
|
||||
CString sFilename = NSSystemPath::GetFileName(string2std_string(pathNewImg.GetPath())).c_str();
|
||||
NSFile::CFileBinary::Copy(sImg, pathNewImg.GetPath());
|
||||
CString sFilename = NSSystemPath::GetFileName(pathNewImg.GetPath()).c_str();
|
||||
m_aImageNames.push_back(sFilename);
|
||||
}
|
||||
};
|
||||
|
||||
@ -265,19 +265,64 @@ public:
|
||||
bBeforeAuto = false;
|
||||
}
|
||||
};
|
||||
class Background
|
||||
{
|
||||
public:
|
||||
docRGB Color;
|
||||
CThemeColor ThemeColor;
|
||||
|
||||
CString sObject;
|
||||
|
||||
bool bColor;
|
||||
bool bThemeColor;
|
||||
|
||||
Background() : bColor (false), bThemeColor(false) {}
|
||||
|
||||
CString Write()
|
||||
{
|
||||
CString sBackground = L"<w:background";
|
||||
|
||||
if(bColor)
|
||||
{
|
||||
sBackground += L" w:color=\"" + Color.ToString() + L"\"";
|
||||
}
|
||||
|
||||
if(bThemeColor && ThemeColor.IsNoEmpty())
|
||||
{
|
||||
if(ThemeColor.bColor)
|
||||
sBackground += L" w:themeColor=\"" + ThemeColor.ToStringColor() + L"\"";
|
||||
if(ThemeColor.bTint)
|
||||
sBackground += L" w:themeColorTint=\"" + ThemeColor.ToStringTint() + L"\"";
|
||||
if(ThemeColor.bShade)
|
||||
sBackground += L" w:themeColorShade=\"" + ThemeColor.ToStringShade() + L"\"";
|
||||
}
|
||||
|
||||
if (!bColor && !bThemeColor)
|
||||
{
|
||||
sBackground += L" w:color=\"ffffff\"";
|
||||
}
|
||||
sBackground += L">";
|
||||
|
||||
sBackground += sObject;
|
||||
|
||||
sBackground += L"</w:background>";
|
||||
return sBackground;
|
||||
}
|
||||
};
|
||||
|
||||
class Shd
|
||||
{
|
||||
public:
|
||||
BYTE Value;
|
||||
docRGB Color;
|
||||
BYTE Value;
|
||||
docRGB Color;
|
||||
CThemeColor ThemeColor;
|
||||
|
||||
bool bColor;
|
||||
bool bThemeColor;
|
||||
Shd()
|
||||
{
|
||||
Value = shd_Nil;
|
||||
bColor = false;
|
||||
Value = shd_Nil;
|
||||
bColor = false;
|
||||
bThemeColor = false;
|
||||
}
|
||||
CString ToString()
|
||||
@ -1801,87 +1846,7 @@ public:
|
||||
return sRes;
|
||||
}
|
||||
};
|
||||
//class CComment
|
||||
//{
|
||||
//public:
|
||||
// int Id;
|
||||
// CString Initials;
|
||||
// CString UserName;
|
||||
// CString Date;
|
||||
// CString Text;
|
||||
// CAtlArray<CComment*> replies;
|
||||
//
|
||||
// bool bId;
|
||||
//public:
|
||||
// CComment()
|
||||
// {
|
||||
// bId = false;
|
||||
// }
|
||||
// ~CComment()
|
||||
// {
|
||||
// for(int i = 0, length = replies.GetCount(); i < length; ++i)
|
||||
// {
|
||||
// delete replies[i];
|
||||
// }
|
||||
// replies.RemoveAll();
|
||||
// }
|
||||
// CString Write()
|
||||
// {
|
||||
// CString sRes;
|
||||
// if(bId)
|
||||
// {
|
||||
// sRes.AppendFormat(_T("<w:comment w:id=\"%d\""), Id);
|
||||
// if(false == UserName.IsEmpty())
|
||||
// {
|
||||
// CString sUserName = XmlUtils::EncodeXmlString(UserName);
|
||||
// sRes.AppendFormat(_T(" w:author=\"%ls\""), sUserName);
|
||||
// }
|
||||
// if(false == Date.IsEmpty())
|
||||
// {
|
||||
// CString sDate = XmlUtils::EncodeXmlString(Date);
|
||||
// sRes.AppendFormat(_T(" w:date=\"%ls\""), sDate);
|
||||
// }
|
||||
// if(false == Initials.IsEmpty())
|
||||
// {
|
||||
// CString sInitials = XmlUtils::EncodeXmlString(Initials);
|
||||
// sRes.AppendFormat(_T(" w:initials=\"%ls\""), sInitials);
|
||||
// }
|
||||
// sRes.Append(_T(">"));
|
||||
//
|
||||
// sRes.Append(WriteCommentContent(this, true));
|
||||
//
|
||||
// sRes.Append(_T("</w:comment>"));
|
||||
// }
|
||||
// return sRes;
|
||||
// }
|
||||
//private:
|
||||
// CString WriteCommentContent(CComment* pComment, bool bCheckLast)
|
||||
// {
|
||||
// CString sRes;
|
||||
// CString sFormat = _T("<w:p><w:pPr><w:spacing w:line=\"240\" w:after=\"0\" w:lineRule=\"auto\" w:before=\"0\"/><w:ind w:firstLine=\"0\" w:left=\"0\" w:right=\"0\"/><w:jc w:val=\"left\"/></w:pPr><w:r><w:rPr><w:rFonts w:eastAsia=\"Arial\" w:ascii=\"Arial\" w:hAnsi=\"Arial\" w:cs=\"Arial\"/><w:sz w:val=\"22\"/></w:rPr><w:t xml:space=\"preserve\">%ls</w:t></w:r></w:p>");
|
||||
// CString sName = XmlUtils::EncodeXmlString(pComment->UserName + _T(":"));
|
||||
// sRes.AppendFormat(sFormat, sName);
|
||||
// if(false == pComment->Text.IsEmpty())
|
||||
// {
|
||||
// CString sText = XmlUtils::EncodeXmlString(pComment->Text);
|
||||
// sRes.AppendFormat(sFormat, sText);
|
||||
// }
|
||||
// if(false == bCheckLast || pComment->replies.GetCount() > 0)
|
||||
// sRes.Append(_T("<w:p><w:pPr><w:pBdr><w:top w:space=\"1\" w:sz=\"4\" w:color=\"auto\" w:val=\"single\"/></w:pBdr></w:pPr></w:p>"));
|
||||
//
|
||||
// if(pComment->replies.GetCount() > 0)
|
||||
// {
|
||||
// for(int i = 0, length = pComment->replies.GetCount(); i < length; ++i)
|
||||
// {
|
||||
// if(i != length - 1)
|
||||
// sRes += WriteCommentContent(pComment->replies[i], false);
|
||||
// else
|
||||
// sRes += WriteCommentContent(pComment->replies[i], bCheckLast);
|
||||
// }
|
||||
// }
|
||||
// return sRes;
|
||||
// }
|
||||
//};
|
||||
|
||||
class CDrawingPropertyWrapPoint
|
||||
{
|
||||
public:
|
||||
@ -1924,41 +1889,42 @@ public:
|
||||
class CDrawingProperty
|
||||
{
|
||||
public:
|
||||
long DataPos;
|
||||
long DataLength;
|
||||
BYTE Type;
|
||||
bool BehindDoc;
|
||||
double DistL;
|
||||
double DistT;
|
||||
double DistR;
|
||||
double DistB;
|
||||
bool LayoutInCell;
|
||||
long DataPos;
|
||||
long DataLength;
|
||||
BYTE Type;
|
||||
bool BehindDoc;
|
||||
double DistL;
|
||||
double DistT;
|
||||
double DistR;
|
||||
double DistB;
|
||||
bool LayoutInCell;
|
||||
unsigned long RelativeHeight;
|
||||
bool BSimplePos;
|
||||
double EffectExtentL;
|
||||
double EffectExtentT;
|
||||
double EffectExtentR;
|
||||
double EffectExtentB;
|
||||
double Width;
|
||||
double Height;
|
||||
BYTE PositionHRelativeFrom;
|
||||
BYTE PositionHAlign;
|
||||
double PositionHPosOffset;
|
||||
double PositionHPctOffset;
|
||||
BYTE PositionVRelativeFrom;
|
||||
BYTE PositionVAlign;
|
||||
double PositionVPosOffset;
|
||||
double PositionVPctOffset;
|
||||
double SimplePosX;
|
||||
double SimplePosY;
|
||||
CDrawingPropertyWrap DrawingPropertyWrap;
|
||||
CString sChartRels;
|
||||
CString sSizeRelH;
|
||||
CString sSizeRelV;
|
||||
int m_nDocPr;
|
||||
CString sGraphicFramePr;
|
||||
bool BSimplePos;
|
||||
double EffectExtentL;
|
||||
double EffectExtentT;
|
||||
double EffectExtentR;
|
||||
double EffectExtentB;
|
||||
double Width;
|
||||
double Height;
|
||||
BYTE PositionHRelativeFrom;
|
||||
BYTE PositionHAlign;
|
||||
double PositionHPosOffset;
|
||||
double PositionHPctOffset;
|
||||
BYTE PositionVRelativeFrom;
|
||||
BYTE PositionVAlign;
|
||||
double PositionVPosOffset;
|
||||
double PositionVPctOffset;
|
||||
double SimplePosX;
|
||||
double SimplePosY;
|
||||
CString sChartRels;
|
||||
CString sSizeRelH;
|
||||
CString sSizeRelV;
|
||||
int m_nDocPr;
|
||||
CString sGraphicFramePr;
|
||||
|
||||
bool bDataPos;
|
||||
CDrawingPropertyWrap DrawingPropertyWrap;
|
||||
|
||||
bool bDataPos;
|
||||
bool bDataLength;
|
||||
bool bType;
|
||||
bool bBehindDoc;
|
||||
@ -1986,36 +1952,37 @@ public:
|
||||
bool bSimplePosX;
|
||||
bool bSimplePosY;
|
||||
bool bDrawingPropertyWrap;
|
||||
CDrawingProperty(int nDocPr)
|
||||
|
||||
CDrawingProperty(int nDocPr)
|
||||
{
|
||||
m_nDocPr = nDocPr;
|
||||
bDataPos = false;
|
||||
m_nDocPr = nDocPr;
|
||||
bDataPos = false;
|
||||
bDataLength = false;
|
||||
bType = false;
|
||||
bBehindDoc = false;
|
||||
bDistL = false;
|
||||
bDistT = false;
|
||||
bDistR = false;
|
||||
bDistB = false;
|
||||
bLayoutInCell = false;
|
||||
bType = false;
|
||||
bBehindDoc = false;
|
||||
bDistL = false;
|
||||
bDistT = false;
|
||||
bDistR = false;
|
||||
bDistB = false;
|
||||
bLayoutInCell = false;
|
||||
bRelativeHeight = false;
|
||||
bBSimplePos = false;
|
||||
bEffectExtentL = false;
|
||||
bEffectExtentT = false;
|
||||
bEffectExtentR = false;
|
||||
bEffectExtentB = false;
|
||||
bWidth = false;
|
||||
bHeight = false;
|
||||
bBSimplePos = false;
|
||||
bEffectExtentL = false;
|
||||
bEffectExtentT = false;
|
||||
bEffectExtentR = false;
|
||||
bEffectExtentB = false;
|
||||
bWidth = false;
|
||||
bHeight = false;
|
||||
bPositionHRelativeFrom = false;
|
||||
bPositionHAlign = false;
|
||||
bPositionHAlign = false;
|
||||
bPositionHPosOffset = false;
|
||||
bPositionHPctOffset = false;
|
||||
bPositionVRelativeFrom = false;
|
||||
bPositionVAlign = false;
|
||||
bPositionVAlign = false;
|
||||
bPositionVPosOffset = false;
|
||||
bPositionVPctOffset = false;
|
||||
bSimplePosX = false;
|
||||
bSimplePosY = false;
|
||||
bSimplePosX = false;
|
||||
bSimplePosY = false;
|
||||
bDrawingPropertyWrap = false;
|
||||
}
|
||||
bool IsChart()
|
||||
@ -2024,284 +1991,284 @@ public:
|
||||
}
|
||||
CString Write()
|
||||
{
|
||||
CString sXml;
|
||||
if(bType)
|
||||
{
|
||||
bool bChart = IsChart();
|
||||
if(c_oAscWrapStyle::Inline == Type)
|
||||
{
|
||||
if(bWidth && bHeight)
|
||||
{
|
||||
__int64 emuWidth = (__int64)(g_dKoef_mm_to_emu * Width);
|
||||
__int64 emuHeight = (__int64)(g_dKoef_mm_to_emu * Height);
|
||||
if(false == bChart)
|
||||
sXml.AppendFormat(_T("<wp:inline xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\" distT=\"0\" distB=\"0\" distL=\"0\" distR=\"0\"><wp:extent cx=\"%lld\" cy=\"%lld\"/>"), emuWidth, emuHeight);
|
||||
else
|
||||
sXml.AppendFormat(_T("<w:drawing><wp:inline distT=\"0\" distB=\"0\" distL=\"0\" distR=\"0\"><wp:extent cx=\"%lld\" cy=\"%lld\"/>"), emuWidth, emuHeight);
|
||||
if(bEffectExtentL && bEffectExtentT && bEffectExtentR && bEffectExtentB)
|
||||
{
|
||||
__int64 emuEffectExtentL = (__int64)(g_dKoef_mm_to_emu * EffectExtentL);
|
||||
__int64 emuEffectExtentT = (__int64)(g_dKoef_mm_to_emu * EffectExtentT);
|
||||
__int64 emuEffectExtentR = (__int64)(g_dKoef_mm_to_emu * EffectExtentR);
|
||||
__int64 emuEffectExtentB = (__int64)(g_dKoef_mm_to_emu * EffectExtentB);
|
||||
sXml.AppendFormat(_T("<wp:effectExtent l=\"%lld\" t=\"%lld\" r=\"%lld\" b=\"%lld\"/>"), emuEffectExtentL, emuEffectExtentT, emuEffectExtentR, emuEffectExtentB);
|
||||
}
|
||||
if(!bType) return L"";
|
||||
|
||||
if(bChart)
|
||||
{
|
||||
sXml.AppendFormat(_T("<wp:docPr id=\"%d\" name=\"Chart %d\"/>"), m_nDocPr, m_nDocPr);
|
||||
}
|
||||
else
|
||||
{
|
||||
sXml.AppendFormat(_T("<wp:docPr id=\"%d\" name=\"\"/>"), m_nDocPr);
|
||||
}
|
||||
if(!sGraphicFramePr.IsEmpty())
|
||||
{
|
||||
sXml.Append(sGraphicFramePr);
|
||||
}
|
||||
else
|
||||
{
|
||||
sXml.Append(_T("<wp:cNvGraphicFramePr/>"));
|
||||
}
|
||||
if(bChart)
|
||||
{
|
||||
sXml.AppendFormat(_T("<a:graphic xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\"><a:graphicData uri=\"http://schemas.openxmlformats.org/drawingml/2006/chart\"><c:chart xmlns:c=\"http://schemas.openxmlformats.org/drawingml/2006/chart\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" r:id=\"%ls\"/></a:graphicData></a:graphic></wp:inline></w:drawing>"), (const TCHAR *) sChartRels);
|
||||
}
|
||||
else
|
||||
{
|
||||
sXml.Append(_T("</wp:inline>"));
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if(bWidth && bHeight && ((bPositionHRelativeFrom && (bPositionHAlign || bPositionHPosOffset || bPositionHPctOffset)
|
||||
&& bPositionVRelativeFrom && (bPositionVAlign || bPositionVPosOffset || bPositionVPctOffset))
|
||||
|| (bBSimplePos && bSimplePosX && bSimplePosY)))
|
||||
{
|
||||
__int64 emuDistL = 0;
|
||||
__int64 emuDistT = 0;
|
||||
__int64 emuDistR = 0;
|
||||
__int64 emuDistB = 0;
|
||||
CString sXml;
|
||||
|
||||
if(bDistL)
|
||||
emuDistL = (__int64)(g_dKoef_mm_to_emu * DistL);
|
||||
if(bDistT)
|
||||
emuDistT = (__int64)(g_dKoef_mm_to_emu * DistT);
|
||||
if(bDistR)
|
||||
emuDistR = (__int64)(g_dKoef_mm_to_emu * DistR);
|
||||
if(bDistB)
|
||||
emuDistB = (__int64)(g_dKoef_mm_to_emu * DistB);
|
||||
int nSimplePos = 0;
|
||||
if(bBSimplePos && BSimplePos)
|
||||
nSimplePos = 1;
|
||||
int nRelativeHeight = 0;
|
||||
if(bRelativeHeight)
|
||||
nRelativeHeight = RelativeHeight;
|
||||
int nBehindDoc = 0;
|
||||
if(bBehindDoc && BehindDoc)
|
||||
nBehindDoc = 1;
|
||||
int nLayoutInCell = 1;
|
||||
if(bLayoutInCell && false == LayoutInCell)
|
||||
nLayoutInCell = 0;
|
||||
bool bChart = IsChart();
|
||||
if(c_oAscWrapStyle::Inline == Type)
|
||||
{
|
||||
if(bWidth && bHeight)
|
||||
{
|
||||
__int64 emuWidth = (__int64)(g_dKoef_mm_to_emu * Width);
|
||||
__int64 emuHeight = (__int64)(g_dKoef_mm_to_emu * Height);
|
||||
if(false == bChart)
|
||||
sXml.AppendFormat(_T("<wp:inline xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\" distT=\"0\" distB=\"0\" distL=\"0\" distR=\"0\"><wp:extent cx=\"%lld\" cy=\"%lld\"/>"), emuWidth, emuHeight);
|
||||
else
|
||||
sXml.AppendFormat(_T("<w:drawing><wp:inline distT=\"0\" distB=\"0\" distL=\"0\" distR=\"0\"><wp:extent cx=\"%lld\" cy=\"%lld\"/>"), emuWidth, emuHeight);
|
||||
if(bEffectExtentL && bEffectExtentT && bEffectExtentR && bEffectExtentB)
|
||||
{
|
||||
__int64 emuEffectExtentL = (__int64)(g_dKoef_mm_to_emu * EffectExtentL);
|
||||
__int64 emuEffectExtentT = (__int64)(g_dKoef_mm_to_emu * EffectExtentT);
|
||||
__int64 emuEffectExtentR = (__int64)(g_dKoef_mm_to_emu * EffectExtentR);
|
||||
__int64 emuEffectExtentB = (__int64)(g_dKoef_mm_to_emu * EffectExtentB);
|
||||
sXml.AppendFormat(_T("<wp:effectExtent l=\"%lld\" t=\"%lld\" r=\"%lld\" b=\"%lld\"/>"), emuEffectExtentL, emuEffectExtentT, emuEffectExtentR, emuEffectExtentB);
|
||||
}
|
||||
|
||||
if(bChart)
|
||||
sXml.Append(_T("<w:drawing>"));
|
||||
if(bChart)
|
||||
{
|
||||
sXml.AppendFormat(_T("<wp:docPr id=\"%d\" name=\"Chart %d\"/>"), m_nDocPr, m_nDocPr);
|
||||
}
|
||||
else
|
||||
{
|
||||
sXml.AppendFormat(_T("<wp:docPr id=\"%d\" name=\"\"/>"), m_nDocPr);
|
||||
}
|
||||
if(!sGraphicFramePr.IsEmpty())
|
||||
{
|
||||
sXml.Append(sGraphicFramePr);
|
||||
}
|
||||
else
|
||||
{
|
||||
sXml.Append(_T("<wp:cNvGraphicFramePr/>"));
|
||||
}
|
||||
if(bChart)
|
||||
{
|
||||
sXml.AppendFormat(_T("<a:graphic xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\"><a:graphicData uri=\"http://schemas.openxmlformats.org/drawingml/2006/chart\"><c:chart xmlns:c=\"http://schemas.openxmlformats.org/drawingml/2006/chart\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" r:id=\"%ls\"/></a:graphicData></a:graphic></wp:inline></w:drawing>"), (const TCHAR *) sChartRels);
|
||||
}
|
||||
else
|
||||
{
|
||||
sXml.Append(_T("</wp:inline>"));
|
||||
}
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
if(bWidth && bHeight && ((bPositionHRelativeFrom && (bPositionHAlign || bPositionHPosOffset || bPositionHPctOffset)
|
||||
&& bPositionVRelativeFrom && (bPositionVAlign || bPositionVPosOffset || bPositionVPctOffset))
|
||||
|| (bBSimplePos && bSimplePosX && bSimplePosY)))
|
||||
{
|
||||
__int64 emuDistL = 0;
|
||||
__int64 emuDistT = 0;
|
||||
__int64 emuDistR = 0;
|
||||
__int64 emuDistB = 0;
|
||||
|
||||
sXml.AppendFormat(_T("<wp:anchor xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\" distT=\"%lld\" distB=\"%lld\" distL=\"%lld\" distR=\"%lld\" simplePos=\"%d\" relativeHeight=\"%u\" behindDoc=\"%d\" locked=\"0\" layoutInCell=\"%d\" allowOverlap=\"1\">"), emuDistT, emuDistB, emuDistL, emuDistR, nSimplePos, nRelativeHeight, nBehindDoc, nLayoutInCell);
|
||||
__int64 emuX = 0;
|
||||
if(bSimplePosX)
|
||||
emuX = (__int64)(g_dKoef_mm_to_emu * SimplePosX);
|
||||
__int64 emuY = 0;
|
||||
if(bSimplePosY)
|
||||
emuY = (__int64)(g_dKoef_mm_to_emu * SimplePosY);
|
||||
sXml.AppendFormat(_T("<wp:simplePos x=\"%lld\" y=\"%lld\"/>"), emuX, emuY);
|
||||
if(bDistL)
|
||||
emuDistL = (__int64)(g_dKoef_mm_to_emu * DistL);
|
||||
if(bDistT)
|
||||
emuDistT = (__int64)(g_dKoef_mm_to_emu * DistT);
|
||||
if(bDistR)
|
||||
emuDistR = (__int64)(g_dKoef_mm_to_emu * DistR);
|
||||
if(bDistB)
|
||||
emuDistB = (__int64)(g_dKoef_mm_to_emu * DistB);
|
||||
int nSimplePos = 0;
|
||||
if(bBSimplePos && BSimplePos)
|
||||
nSimplePos = 1;
|
||||
int nRelativeHeight = 0;
|
||||
if(bRelativeHeight)
|
||||
nRelativeHeight = RelativeHeight;
|
||||
int nBehindDoc = 0;
|
||||
if(bBehindDoc && BehindDoc)
|
||||
nBehindDoc = 1;
|
||||
int nLayoutInCell = 1;
|
||||
if(bLayoutInCell && false == LayoutInCell)
|
||||
nLayoutInCell = 0;
|
||||
|
||||
if(bPositionHRelativeFrom && (bPositionHAlign || bPositionHPosOffset || bPositionHPctOffset))
|
||||
{
|
||||
CString sRelativeFrom;
|
||||
switch(PositionHRelativeFrom)
|
||||
{
|
||||
case 0: sRelativeFrom = _T("character");break;
|
||||
case 1: sRelativeFrom = _T("column");break;
|
||||
case 2: sRelativeFrom = _T("insideMargin");break;
|
||||
case 3: sRelativeFrom = _T("leftMargin");break;
|
||||
case 4: sRelativeFrom = _T("margin");break;
|
||||
case 5: sRelativeFrom = _T("outsideMargin");break;
|
||||
case 6: sRelativeFrom = _T("page");break;
|
||||
case 7: sRelativeFrom = _T("rightMargin");break;
|
||||
}
|
||||
CString sContent;
|
||||
if(bPositionHAlign)
|
||||
{
|
||||
switch(PositionHAlign)
|
||||
{
|
||||
case 0: sContent = _T("<wp:align>center</wp:align>");break;
|
||||
case 1: sContent = _T("<wp:align>inside</wp:align>");break;
|
||||
case 2: sContent = _T("<wp:align>left</wp:align>");break;
|
||||
case 3: sContent = _T("<wp:align>outside</wp:align>");break;
|
||||
case 4: sContent = _T("<wp:align>right</wp:align>");break;
|
||||
}
|
||||
}
|
||||
else if(bPositionHPosOffset)
|
||||
{
|
||||
__int64 emuPosOffset = (__int64)(g_dKoef_mm_to_emu * PositionHPosOffset);
|
||||
sContent.Format(_T("<wp:posOffset>%lld</wp:posOffset>"), emuPosOffset);
|
||||
}
|
||||
else if(bPositionHPctOffset)
|
||||
{
|
||||
long pctOffset = (long)(1000 * PositionHPctOffset);
|
||||
sContent.Format(_T("<wp14:pctPosHOffset>%d</wp14:pctPosHOffset>"), pctOffset);
|
||||
}
|
||||
sXml.AppendFormat(_T("<wp:positionH relativeFrom=\"%ls\">%ls</wp:positionH>"), (const TCHAR *) sRelativeFrom, (const TCHAR *) sContent);
|
||||
}
|
||||
if(bPositionVRelativeFrom && (bPositionVAlign || bPositionVPosOffset || bPositionVPctOffset))
|
||||
{
|
||||
CString sRelativeFrom;
|
||||
switch(PositionVRelativeFrom)
|
||||
{
|
||||
case 0: sRelativeFrom = _T("bottomMargin");break;
|
||||
case 1: sRelativeFrom = _T("insideMargin");break;
|
||||
case 2: sRelativeFrom = _T("line");break;
|
||||
case 3: sRelativeFrom = _T("margin");break;
|
||||
case 4: sRelativeFrom = _T("outsideMargin");break;
|
||||
case 5: sRelativeFrom = _T("page");break;
|
||||
case 6: sRelativeFrom = _T("paragraph");break;
|
||||
case 7: sRelativeFrom = _T("topMargin");break;
|
||||
}
|
||||
CString sContent;
|
||||
if(bPositionVAlign)
|
||||
{
|
||||
switch(PositionVAlign)
|
||||
{
|
||||
case 0: sContent = _T("<wp:align>bottom</wp:align>");break;
|
||||
case 1: sContent = _T("<wp:align>center</wp:align>");break;
|
||||
case 2: sContent = _T("<wp:align>inside</wp:align>");break;
|
||||
case 3: sContent = _T("<wp:align>outside</wp:align>");break;
|
||||
case 4: sContent = _T("<wp:align>top</wp:align>");break;
|
||||
}
|
||||
}
|
||||
else if(bPositionVPosOffset)
|
||||
{
|
||||
__int64 emuPosOffset = (__int64)(g_dKoef_mm_to_emu * PositionVPosOffset);
|
||||
sContent.Format(_T("<wp:posOffset>%lld</wp:posOffset>"), emuPosOffset);
|
||||
}
|
||||
else if(bPositionVPctOffset)
|
||||
{
|
||||
long pctOffset = (long)(1000 * PositionVPctOffset);
|
||||
sContent.Format(_T("<wp14:pctPosVOffset>%d</wp14:pctPosVOffset>"), pctOffset);
|
||||
}
|
||||
sXml.AppendFormat(_T("<wp:positionV relativeFrom=\"%ls\">%ls</wp:positionV>"), (const TCHAR *) sRelativeFrom, (const TCHAR *) sContent);
|
||||
}
|
||||
__int64 emuWidth = (__int64)(g_dKoef_mm_to_emu * Width);
|
||||
__int64 emuHeight = (__int64)(g_dKoef_mm_to_emu * Height);
|
||||
sXml.AppendFormat(_T("<wp:extent cx=\"%lld\" cy=\"%lld\"/>"), emuWidth, emuHeight);
|
||||
if(bEffectExtentL && bEffectExtentT && bEffectExtentR && bEffectExtentB)
|
||||
{
|
||||
__int64 emuEffectExtentL = (__int64)(g_dKoef_mm_to_emu * EffectExtentL);
|
||||
__int64 emuEffectExtentT = (__int64)(g_dKoef_mm_to_emu * EffectExtentT);
|
||||
__int64 emuEffectExtentR = (__int64)(g_dKoef_mm_to_emu * EffectExtentR);
|
||||
__int64 emuEffectExtentB = (__int64)(g_dKoef_mm_to_emu * EffectExtentB);
|
||||
sXml.AppendFormat(_T("<wp:effectExtent l=\"%lld\" t=\"%lld\" r=\"%lld\" b=\"%lld\"/>"), emuEffectExtentL, emuEffectExtentT, emuEffectExtentR, emuEffectExtentB);
|
||||
}
|
||||
if(bDrawingPropertyWrap && DrawingPropertyWrap.bWrappingType)
|
||||
{
|
||||
CString sTagName;
|
||||
switch(DrawingPropertyWrap.WrappingType)
|
||||
{
|
||||
case c_oSerImageType2::WrapNone:sTagName = _T("wrapNone");break;
|
||||
case c_oSerImageType2::WrapSquare:sTagName = _T("wrapSquare");break;
|
||||
case c_oSerImageType2::WrapThrough:sTagName = _T("wrapThrough");break;
|
||||
case c_oSerImageType2::WrapTight:sTagName = _T("wrapTight");break;
|
||||
case c_oSerImageType2::WrapTopAndBottom:sTagName = _T("wrapTopAndBottom");break;
|
||||
}
|
||||
if(DrawingPropertyWrap.bStart || DrawingPropertyWrap.Points.size() > 0)
|
||||
{
|
||||
if( c_oSerImageType2::WrapSquare == DrawingPropertyWrap.WrappingType ||
|
||||
c_oSerImageType2::WrapThrough == DrawingPropertyWrap.WrappingType ||
|
||||
c_oSerImageType2::WrapTight == DrawingPropertyWrap.WrappingType)
|
||||
{
|
||||
sXml.AppendFormat(_T("<wp:%ls wrapText=\"bothSides\">"), (const TCHAR *) sTagName);
|
||||
}
|
||||
else
|
||||
sXml.AppendFormat(_T("<wp:%ls>"), (const TCHAR *) sTagName);
|
||||
if(bChart)
|
||||
sXml.Append(_T("<w:drawing>"));
|
||||
|
||||
int nEdited = 0;
|
||||
if(DrawingPropertyWrap.bEdited && DrawingPropertyWrap.Edited)
|
||||
nEdited = 1;
|
||||
sXml.AppendFormat(_T("<wp:wrapPolygon edited=\"%d\">"), nEdited);
|
||||
if(DrawingPropertyWrap.bStart && DrawingPropertyWrap.Start.bX && DrawingPropertyWrap.Start.bY)
|
||||
{
|
||||
__int64 emuX = (__int64)(g_dKoef_mm_to_emu * DrawingPropertyWrap.Start.X);
|
||||
__int64 emuY = (__int64)(g_dKoef_mm_to_emu * DrawingPropertyWrap.Start.Y);
|
||||
sXml.AppendFormat(_T("<wp:start x=\"%lld\" y=\"%lld\"/>"), emuX, emuY);
|
||||
}
|
||||
for(int i = 0, length = DrawingPropertyWrap.Points.size(); i < length; ++i)
|
||||
{
|
||||
CDrawingPropertyWrapPoint* pWrapPoint = DrawingPropertyWrap.Points[i];
|
||||
if(pWrapPoint->bX && pWrapPoint->bY)
|
||||
{
|
||||
__int64 emuX = (__int64)(g_dKoef_mm_to_emu * pWrapPoint->X);
|
||||
__int64 emuY = (__int64)(g_dKoef_mm_to_emu * pWrapPoint->Y);
|
||||
sXml.AppendFormat(_T("<wp:lineTo x=\"%lld\" y=\"%lld\"/>"), emuX, emuY);
|
||||
}
|
||||
}
|
||||
sXml.Append(_T("</wp:wrapPolygon>"));
|
||||
sXml.AppendFormat(_T("</wp:%ls>"), (const TCHAR *) sTagName);
|
||||
}
|
||||
else
|
||||
{
|
||||
//для wrapThrough и wrapTight wrapPolygon обязательное поле, если его нет - меняем тип.
|
||||
if( c_oSerImageType2::WrapSquare == DrawingPropertyWrap.WrappingType ||
|
||||
c_oSerImageType2::WrapThrough == DrawingPropertyWrap.WrappingType ||
|
||||
c_oSerImageType2::WrapTight == DrawingPropertyWrap.WrappingType)
|
||||
{
|
||||
sXml.Append(_T("<wp:wrapSquare wrapText=\"bothSides\"/>"));
|
||||
}
|
||||
else
|
||||
sXml.AppendFormat(_T("<wp:%ls/>"), (const TCHAR *) sTagName);
|
||||
}
|
||||
}
|
||||
else
|
||||
sXml.Append(_T("<wp:wrapNone/>"));
|
||||
sXml.AppendFormat(_T("<wp:anchor xmlns:wp=\"http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing\" distT=\"%lld\" distB=\"%lld\" distL=\"%lld\" distR=\"%lld\" simplePos=\"%d\" relativeHeight=\"%u\" behindDoc=\"%d\" locked=\"0\" layoutInCell=\"%d\" allowOverlap=\"1\">"), emuDistT, emuDistB, emuDistL, emuDistR, nSimplePos, nRelativeHeight, nBehindDoc, nLayoutInCell);
|
||||
__int64 emuX = 0;
|
||||
if(bSimplePosX)
|
||||
emuX = (__int64)(g_dKoef_mm_to_emu * SimplePosX);
|
||||
__int64 emuY = 0;
|
||||
if(bSimplePosY)
|
||||
emuY = (__int64)(g_dKoef_mm_to_emu * SimplePosY);
|
||||
sXml.AppendFormat(_T("<wp:simplePos x=\"%lld\" y=\"%lld\"/>"), emuX, emuY);
|
||||
|
||||
if(bChart)
|
||||
{
|
||||
sXml.AppendFormat(_T("<wp:docPr id=\"%d\" name=\"Chart %d\"/>"), m_nDocPr, m_nDocPr);
|
||||
}
|
||||
else
|
||||
{
|
||||
sXml.AppendFormat(_T("<wp:docPr id=\"%d\" name=\"\"/>"), m_nDocPr);
|
||||
}
|
||||
if(!sGraphicFramePr.IsEmpty())
|
||||
{
|
||||
sXml.Append(sGraphicFramePr);
|
||||
}
|
||||
else
|
||||
{
|
||||
sXml.Append(_T("<wp:cNvGraphicFramePr/>"));
|
||||
}
|
||||
if(bChart)
|
||||
{
|
||||
sXml.AppendFormat(_T("<a:graphic xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\"><a:graphicData uri=\"http://schemas.openxmlformats.org/drawingml/2006/chart\"><c:chart xmlns:c=\"http://schemas.openxmlformats.org/drawingml/2006/chart\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" r:id=\"%ls\"/></a:graphicData></a:graphic>"), (const TCHAR *) sChartRels);
|
||||
}
|
||||
if(bPositionHRelativeFrom && (bPositionHAlign || bPositionHPosOffset || bPositionHPctOffset))
|
||||
{
|
||||
CString sRelativeFrom;
|
||||
switch(PositionHRelativeFrom)
|
||||
{
|
||||
case 0: sRelativeFrom = _T("character");break;
|
||||
case 1: sRelativeFrom = _T("column");break;
|
||||
case 2: sRelativeFrom = _T("insideMargin");break;
|
||||
case 3: sRelativeFrom = _T("leftMargin");break;
|
||||
case 4: sRelativeFrom = _T("margin");break;
|
||||
case 5: sRelativeFrom = _T("outsideMargin");break;
|
||||
case 6: sRelativeFrom = _T("page");break;
|
||||
case 7: sRelativeFrom = _T("rightMargin");break;
|
||||
}
|
||||
CString sContent;
|
||||
if(bPositionHAlign)
|
||||
{
|
||||
switch(PositionHAlign)
|
||||
{
|
||||
case 0: sContent = _T("<wp:align>center</wp:align>");break;
|
||||
case 1: sContent = _T("<wp:align>inside</wp:align>");break;
|
||||
case 2: sContent = _T("<wp:align>left</wp:align>");break;
|
||||
case 3: sContent = _T("<wp:align>outside</wp:align>");break;
|
||||
case 4: sContent = _T("<wp:align>right</wp:align>");break;
|
||||
}
|
||||
}
|
||||
else if(bPositionHPosOffset)
|
||||
{
|
||||
__int64 emuPosOffset = (__int64)(g_dKoef_mm_to_emu * PositionHPosOffset);
|
||||
sContent.Format(_T("<wp:posOffset>%lld</wp:posOffset>"), emuPosOffset);
|
||||
}
|
||||
else if(bPositionHPctOffset)
|
||||
{
|
||||
long pctOffset = (long)(1000 * PositionHPctOffset);
|
||||
sContent.Format(_T("<wp14:pctPosHOffset>%d</wp14:pctPosHOffset>"), pctOffset);
|
||||
}
|
||||
sXml.AppendFormat(_T("<wp:positionH relativeFrom=\"%ls\">%ls</wp:positionH>"), (const TCHAR *) sRelativeFrom, (const TCHAR *) sContent);
|
||||
}
|
||||
if(bPositionVRelativeFrom && (bPositionVAlign || bPositionVPosOffset || bPositionVPctOffset))
|
||||
{
|
||||
CString sRelativeFrom;
|
||||
switch(PositionVRelativeFrom)
|
||||
{
|
||||
case 0: sRelativeFrom = _T("bottomMargin");break;
|
||||
case 1: sRelativeFrom = _T("insideMargin");break;
|
||||
case 2: sRelativeFrom = _T("line");break;
|
||||
case 3: sRelativeFrom = _T("margin");break;
|
||||
case 4: sRelativeFrom = _T("outsideMargin");break;
|
||||
case 5: sRelativeFrom = _T("page");break;
|
||||
case 6: sRelativeFrom = _T("paragraph");break;
|
||||
case 7: sRelativeFrom = _T("topMargin");break;
|
||||
}
|
||||
CString sContent;
|
||||
if(bPositionVAlign)
|
||||
{
|
||||
switch(PositionVAlign)
|
||||
{
|
||||
case 0: sContent = _T("<wp:align>bottom</wp:align>");break;
|
||||
case 1: sContent = _T("<wp:align>center</wp:align>");break;
|
||||
case 2: sContent = _T("<wp:align>inside</wp:align>");break;
|
||||
case 3: sContent = _T("<wp:align>outside</wp:align>");break;
|
||||
case 4: sContent = _T("<wp:align>top</wp:align>");break;
|
||||
}
|
||||
}
|
||||
else if(bPositionVPosOffset)
|
||||
{
|
||||
__int64 emuPosOffset = (__int64)(g_dKoef_mm_to_emu * PositionVPosOffset);
|
||||
sContent.Format(_T("<wp:posOffset>%lld</wp:posOffset>"), emuPosOffset);
|
||||
}
|
||||
else if(bPositionVPctOffset)
|
||||
{
|
||||
long pctOffset = (long)(1000 * PositionVPctOffset);
|
||||
sContent.Format(_T("<wp14:pctPosVOffset>%d</wp14:pctPosVOffset>"), pctOffset);
|
||||
}
|
||||
sXml.AppendFormat(_T("<wp:positionV relativeFrom=\"%ls\">%ls</wp:positionV>"), (const TCHAR *) sRelativeFrom, (const TCHAR *) sContent);
|
||||
}
|
||||
__int64 emuWidth = (__int64)(g_dKoef_mm_to_emu * Width);
|
||||
__int64 emuHeight = (__int64)(g_dKoef_mm_to_emu * Height);
|
||||
sXml.AppendFormat(_T("<wp:extent cx=\"%lld\" cy=\"%lld\"/>"), emuWidth, emuHeight);
|
||||
if(bEffectExtentL && bEffectExtentT && bEffectExtentR && bEffectExtentB)
|
||||
{
|
||||
__int64 emuEffectExtentL = (__int64)(g_dKoef_mm_to_emu * EffectExtentL);
|
||||
__int64 emuEffectExtentT = (__int64)(g_dKoef_mm_to_emu * EffectExtentT);
|
||||
__int64 emuEffectExtentR = (__int64)(g_dKoef_mm_to_emu * EffectExtentR);
|
||||
__int64 emuEffectExtentB = (__int64)(g_dKoef_mm_to_emu * EffectExtentB);
|
||||
sXml.AppendFormat(_T("<wp:effectExtent l=\"%lld\" t=\"%lld\" r=\"%lld\" b=\"%lld\"/>"), emuEffectExtentL, emuEffectExtentT, emuEffectExtentR, emuEffectExtentB);
|
||||
}
|
||||
if(bDrawingPropertyWrap && DrawingPropertyWrap.bWrappingType)
|
||||
{
|
||||
CString sTagName;
|
||||
switch(DrawingPropertyWrap.WrappingType)
|
||||
{
|
||||
case c_oSerImageType2::WrapNone:sTagName = _T("wrapNone");break;
|
||||
case c_oSerImageType2::WrapSquare:sTagName = _T("wrapSquare");break;
|
||||
case c_oSerImageType2::WrapThrough:sTagName = _T("wrapThrough");break;
|
||||
case c_oSerImageType2::WrapTight:sTagName = _T("wrapTight");break;
|
||||
case c_oSerImageType2::WrapTopAndBottom:sTagName = _T("wrapTopAndBottom");break;
|
||||
}
|
||||
if(DrawingPropertyWrap.bStart || DrawingPropertyWrap.Points.size() > 0)
|
||||
{
|
||||
if( c_oSerImageType2::WrapSquare == DrawingPropertyWrap.WrappingType ||
|
||||
c_oSerImageType2::WrapThrough == DrawingPropertyWrap.WrappingType ||
|
||||
c_oSerImageType2::WrapTight == DrawingPropertyWrap.WrappingType)
|
||||
{
|
||||
sXml.AppendFormat(_T("<wp:%ls wrapText=\"bothSides\">"), (const TCHAR *) sTagName);
|
||||
}
|
||||
else
|
||||
sXml.AppendFormat(_T("<wp:%ls>"), (const TCHAR *) sTagName);
|
||||
|
||||
if(!sSizeRelH.IsEmpty())
|
||||
{
|
||||
sXml.Append(sSizeRelH);
|
||||
}
|
||||
if(!sSizeRelV.IsEmpty())
|
||||
{
|
||||
sXml.Append(sSizeRelV);
|
||||
}
|
||||
int nEdited = 0;
|
||||
if(DrawingPropertyWrap.bEdited && DrawingPropertyWrap.Edited)
|
||||
nEdited = 1;
|
||||
sXml.AppendFormat(_T("<wp:wrapPolygon edited=\"%d\">"), nEdited);
|
||||
if(DrawingPropertyWrap.bStart && DrawingPropertyWrap.Start.bX && DrawingPropertyWrap.Start.bY)
|
||||
{
|
||||
__int64 emuX = (__int64)(g_dKoef_mm_to_emu * DrawingPropertyWrap.Start.X);
|
||||
__int64 emuY = (__int64)(g_dKoef_mm_to_emu * DrawingPropertyWrap.Start.Y);
|
||||
sXml.AppendFormat(_T("<wp:start x=\"%lld\" y=\"%lld\"/>"), emuX, emuY);
|
||||
}
|
||||
for(int i = 0, length = DrawingPropertyWrap.Points.size(); i < length; ++i)
|
||||
{
|
||||
CDrawingPropertyWrapPoint* pWrapPoint = DrawingPropertyWrap.Points[i];
|
||||
if(pWrapPoint->bX && pWrapPoint->bY)
|
||||
{
|
||||
__int64 emuX = (__int64)(g_dKoef_mm_to_emu * pWrapPoint->X);
|
||||
__int64 emuY = (__int64)(g_dKoef_mm_to_emu * pWrapPoint->Y);
|
||||
sXml.AppendFormat(_T("<wp:lineTo x=\"%lld\" y=\"%lld\"/>"), emuX, emuY);
|
||||
}
|
||||
}
|
||||
sXml.Append(_T("</wp:wrapPolygon>"));
|
||||
sXml.AppendFormat(_T("</wp:%ls>"), (const TCHAR *) sTagName);
|
||||
}
|
||||
else
|
||||
{
|
||||
//для wrapThrough и wrapTight wrapPolygon обязательное поле, если его нет - меняем тип.
|
||||
if( c_oSerImageType2::WrapSquare == DrawingPropertyWrap.WrappingType ||
|
||||
c_oSerImageType2::WrapThrough == DrawingPropertyWrap.WrappingType ||
|
||||
c_oSerImageType2::WrapTight == DrawingPropertyWrap.WrappingType)
|
||||
{
|
||||
sXml.Append(_T("<wp:wrapSquare wrapText=\"bothSides\"/>"));
|
||||
}
|
||||
else
|
||||
sXml.AppendFormat(_T("<wp:%ls/>"), (const TCHAR *) sTagName);
|
||||
}
|
||||
}
|
||||
else
|
||||
sXml.Append(_T("<wp:wrapNone/>"));
|
||||
|
||||
sXml.Append(_T("</wp:anchor>"));
|
||||
if(bChart)
|
||||
{
|
||||
sXml.AppendFormat(_T("<wp:docPr id=\"%d\" name=\"Chart %d\"/>"), m_nDocPr, m_nDocPr);
|
||||
}
|
||||
else
|
||||
{
|
||||
sXml.AppendFormat(_T("<wp:docPr id=\"%d\" name=\"\"/>"), m_nDocPr);
|
||||
}
|
||||
if(!sGraphicFramePr.IsEmpty())
|
||||
{
|
||||
sXml.Append(sGraphicFramePr);
|
||||
}
|
||||
else
|
||||
{
|
||||
sXml.Append(_T("<wp:cNvGraphicFramePr/>"));
|
||||
}
|
||||
if(bChart)
|
||||
{
|
||||
sXml.AppendFormat(_T("<a:graphic xmlns:a=\"http://schemas.openxmlformats.org/drawingml/2006/main\"><a:graphicData uri=\"http://schemas.openxmlformats.org/drawingml/2006/chart\"><c:chart xmlns:c=\"http://schemas.openxmlformats.org/drawingml/2006/chart\" xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" r:id=\"%ls\"/></a:graphicData></a:graphic>"), (const TCHAR *) sChartRels);
|
||||
}
|
||||
|
||||
if(bChart)
|
||||
sXml.Append(_T("</w:drawing>"));
|
||||
}
|
||||
}
|
||||
}
|
||||
if(!sSizeRelH.IsEmpty())
|
||||
{
|
||||
sXml.Append(sSizeRelH);
|
||||
}
|
||||
if(!sSizeRelV.IsEmpty())
|
||||
{
|
||||
sXml.Append(sSizeRelV);
|
||||
}
|
||||
|
||||
sXml.Append(_T("</wp:anchor>"));
|
||||
|
||||
if(bChart)
|
||||
sXml.Append(_T("</w:drawing>"));
|
||||
}
|
||||
}
|
||||
return sXml;
|
||||
}
|
||||
};
|
||||
|
||||
@ -613,9 +613,8 @@ public:
|
||||
if(0 != contextualSpacing)
|
||||
pCStringWriter->WriteString(CString(_T("<w:contextualSpacing w:val=\"true\"/>")));
|
||||
else if(false == bDoNotWriteNullProp)
|
||||
pCStringWriter->WriteString(CString(_T("<w:contextualSpacing w:val=\"false\"/>")));
|
||||
break;
|
||||
}
|
||||
pCStringWriter->WriteString(CString(_T("<w:contextualSpacing w:val=\"false\"/>")));
|
||||
}break;
|
||||
case c_oSerProp_pPrType::Ind:
|
||||
{
|
||||
XmlUtils::CStringWriter oTempWriter;
|
||||
@ -637,27 +636,24 @@ public:
|
||||
case align_Left: pCStringWriter->WriteString(CString(_T("<w:jc w:val=\"left\" />")));break;
|
||||
case align_Center: pCStringWriter->WriteString(CString(_T("<w:jc w:val=\"center\" />")));break;
|
||||
case align_Justify: pCStringWriter->WriteString(CString(_T("<w:jc w:val=\"both\" />")));break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}break;
|
||||
case c_oSerProp_pPrType::KeepLines:
|
||||
{
|
||||
BYTE KeepLines = m_oBufferedStream.GetUChar();
|
||||
if(0 != KeepLines)
|
||||
pCStringWriter->WriteString(CString(_T("<w:keepLines/>")));
|
||||
else if(false == bDoNotWriteNullProp)
|
||||
pCStringWriter->WriteString(CString(_T("<w:keepLines w:val=\"false\"/>")));
|
||||
break;
|
||||
}
|
||||
pCStringWriter->WriteString(CString(_T("<w:keepLines w:val=\"false\"/>")));
|
||||
}break;
|
||||
case c_oSerProp_pPrType::KeepNext:
|
||||
{
|
||||
BYTE KeepNext = m_oBufferedStream.GetUChar();
|
||||
if(0 != KeepNext)
|
||||
pCStringWriter->WriteString(CString(_T("<w:keepNext/>")));
|
||||
else if(false == bDoNotWriteNullProp)
|
||||
pCStringWriter->WriteString(CString(_T("<w:keepNext w:val=\"false\"/>")));
|
||||
break;
|
||||
}
|
||||
pCStringWriter->WriteString(CString(_T("<w:keepNext w:val=\"false\"/>")));
|
||||
}break;
|
||||
case c_oSerProp_pPrType::PageBreakBefore:
|
||||
{
|
||||
BYTE pageBreakBefore = m_oBufferedStream.GetUChar();
|
||||
@ -788,9 +784,8 @@ public:
|
||||
pCStringWriter->WriteString(sTab);
|
||||
}
|
||||
pCStringWriter->WriteString(CString(_T("</w:tabs>")));
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}break;
|
||||
case c_oSerProp_pPrType::ParaStyle:
|
||||
{
|
||||
CString sStyleName(m_oBufferedStream.GetString3(length));
|
||||
@ -799,23 +794,23 @@ public:
|
||||
sStyle.Append(_T("<w:pStyle w:val=\""));
|
||||
sStyle.Append(sStyleName);
|
||||
sStyle.Append(_T("\" />"));
|
||||
pCStringWriter->WriteString(sStyle);
|
||||
break;
|
||||
}
|
||||
pCStringWriter->WriteString(sStyle);
|
||||
}break;
|
||||
case c_oSerProp_pPrType::numPr:
|
||||
pCStringWriter->WriteString(CString(_T("<w:numPr>")));
|
||||
res = Read2(length, &Binary_pPrReader::ReadNumPr, this, poResult);
|
||||
pCStringWriter->WriteString(CString(_T("</w:numPr>")));
|
||||
break;
|
||||
{
|
||||
pCStringWriter->WriteString(CString(_T("<w:numPr>")));
|
||||
res = Read2(length, &Binary_pPrReader::ReadNumPr, this, poResult);
|
||||
pCStringWriter->WriteString(CString(_T("</w:numPr>")));
|
||||
}break;
|
||||
case c_oSerProp_pPrType::pPr_rPr:
|
||||
{
|
||||
rPr orPr(m_oFontTableWriter.m_mapFonts);
|
||||
res = oBinary_rPrReader.Read(length, &orPr);
|
||||
//Read2(length, &Binary_pPrReader::ReadNumPr, this, &orPr);
|
||||
if(orPr.IsNoEmpty())
|
||||
orPr.Write(pCStringWriter);
|
||||
break;
|
||||
}
|
||||
orPr.Write(pCStringWriter);
|
||||
|
||||
}break;
|
||||
case c_oSerProp_pPrType::pBdr:
|
||||
{
|
||||
docBorders odocBorders;
|
||||
@ -825,33 +820,29 @@ public:
|
||||
pCStringWriter->WriteString(CString(_T("<w:pBdr>")));
|
||||
odocBorders.Write(pCStringWriter, false);
|
||||
pCStringWriter->WriteString(CString(_T("</w:pBdr>")));
|
||||
}
|
||||
break;
|
||||
}
|
||||
}
|
||||
}break;
|
||||
case c_oSerProp_pPrType::FramePr:
|
||||
{
|
||||
CFramePr oFramePr;
|
||||
res = Read2(length, &Binary_pPrReader::ReadFramePr, this, &oFramePr);
|
||||
if(false == oFramePr.IsEmpty())
|
||||
oFramePr.Write(*pCStringWriter);
|
||||
break;
|
||||
}
|
||||
oFramePr.Write(*pCStringWriter);
|
||||
}break;
|
||||
case c_oSerProp_pPrType::pPrChange:
|
||||
{
|
||||
TrackRevision oPPrChange;
|
||||
res = Read1(length, &Binary_pPrReader::ReadPPrChange, this, &oPPrChange);
|
||||
oPPrChange.Write(pCStringWriter, _T("w:pPrChange"));
|
||||
break;
|
||||
}
|
||||
case c_oSerProp_pPrType::SectPr:
|
||||
oPPrChange.Write(pCStringWriter, _T("w:pPrChange"));
|
||||
}break;
|
||||
case c_oSerProp_pPrType::SectPr:
|
||||
{
|
||||
SectPr oSectPr;
|
||||
res = Read1(length, &Binary_pPrReader::Read_SecPr, this, &oSectPr);
|
||||
pCStringWriter->WriteString(CString(_T("<w:sectPr>")));
|
||||
pCStringWriter->WriteString(oSectPr.Write());
|
||||
pCStringWriter->WriteString(CString(_T("</w:sectPr>")));
|
||||
break;
|
||||
}
|
||||
pCStringWriter->WriteString(CString(_T("</w:sectPr>")));
|
||||
}break;
|
||||
default:
|
||||
res = c_oSerConstants::ReadUnknown;
|
||||
break;
|
||||
@ -871,7 +862,7 @@ public:
|
||||
else
|
||||
res = c_oSerConstants::ReadUnknown;
|
||||
return res;
|
||||
};
|
||||
}
|
||||
int ReadInd(BYTE type, long length, void* poResult)
|
||||
{
|
||||
int res = c_oSerConstants::ReadOk;
|
||||
@ -913,7 +904,7 @@ public:
|
||||
break;
|
||||
}
|
||||
return res;
|
||||
};
|
||||
}
|
||||
int ReadSpacing(BYTE type, long length, void* poResult)
|
||||
{
|
||||
int res = c_oSerConstants::ReadOk;
|
||||
@ -949,7 +940,7 @@ public:
|
||||
break;
|
||||
}
|
||||
return res;
|
||||
};
|
||||
}
|
||||
int ReadTabs(BYTE type, long length, void* poResult)
|
||||
{
|
||||
int res = c_oSerConstants::ReadOk;
|
||||
@ -975,7 +966,7 @@ public:
|
||||
else
|
||||
res = c_oSerConstants::ReadUnknown;
|
||||
return res;
|
||||
};
|
||||
}
|
||||
int ReadNumPr(BYTE type, long length, void* poResult)
|
||||
{
|
||||
int res = c_oSerConstants::ReadOk;
|
||||
@ -1050,7 +1041,7 @@ public:
|
||||
else
|
||||
res = c_oSerConstants::ReadUnknown;
|
||||
return res;
|
||||
};
|
||||
}
|
||||
int ReadBorder(BYTE type, long length, void* poResult)
|
||||
{
|
||||
int res = c_oSerConstants::ReadOk;
|
||||
@ -1083,7 +1074,7 @@ public:
|
||||
else
|
||||
res = c_oSerConstants::ReadUnknown;
|
||||
return res;
|
||||
};
|
||||
}
|
||||
int ReadFramePr(BYTE type, long length, void* poResult)
|
||||
{
|
||||
int res = c_oSerConstants::ReadOk;
|
||||
@ -1161,9 +1152,9 @@ public:
|
||||
else
|
||||
res = c_oSerConstants::ReadUnknown;
|
||||
return res;
|
||||
};
|
||||
int Read_SecPr(BYTE type, long length, void* poResult)
|
||||
{
|
||||
}
|
||||
int Read_SecPr(BYTE type, long length, void* poResult)
|
||||
{
|
||||
SectPr* pSectPr = static_cast<SectPr*>(poResult);
|
||||
int res = c_oSerConstants::ReadOk;
|
||||
if( c_oSerProp_secPrType::pgSz == type )
|
||||
@ -2945,11 +2936,11 @@ public:
|
||||
{
|
||||
m_oFileWriter.m_oMediaWriter.AddImage2(pFileNative);
|
||||
}
|
||||
else if(NSFile::CFileBinary::Exists(string2std_string(sFilePath)))
|
||||
else if(NSFile::CFileBinary::Exists(sFilePath))
|
||||
{
|
||||
m_oFileWriter.m_oMediaWriter.AddImage(sFilePath);
|
||||
if(bDeleteFile)
|
||||
NSFile::CFileBinary::Remove(string2std_string(sFilePath));
|
||||
NSFile::CFileBinary::Remove(sFilePath);
|
||||
}
|
||||
}
|
||||
else
|
||||
@ -3579,22 +3570,37 @@ public:
|
||||
};
|
||||
class Binary_DocumentTableReader : public Binary_CommonReader<Binary_DocumentTableReader>
|
||||
{
|
||||
Writers::FileWriter& m_oFileWriter;
|
||||
Writers::FontTableWriter& m_oFontTableWriter;
|
||||
Binary_pPrReader oBinary_pPrReader;
|
||||
Binary_rPrReader oBinary_rPrReader;
|
||||
Binary_tblPrReader oBinary_tblPrReader;
|
||||
XmlUtils::CStringWriter* m_pCurWriter;
|
||||
rPr m_oCur_rPr;
|
||||
rPr m_oMath_rPr;
|
||||
XmlUtils::CStringWriter m_oCur_pPr;
|
||||
BYTE m_byteLastElemType;
|
||||
CComments* m_pComments;
|
||||
private:
|
||||
Binary_CommonReader2 oBinary_CommonReader2;
|
||||
|
||||
Writers::FileWriter& m_oFileWriter;
|
||||
Writers::FontTableWriter& m_oFontTableWriter;
|
||||
Binary_pPrReader oBinary_pPrReader;
|
||||
Binary_rPrReader oBinary_rPrReader;
|
||||
Binary_tblPrReader oBinary_tblPrReader;
|
||||
XmlUtils::CStringWriter* m_pCurWriter;
|
||||
rPr m_oCur_rPr;
|
||||
rPr m_oMath_rPr;
|
||||
XmlUtils::CStringWriter m_oCur_pPr;
|
||||
BYTE m_byteLastElemType;
|
||||
CComments* m_pComments;
|
||||
public:
|
||||
Writers::ContentWriter& m_oDocumentWriter;
|
||||
Writers::MediaWriter& m_oMediaWriter;
|
||||
public:
|
||||
Binary_DocumentTableReader(NSBinPptxRW::CBinaryFileReader& poBufferedStream, Writers::FileWriter& oFileWriter, Writers::ContentWriter& oDocumentWriter, CComments* pComments) :Binary_CommonReader(poBufferedStream), m_oDocumentWriter(oDocumentWriter), m_oFileWriter(oFileWriter), m_oMediaWriter(oFileWriter.m_oMediaWriter), m_oFontTableWriter(oFileWriter.m_oFontTableWriter), oBinary_pPrReader(poBufferedStream, oFileWriter), oBinary_rPrReader(poBufferedStream, oFileWriter), oBinary_tblPrReader(poBufferedStream, oFileWriter), m_oCur_rPr(m_oFontTableWriter.m_mapFonts), m_oMath_rPr(m_oFontTableWriter.m_mapFonts), m_pComments(pComments)
|
||||
Writers::ContentWriter& m_oDocumentWriter;
|
||||
Writers::MediaWriter& m_oMediaWriter;
|
||||
|
||||
Binary_DocumentTableReader(NSBinPptxRW::CBinaryFileReader& poBufferedStream, Writers::FileWriter& oFileWriter, Writers::ContentWriter& oDocumentWriter, CComments* pComments)
|
||||
: Binary_CommonReader(poBufferedStream)
|
||||
, m_oDocumentWriter(oDocumentWriter)
|
||||
, m_oFileWriter(oFileWriter)
|
||||
, m_oMediaWriter(oFileWriter.m_oMediaWriter)
|
||||
, m_oFontTableWriter(oFileWriter.m_oFontTableWriter)
|
||||
, oBinary_CommonReader2(poBufferedStream)
|
||||
, oBinary_pPrReader(poBufferedStream, oFileWriter)
|
||||
, oBinary_rPrReader(poBufferedStream, oFileWriter)
|
||||
, oBinary_tblPrReader(poBufferedStream, oFileWriter)
|
||||
, m_oCur_rPr(m_oFontTableWriter.m_mapFonts)
|
||||
, m_oMath_rPr(m_oFontTableWriter.m_mapFonts)
|
||||
, m_pComments(pComments)
|
||||
{
|
||||
m_byteLastElemType = c_oSerParType::Content;
|
||||
m_pCurWriter = NULL;
|
||||
@ -3605,7 +3611,7 @@ public:
|
||||
int Read()
|
||||
{
|
||||
return ReadTable(&Binary_DocumentTableReader::ReadDocumentContent, this);
|
||||
};
|
||||
}
|
||||
XmlUtils::CStringWriter& GetRunStringWriter()
|
||||
{
|
||||
if(NULL != m_pCurWriter)
|
||||
@ -3628,12 +3634,12 @@ public:
|
||||
else if(c_oSerParType::Table == type)
|
||||
{
|
||||
m_byteLastElemType = c_oSerParType::Table;
|
||||
//сбрасываем Shd
|
||||
//сбрасываем Shd
|
||||
oBinary_tblPrReader.m_sCurTableShd.Empty();
|
||||
m_oDocumentWriter.m_oContent.WriteString(CString(_T("<w:tbl>")));
|
||||
res = Read1(length, &Binary_DocumentTableReader::ReadDocTable, this, &m_oDocumentWriter.m_oContent);
|
||||
m_oDocumentWriter.m_oContent.WriteString(CString(_T("</w:tbl>")));
|
||||
//сбрасываем Shd
|
||||
//сбрасываем Shd
|
||||
oBinary_tblPrReader.m_sCurTableShd.Empty();
|
||||
}
|
||||
else if ( c_oSerParType::sectPr == type )
|
||||
@ -3644,10 +3650,16 @@ public:
|
||||
if(oSectPr.bEvenAndOddHeaders && oSectPr.EvenAndOddHeaders)
|
||||
m_oFileWriter.m_oSettingWriter.AddSetting(_T("<w:evenAndOddHeaders/>"));
|
||||
}
|
||||
else if ( c_oSerParType::Background == type )
|
||||
{
|
||||
Background oBackground;
|
||||
res = Read2(length, &Binary_DocumentTableReader::Read_Background, this, &oBackground);
|
||||
m_oDocumentWriter.m_oBackground.WriteString(oBackground.Write());
|
||||
}
|
||||
else
|
||||
res = c_oSerConstants::ReadUnknown;
|
||||
return res;
|
||||
};
|
||||
}
|
||||
int ReadParagraph(BYTE type, long length, void* poResult)
|
||||
{
|
||||
int res = c_oSerConstants::ReadOk;
|
||||
@ -3668,7 +3680,7 @@ public:
|
||||
else
|
||||
res = c_oSerConstants::ReadUnknown;
|
||||
return res;
|
||||
};
|
||||
}
|
||||
int ReadParagraphContent(BYTE type, long length, void* poResult)
|
||||
{
|
||||
int res = c_oSerConstants::ReadOk;
|
||||
@ -6262,7 +6274,7 @@ public:
|
||||
else
|
||||
res = c_oSerConstants::ReadUnknown;
|
||||
return res;
|
||||
};
|
||||
}
|
||||
int ReadFootnoteRef(BYTE type, long length, void* poResult)
|
||||
{
|
||||
OOX::Logic::CFootnoteReference* pFootnoteRef = static_cast<OOX::Logic::CFootnoteReference*>(poResult);
|
||||
@ -6339,8 +6351,11 @@ public:
|
||||
{
|
||||
CDrawingProperty oCDrawingProperty(m_oFileWriter.getNextDocPr());
|
||||
res = Read2(length, &Binary_DocumentTableReader::ReadPptxDrawing, this, &oCDrawingProperty);
|
||||
if(oCDrawingProperty.bDataPos && oCDrawingProperty.bDataLength)
|
||||
|
||||
if(oCDrawingProperty.bDataPos && oCDrawingProperty.bDataLength)
|
||||
{
|
||||
ReadDrawing(oCDrawingProperty);
|
||||
}
|
||||
}
|
||||
else
|
||||
res = c_oSerConstants::ReadUnknown;
|
||||
@ -6380,7 +6395,7 @@ public:
|
||||
else
|
||||
res = c_oSerConstants::ReadUnknown;
|
||||
return res;
|
||||
};
|
||||
};
|
||||
int Read_tblGrid(BYTE type, long length, void* poResult)
|
||||
{
|
||||
int res = c_oSerConstants::ReadOk;
|
||||
@ -6545,6 +6560,53 @@ public:
|
||||
res = c_oSerConstants::ReadUnknown;
|
||||
return res;
|
||||
}
|
||||
int Read_Background(BYTE type, long length, void* poResult)
|
||||
{
|
||||
int res = c_oSerConstants::ReadOk;
|
||||
Background* pBackground = static_cast<Background*>(poResult);
|
||||
|
||||
if( c_oSerBackgroundType::Color == type )
|
||||
{
|
||||
pBackground->bColor = true;
|
||||
pBackground->Color = oBinary_CommonReader2.ReadColor();
|
||||
}
|
||||
else if( c_oSerBackgroundType::ColorTheme == type )
|
||||
{
|
||||
pBackground->bThemeColor = true;
|
||||
oBinary_CommonReader2.ReadThemeColor(length, pBackground->ThemeColor);
|
||||
}
|
||||
else if( c_oSerBackgroundType::pptxDrawing == type )
|
||||
{
|
||||
CDrawingProperty oCDrawingProperty(m_oFileWriter.getNextDocPr());
|
||||
oCDrawingProperty.bType = oCDrawingProperty.bHeight = oCDrawingProperty.bWidth = true;
|
||||
oCDrawingProperty.Type = c_oAscWrapStyle::Inline;
|
||||
|
||||
CString sDrawingProperty = oCDrawingProperty.Write();
|
||||
|
||||
BYTE type = m_oBufferedStream.GetUChar();
|
||||
long lenType = m_oBufferedStream.GetUChar();
|
||||
int nRealLen = m_oBufferedStream.GetLong();
|
||||
|
||||
CString* bstrDrawingXml = NULL;
|
||||
|
||||
long nCurPos = m_oBufferedStream.GetPos();
|
||||
|
||||
|
||||
m_oFileWriter.m_pDrawingConverter->SaveObjectEx(nCurPos, nRealLen, sDrawingProperty, XMLWRITER_DOC_TYPE_DOCX, &bstrDrawingXml);
|
||||
|
||||
if(NULL != bstrDrawingXml && false == bstrDrawingXml->IsEmpty())
|
||||
{
|
||||
pBackground->sObject = *bstrDrawingXml;
|
||||
}
|
||||
RELEASEOBJECT(bstrDrawingXml);
|
||||
|
||||
m_oBufferedStream.Seek(nCurPos + nRealLen);
|
||||
}
|
||||
else
|
||||
res = c_oSerConstants::ReadUnknown;
|
||||
return res;
|
||||
}
|
||||
|
||||
int ReadPptxDrawing(BYTE type, long length, void* poResult)
|
||||
{
|
||||
int res = c_oSerConstants::ReadOk;
|
||||
@ -6591,14 +6653,14 @@ public:
|
||||
|
||||
//save xlsx
|
||||
std::wstring sXlsxFilename = L"Microsoft_Excel_Worksheet" + std::to_wstring(m_oFileWriter.m_oChartWriter.getChartCount() + 1) + L".xlsx";
|
||||
std::wstring sXlsxPath = string2std_string(pathChartsWorksheetDir.GetPath() + FILE_SEPARATOR_STR) + sXlsxFilename;
|
||||
std::wstring sXlsxPath = pathChartsWorksheetDir.GetPath() + FILE_SEPARATOR_STR + sXlsxFilename;
|
||||
BinXlsxRW::CXlsxSerializer oXlsxSerializer;
|
||||
oXlsxSerializer.writeChartXlsx(sXlsxPath, *pChartSpace);
|
||||
|
||||
std::wstring sChartsWorksheetRelsName = L"../embeddings/" + sXlsxFilename;
|
||||
long rIdXlsx;
|
||||
CString bstrChartsWorksheetRelType = OOX::Spreadsheet::FileTypes::ChartsWorksheet.RelationType();
|
||||
m_oFileWriter.m_pDrawingConverter->WriteRels(bstrChartsWorksheetRelType, std_string2string(sChartsWorksheetRelsName), CString(), &rIdXlsx);
|
||||
m_oFileWriter.m_pDrawingConverter->WriteRels(bstrChartsWorksheetRelType, sChartsWorksheetRelsName, CString(), &rIdXlsx);
|
||||
|
||||
pChartSpace->m_oChartSpace.m_externalData = new OOX::Spreadsheet::CT_ExternalData();
|
||||
pChartSpace->m_oChartSpace.m_externalData->m_id = new std::wstring();
|
||||
@ -6611,14 +6673,15 @@ public:
|
||||
NSStringUtils::CStringBuilder sw;
|
||||
pChartSpace->toXML(sw);
|
||||
|
||||
CString sFilename;
|
||||
CString sRelsName;
|
||||
std::wstring sFilename;
|
||||
std::wstring sRelsName;
|
||||
int nChartIndex;
|
||||
std::wstring sContent = sw.GetData();
|
||||
m_oFileWriter.m_oChartWriter.AddChart(sContent, sRelsName, sFilename, nChartIndex);
|
||||
|
||||
m_oFileWriter.m_oChartWriter.AddChart(sContent, sRelsName, sFilename, nChartIndex);
|
||||
m_oFileWriter.m_oContentTypesWriter.AddOverrideRaw(oSaveParams.sAdditionalContentTypes);
|
||||
|
||||
OOX::CPath pathChartsRels = pathChartsRelsDir.GetPath() + FILE_SEPARATOR_STR + sFilename + _T(".rels");
|
||||
OOX::CPath pathChartsRels = pathChartsRelsDir.GetPath() + FILE_SEPARATOR_STR + sFilename + L".rels";
|
||||
m_oFileWriter.m_pDrawingConverter->SaveDstContentRels(pathChartsRels.GetPath());
|
||||
|
||||
long rIdChart;
|
||||
@ -7035,7 +7098,7 @@ Binary_HdrFtrTableReader::Binary_HdrFtrTableReader(NSBinPptxRW::CBinaryFileReade
|
||||
int Binary_HdrFtrTableReader::Read()
|
||||
{
|
||||
return ReadTable(&Binary_HdrFtrTableReader::ReadHdrFtrContent, this);
|
||||
};
|
||||
}
|
||||
int Binary_HdrFtrTableReader::ReadHdrFtrContent(BYTE type, long length, void* poResult)
|
||||
{
|
||||
int res = c_oSerConstants::ReadOk;
|
||||
|
||||
@ -57,7 +57,7 @@ namespace Writers
|
||||
if(sFontDir.IsEmpty())
|
||||
m_oApplicationFonts.Initialize();
|
||||
else
|
||||
m_oApplicationFonts.InitializeFromFolder(string2std_string(sFontDir));
|
||||
m_oApplicationFonts.InitializeFromFolder(sFontDir);
|
||||
CFontList* pFontList = m_oApplicationFonts.GetList();
|
||||
if(NULL != pFontList)
|
||||
{
|
||||
|
||||
@ -152,7 +152,8 @@ extern int g_nCurFormatVersion;
|
||||
Comments = 8,
|
||||
Settings = 9,
|
||||
Footnotes = 10,
|
||||
Endnotes = 11
|
||||
Endnotes = 11,
|
||||
Background
|
||||
};}
|
||||
namespace c_oSerSigTypes{enum c_oSerSigTypes
|
||||
{
|
||||
@ -446,20 +447,21 @@ extern int g_nCurFormatVersion;
|
||||
};}
|
||||
namespace c_oSerParType{enum c_oSerParType
|
||||
{
|
||||
Par = 0,
|
||||
pPr = 1,
|
||||
Content = 2,
|
||||
Table = 3,
|
||||
sectPr = 4,
|
||||
Run = 5,
|
||||
CommentStart = 6,
|
||||
CommentEnd = 7,
|
||||
OMathPara = 8,
|
||||
OMath = 9,
|
||||
Hyperlink = 10,
|
||||
FldSimple = 11,
|
||||
Del = 12,
|
||||
Ins = 13
|
||||
Par = 0,
|
||||
pPr = 1,
|
||||
Content = 2,
|
||||
Table = 3,
|
||||
sectPr = 4,
|
||||
Run = 5,
|
||||
CommentStart = 6,
|
||||
CommentEnd = 7,
|
||||
OMathPara = 8,
|
||||
OMath = 9,
|
||||
Hyperlink = 10,
|
||||
FldSimple = 11,
|
||||
Del = 12,
|
||||
Ins = 13,
|
||||
Background = 14
|
||||
};}
|
||||
namespace c_oSerDocTableType{enum c_oSerDocTableType
|
||||
{
|
||||
@ -506,6 +508,12 @@ extern int g_nCurFormatVersion;
|
||||
endnoteReference = 27,
|
||||
arPr = 28
|
||||
};}
|
||||
namespace c_oSerBackgroundType{enum c_oSerBackgroundType
|
||||
{
|
||||
Color = 0,
|
||||
ColorTheme = 1,
|
||||
pptxDrawing = 2
|
||||
};}
|
||||
namespace c_oSerImageType{enum c_oSerImageType
|
||||
{
|
||||
MediaId = 0,
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -248,7 +248,7 @@ namespace BinXlsxRW{
|
||||
pTable->m_oTable->m_oDisplayName.Init();
|
||||
pTable->m_oTable->m_oDisplayName->append(L"Table1");
|
||||
pTable->m_oTable->m_oRef.Init();
|
||||
pTable->m_oTable->m_oRef->SetValue(std_string2string(OOX::Spreadsheet::CCell::combineRef(m_nRow1 - 1, m_nCol1 - 1) + L":" + OOX::Spreadsheet::CCell::combineRef(m_nRow2 - 1, m_nCol2 - 1)));
|
||||
pTable->m_oTable->m_oRef->SetValue(OOX::Spreadsheet::CCell::combineRef(m_nRow1 - 1, m_nCol1 - 1) + L":" + OOX::Spreadsheet::CCell::combineRef(m_nRow2 - 1, m_nCol2 - 1));
|
||||
pTable->m_oTable->m_oTotalsRowCount.Init();
|
||||
pTable->m_oTable->m_oTotalsRowCount->SetValue(0);
|
||||
pTable->m_oTable->m_oTableBorderDxfId.Init();
|
||||
|
||||
@ -32,12 +32,7 @@
|
||||
#ifndef CHART_WRITER
|
||||
#define CHART_WRITER
|
||||
|
||||
#if defined(_WIN32) || defined (_WIN64)
|
||||
#include <atlbase.h>
|
||||
#include <atlstr.h>
|
||||
#else
|
||||
#include "../../Common/DocxFormat/Source/Base/ASCString.h"
|
||||
#endif
|
||||
#include "../../Common/DocxFormat/Source/Base/ASCString.h"
|
||||
|
||||
#include <string>
|
||||
#include <map>
|
||||
|
||||
@ -50,48 +50,45 @@ BinDocxRW::CDocxSerializer::CDocxSerializer()
|
||||
}
|
||||
bool BinDocxRW::CDocxSerializer::ConvertDocxToDoct(const CString& sSrcFileName, const CString& sDstFileName, const CString& sTmpDir, const CString& sXMLOptions)
|
||||
{
|
||||
std::wstring strDirSrc = NSSystemPath::Combine(string2std_string(sTmpDir), _T("from"));
|
||||
std::wstring strDirDst = NSSystemPath::Combine(string2std_string(sTmpDir), _T("to"));
|
||||
std::wstring strEditorBin = NSSystemPath::Combine(strDirDst, _T("Editor.bin"));
|
||||
std::wstring strDirSrc = NSSystemPath::Combine(sTmpDir, L"from");
|
||||
std::wstring strDirDst = NSSystemPath::Combine(sTmpDir, L"to");
|
||||
std::wstring strEditorBin = NSSystemPath::Combine(strDirDst, L"Editor.bin");
|
||||
|
||||
NSDirectory::CreateDirectory(strDirSrc);
|
||||
NSDirectory::CreateDirectory(strDirDst);
|
||||
|
||||
CString sDirSrc = std_string2string(strDirSrc);
|
||||
CString sEditorBin = std_string2string(strEditorBin);
|
||||
|
||||
COfficeUtils oCOfficeUtils(NULL);
|
||||
|
||||
if(S_OK == oCOfficeUtils.ExtractToDirectory(string2std_string(sSrcFileName), strDirSrc, NULL, 0))
|
||||
if(saveToFile(sEditorBin, sDirSrc, sXMLOptions))
|
||||
if(S_OK == oCOfficeUtils.CompressFileOrDirectory(strDirDst, string2std_string(sDstFileName), -1))
|
||||
if(S_OK == oCOfficeUtils.ExtractToDirectory(sSrcFileName, strDirSrc, NULL, 0))
|
||||
if(saveToFile(strEditorBin, strDirSrc, sXMLOptions))
|
||||
if(S_OK == oCOfficeUtils.CompressFileOrDirectory(strDirDst, sDstFileName, -1))
|
||||
return true;
|
||||
return false;
|
||||
}
|
||||
bool BinDocxRW::CDocxSerializer::ConvertDoctToDocx(const CString& sSrcFileName, const CString& sDstFileName, const CString& sTmpDir, const CString& sXMLOptions)
|
||||
{
|
||||
std::wstring strDirSrc = NSSystemPath::Combine(string2std_string(sTmpDir), _T("from"));
|
||||
std::wstring strEditorBin = NSSystemPath::Combine(strDirSrc, _T("Editor.bin"));
|
||||
std::wstring strDirDst = NSSystemPath::Combine(string2std_string(sTmpDir), _T("to"));
|
||||
std::wstring strDirSrc = NSSystemPath::Combine(sTmpDir, L"from");
|
||||
std::wstring strEditorBin = NSSystemPath::Combine(strDirSrc, L"Editor.bin");
|
||||
std::wstring strDirDst = NSSystemPath::Combine(sTmpDir, L"to");
|
||||
|
||||
NSDirectory::CreateDirectory(strDirSrc);
|
||||
NSDirectory::CreateDirectory(strDirDst);
|
||||
|
||||
CString sEditorBin = std_string2string(strEditorBin);
|
||||
CString sEditorBin = strEditorBin;
|
||||
|
||||
COfficeUtils oCOfficeUtils(NULL);
|
||||
|
||||
if(S_OK == oCOfficeUtils.ExtractToDirectory(string2std_string(sSrcFileName), strDirSrc, NULL, 0))
|
||||
if(S_OK == oCOfficeUtils.ExtractToDirectory(sSrcFileName, strDirSrc, NULL, 0))
|
||||
{
|
||||
CString sMediaPath;
|
||||
CString sThemePath;
|
||||
CString sEmbedPath;
|
||||
|
||||
CreateDocxFolders(std_string2string(strDirDst), sThemePath, sMediaPath, sEmbedPath);
|
||||
CreateDocxFolders(strDirDst, sThemePath, sMediaPath, sEmbedPath);
|
||||
|
||||
if(loadFromFile(sEditorBin, std_string2string(strDirDst), sXMLOptions, sThemePath, sMediaPath, sEmbedPath))
|
||||
if(loadFromFile(sEditorBin, strDirDst, sXMLOptions, sThemePath, sMediaPath, sEmbedPath))
|
||||
{
|
||||
if(S_OK == oCOfficeUtils.CompressFileOrDirectory(strDirDst, string2std_string(sDstFileName), -1))
|
||||
if(S_OK == oCOfficeUtils.CompressFileOrDirectory(strDirDst, sDstFileName, -1))
|
||||
return true;
|
||||
}
|
||||
}
|
||||
@ -102,7 +99,7 @@ bool BinDocxRW::CDocxSerializer::saveToFile(const CString& sSrcFileName, const C
|
||||
OOX::CPath pathMain(sSrcFileName);
|
||||
|
||||
OOX::CPath pathMedia = pathMain.GetDirectory() + FILE_SEPARATOR_STR + _T("media");
|
||||
NSDirectory::CreateDirectory(string2std_string(pathMedia.GetPath()));
|
||||
NSDirectory::CreateDirectory(pathMedia.GetPath());
|
||||
|
||||
COfficeFontPicker* pFontPicker = new COfficeFontPicker();
|
||||
pFontPicker->Init(m_sFontDir);
|
||||
@ -116,7 +113,7 @@ bool BinDocxRW::CDocxSerializer::saveToFile(const CString& sSrcFileName, const C
|
||||
NSFontCutter::CEmbeddedFontsManager* pEmbeddedFontsManager = NULL;
|
||||
if(false == m_sEmbeddedFontsDir.IsEmpty())
|
||||
{
|
||||
NSDirectory::CreateDirectory(string2std_string(m_sEmbeddedFontsDir));
|
||||
NSDirectory::CreateDirectory(m_sEmbeddedFontsDir);
|
||||
|
||||
pFontPicker->SetEmbeddedFontsDirectory(m_sEmbeddedFontsDir);
|
||||
|
||||
@ -146,7 +143,7 @@ bool BinDocxRW::CDocxSerializer::saveToFile(const CString& sSrcFileName, const C
|
||||
if (m_bIsNoBase64Save)
|
||||
{
|
||||
NSFile::CFileBinary oFile;
|
||||
oFile.CreateFileW(string2std_string(sSrcFileName));
|
||||
oFile.CreateFileW(sSrcFileName);
|
||||
oFile.WriteFile(pbBinBuffer, nBinBufferLen);
|
||||
oFile.CloseFile();
|
||||
}
|
||||
@ -158,8 +155,8 @@ bool BinDocxRW::CDocxSerializer::saveToFile(const CString& sSrcFileName, const C
|
||||
if(true == Base64_1::Base64Encode(pbBinBuffer, nBinBufferLen, pbBase64Buffer, &nBase64BufferLen))
|
||||
{
|
||||
NSFile::CFileBinary oFile;
|
||||
oFile.CreateFileW(string2std_string(sSrcFileName));
|
||||
oFile.WriteStringUTF8(string2std_string(oBinaryFileWriter.WriteFileHeader(nBinBufferLen)));
|
||||
oFile.CreateFileW(sSrcFileName);
|
||||
oFile.WriteStringUTF8(oBinaryFileWriter.WriteFileHeader(nBinBufferLen));
|
||||
oFile.WriteFile(pbBase64Buffer, nBase64BufferLen);
|
||||
oFile.CloseFile();
|
||||
}
|
||||
@ -175,32 +172,32 @@ bool BinDocxRW::CDocxSerializer::CreateDocxFolders(CString strDirectory, CString
|
||||
bool res = true;
|
||||
// rels
|
||||
OOX::CPath pathRels = strDirectory + FILE_SEPARATOR_STR + _T("_rels");
|
||||
if (!NSDirectory::CreateDirectory(pathRels.GetPath().GetBuffer())) res = false;
|
||||
if (!NSDirectory::CreateDirectory(pathRels.GetPath())) res = false;
|
||||
|
||||
// word
|
||||
OOX::CPath pathWord = strDirectory + FILE_SEPARATOR_STR + _T("word");
|
||||
if (!NSDirectory::CreateDirectory(pathWord.GetPath().GetBuffer())) res = false;
|
||||
if (!NSDirectory::CreateDirectory(pathWord.GetPath())) res = false;
|
||||
|
||||
// documentRels
|
||||
OOX::CPath pathWordRels = pathWord + FILE_SEPARATOR_STR + _T("_rels");
|
||||
if (!NSDirectory::CreateDirectory(pathWordRels.GetPath().GetBuffer()))res = false;
|
||||
if (!NSDirectory::CreateDirectory(pathWordRels.GetPath()))res = false;
|
||||
|
||||
//media
|
||||
OOX::CPath pathMedia = pathWord + FILE_SEPARATOR_STR + _T("media");
|
||||
if (!NSDirectory::CreateDirectory(pathMedia.GetPath().GetBuffer())) res = false;
|
||||
if (!NSDirectory::CreateDirectory(pathMedia.GetPath())) res = false;
|
||||
sMediaPath = pathMedia.GetPath();
|
||||
|
||||
//embeddings
|
||||
OOX::CPath pathEmbeddings = pathWord + FILE_SEPARATOR_STR + _T("embeddings");
|
||||
if (!NSDirectory::CreateDirectory(pathEmbeddings.GetPath().GetBuffer()))res = false;
|
||||
if (!NSDirectory::CreateDirectory(pathEmbeddings.GetPath()))res = false;
|
||||
sEmbedPath = pathEmbeddings.GetPath();
|
||||
|
||||
// theme
|
||||
OOX::CPath pathTheme = pathWord + FILE_SEPARATOR_STR + _T("theme");
|
||||
if (!NSDirectory::CreateDirectory(pathTheme.GetPath().GetBuffer())) res = false;
|
||||
if (!NSDirectory::CreateDirectory(pathTheme.GetPath())) res = false;
|
||||
|
||||
OOX::CPath pathThemeRels = pathTheme + FILE_SEPARATOR_STR + _T("_rels");
|
||||
if (!NSDirectory::CreateDirectory(pathThemeRels.GetPath().GetBuffer())) res = false;
|
||||
if (!NSDirectory::CreateDirectory(pathThemeRels.GetPath())) res = false;
|
||||
|
||||
pathTheme = pathTheme + FILE_SEPARATOR_STR + _T("theme1.xml");
|
||||
sThemePath = pathTheme.GetPath();
|
||||
@ -212,7 +209,7 @@ bool BinDocxRW::CDocxSerializer::loadFromFile(const CString& sSrcFileName, const
|
||||
bool bResultOk = false;
|
||||
|
||||
NSFile::CFileBinary oFile;
|
||||
if(oFile.OpenFile(string2std_string(sSrcFileName)))
|
||||
if(oFile.OpenFile(sSrcFileName))
|
||||
{
|
||||
DWORD nBase64DataSize = 0;
|
||||
BYTE* pBase64Data = new BYTE[oFile.GetFileSize()];
|
||||
@ -286,7 +283,7 @@ bool BinDocxRW::CDocxSerializer::loadFromFile(const CString& sSrcFileName, const
|
||||
m_pCurFileWriter = new Writers::FileWriter(sDstPath, m_sFontDir, false, nVersion, m_bSaveChartAsImg, &oDrawingConverter, sThemePath);
|
||||
|
||||
//папка с картинками
|
||||
std::wstring strFileInDir = NSSystemPath::GetDirectoryName(string2std_string(sSrcFileName));
|
||||
std::wstring strFileInDir = NSSystemPath::GetDirectoryName(sSrcFileName);
|
||||
CString sFileInDir = strFileInDir.c_str();
|
||||
|
||||
VARIANT var;
|
||||
|
||||
@ -32,12 +32,7 @@
|
||||
#ifndef DOCX_SERIALIZER
|
||||
#define DOCX_SERIALIZER
|
||||
|
||||
#if defined(_WIN32) || defined (_WIN64)
|
||||
#include <atlbase.h>
|
||||
#include <atlstr.h>
|
||||
#else
|
||||
#include "../../Common/DocxFormat/Source/Base/ASCString.h"
|
||||
#endif
|
||||
#include "../../Common/DocxFormat/Source/Base/ASCString.h"
|
||||
#include "../../Common/DocxFormat/Source/DocxFormat/WritingElement.h"
|
||||
|
||||
namespace Writers
|
||||
|
||||
@ -95,13 +95,14 @@ namespace DocWrapper {
|
||||
sFontName = pTheme->GetMinorFont();
|
||||
}
|
||||
if(sFontName.IsEmpty() && oRFont.IsInit() && oRFont->m_sVal.IsInit())
|
||||
sFontName = std_string2string(oRFont->ToString2());
|
||||
sFontName = oRFont->ToString2();
|
||||
if(sFontName.IsEmpty())
|
||||
sFontName = CString(gc_sNoNameFont);
|
||||
//подбор перенесен в js
|
||||
return sFontName;
|
||||
oFontSelectFormat.wsName = new std::wstring;
|
||||
*oFontSelectFormat.wsName = string2std_string(sFontName);
|
||||
|
||||
oFontSelectFormat.wsName = new std::wstring(sFontName);
|
||||
|
||||
if(oCharset.IsInit() && oCharset->m_oCharset.IsInit())
|
||||
{
|
||||
SimpleTypes::Spreadsheet::EFontCharset eCharset = oCharset->m_oCharset->GetValue();
|
||||
@ -121,7 +122,7 @@ namespace DocWrapper {
|
||||
CString sRes;
|
||||
CFontInfo* pFontInfo = m_pFontManager->GetFontInfoByParams(oFontSelectFormat);
|
||||
if(NULL != pFontInfo)
|
||||
sRes = std_string2string(pFontInfo->m_wsFontName);
|
||||
sRes = pFontInfo->m_wsFontName;
|
||||
else
|
||||
sRes = gc_sDefaultFontName;
|
||||
fontMap[sFontName] = sRes;
|
||||
@ -135,12 +136,12 @@ namespace DocWrapper {
|
||||
sFontName = CString(gc_sNoNameFont);
|
||||
else
|
||||
sFontName = font.m_sName;
|
||||
oFontSelectFormat.wsName = new std::wstring;
|
||||
*oFontSelectFormat.wsName = string2std_string(sFontName);
|
||||
|
||||
oFontSelectFormat.wsName = new std::wstring(sFontName);
|
||||
|
||||
if (font.m_oAltName.IsInit() && font.m_oAltName->GetLength() > 0)
|
||||
{
|
||||
oFontSelectFormat.wsAltName = new std::wstring;
|
||||
*oFontSelectFormat.wsAltName = string2std_string(*font.m_oAltName);
|
||||
oFontSelectFormat.wsAltName = new std::wstring(*font.m_oAltName);
|
||||
}
|
||||
if(font.m_oCharset.IsInit())
|
||||
{
|
||||
@ -216,7 +217,7 @@ namespace DocWrapper {
|
||||
|
||||
CFontInfo* pFontInfo = m_pFontManager->GetFontInfoByParams(oFontSelectFormat);
|
||||
if(NULL != pFontInfo)
|
||||
fontMap[sFontName] = std_string2string(pFontInfo->m_wsFontName);
|
||||
fontMap[sFontName] = pFontInfo->m_wsFontName;
|
||||
else
|
||||
fontMap[sFontName] = gc_sDefaultFontName;
|
||||
}
|
||||
|
||||
@ -34,14 +34,9 @@
|
||||
|
||||
#include <map>
|
||||
|
||||
#if defined(_WIN32) || defined (_WIN64)
|
||||
#include <atlbase.h>
|
||||
#include <atlstr.h>
|
||||
#else
|
||||
#include "../../Common/DocxFormat/Source/Base/ASCString.h"
|
||||
#endif
|
||||
|
||||
#include "../../Common/DocxFormat/Source/Base/ASCString.h"
|
||||
#include "../../DesktopEditor/fontengine/ApplicationFonts.h"
|
||||
|
||||
//#include "DocWrapper/Base.h"
|
||||
namespace NSCommon{
|
||||
template<class Type> class nullable;
|
||||
|
||||
@ -68,11 +68,11 @@ namespace BinXlsxRW{
|
||||
|
||||
OOX::CPath pathThemeThemeRelsDir = pathThemeDir + FILE_SEPARATOR_STR + _T("_rels");
|
||||
|
||||
NSDirectory::CreateDirectory(string2std_string(pathXlDir.GetPath()));
|
||||
NSDirectory::CreateDirectory(string2std_string(pathThemeDir.GetPath()));
|
||||
NSDirectory::CreateDirectory(string2std_string(pathThemeThemeRelsDir.GetPath()));
|
||||
NSDirectory::CreateDirectory(string2std_string(pathMediaDir.GetPath()));
|
||||
NSDirectory::CreateDirectory(string2std_string(pathEmbedDir.GetPath()));
|
||||
NSDirectory::CreateDirectory(pathXlDir.GetPath());
|
||||
NSDirectory::CreateDirectory(pathThemeDir.GetPath());
|
||||
NSDirectory::CreateDirectory(pathThemeThemeRelsDir.GetPath());
|
||||
NSDirectory::CreateDirectory(pathMediaDir.GetPath());
|
||||
NSDirectory::CreateDirectory(pathEmbedDir.GetPath());
|
||||
|
||||
//Create Default Theme
|
||||
{
|
||||
@ -90,7 +90,7 @@ namespace BinXlsxRW{
|
||||
oOfficeDrawingConverter.SetEmbedDstPath(sEmbedDir);
|
||||
|
||||
//папка с бинарников
|
||||
std::wstring strFileInDir = NSSystemPath::GetDirectoryName(string2std_string(sSrcFileName));
|
||||
std::wstring strFileInDir = NSSystemPath::GetDirectoryName(sSrcFileName);
|
||||
CString sFileInDir = strFileInDir.c_str();
|
||||
|
||||
VARIANT var;
|
||||
@ -119,7 +119,7 @@ namespace BinXlsxRW{
|
||||
NSFontCutter::CEmbeddedFontsManager* pEmbeddedFontsManager = NULL;
|
||||
if(false == m_sEmbeddedFontsDir.IsEmpty())
|
||||
{
|
||||
NSDirectory::CreateDirectory(string2std_string(m_sEmbeddedFontsDir));
|
||||
NSDirectory::CreateDirectory(m_sEmbeddedFontsDir);
|
||||
|
||||
pFontPicker->SetEmbeddedFontsDirectory(m_sEmbeddedFontsDir);
|
||||
pEmbeddedFontsManager = pFontPicker->GetNativeCutter();
|
||||
@ -182,40 +182,42 @@ namespace BinXlsxRW{
|
||||
{
|
||||
m_pExternalDrawingConverter->SetDstContentRels();
|
||||
|
||||
//получаем sThemePath из bsFilename предполагая что папка theme находится на уровень выше bsFilename
|
||||
CString sThemePath;
|
||||
CString sEmbedingPath;
|
||||
CString sFilenameReverse = sFilepath;sFilenameReverse.MakeReverse();
|
||||
//получаем sThemePath из bsFilename предполагая что папка theme находится на уровень выше bsFilename
|
||||
std::wstring sThemePath;
|
||||
std::wstring sEmbedingPath;
|
||||
|
||||
CString sFilenameReverse = sFilepath; sFilenameReverse.MakeReverse();
|
||||
|
||||
int nIndex = sFilenameReverse.Find(FILE_SEPARATOR_CHAR);
|
||||
nIndex = sFilenameReverse.Find(FILE_SEPARATOR_CHAR, nIndex + 1);
|
||||
if(-1 != nIndex)
|
||||
{
|
||||
CString sFilepathLeft = sFilepath.Left(sFilepath.GetLength() - nIndex);
|
||||
sThemePath = sFilepathLeft + _T("theme");
|
||||
sEmbedingPath = sFilepathLeft + _T("embeddings");
|
||||
sThemePath = sFilepathLeft + L"theme";
|
||||
sEmbedingPath = sFilepathLeft + L"embeddings";
|
||||
}
|
||||
|
||||
//todo theme path
|
||||
BinXlsxRW::SaveParams oSaveParams(sThemePath);
|
||||
OOX::Spreadsheet::CChartSpace oChartSpace;
|
||||
BinXlsxRW::BinaryChartReader oBinaryChartReader(oBufferedStream, oSaveParams, m_pExternalDrawingConverter);
|
||||
//todo theme path
|
||||
BinXlsxRW::SaveParams oSaveParams(sThemePath);
|
||||
OOX::Spreadsheet::CChartSpace oChartSpace;
|
||||
BinXlsxRW::BinaryChartReader oBinaryChartReader(oBufferedStream, oSaveParams, m_pExternalDrawingConverter);
|
||||
|
||||
oBinaryChartReader.ReadCT_ChartSpace(lLength, &oChartSpace.m_oChartSpace);
|
||||
|
||||
if(oChartSpace.isValid())
|
||||
{
|
||||
//todo не делать embeddings, если пишем xlsx
|
||||
//save xlsx
|
||||
if(!sEmbedingPath.IsEmpty())
|
||||
if(!sEmbedingPath.empty())
|
||||
{
|
||||
std::wstring sXlsxFilename = L"Microsoft_Excel_Worksheet" + std::to_wstring(lChartNumber) + L".xlsx";
|
||||
std::wstring sXlsxPath = string2std_string(sEmbedingPath + FILE_SEPARATOR_STR) + sXlsxFilename;
|
||||
std::wstring sXlsxPath = sEmbedingPath + FILE_SEPARATOR_STR + sXlsxFilename;
|
||||
writeChartXlsx(sXlsxPath, oChartSpace);
|
||||
|
||||
std::wstring sChartsWorksheetRelsName = L"../embeddings/" + sXlsxFilename;
|
||||
long rId;
|
||||
CString bstrChartsWorksheetRelType = OOX::Spreadsheet::FileTypes::ChartsWorksheet.RelationType();
|
||||
m_pExternalDrawingConverter->WriteRels(bstrChartsWorksheetRelType, std_string2string(sChartsWorksheetRelsName), CString(), &rId);
|
||||
m_pExternalDrawingConverter->WriteRels(bstrChartsWorksheetRelType, sChartsWorksheetRelsName, CString(), &rId);
|
||||
|
||||
oChartSpace.m_oChartSpace.m_externalData = new OOX::Spreadsheet::CT_ExternalData();
|
||||
oChartSpace.m_oChartSpace.m_externalData->m_id = new std::wstring();
|
||||
@ -225,9 +227,9 @@ namespace BinXlsxRW{
|
||||
oChartSpace.m_oChartSpace.m_externalData->m_autoUpdate->m_val = new bool(false);
|
||||
}
|
||||
|
||||
std::wstring strFilepath = string2std_string(sFilepath);
|
||||
CString strDir = std_string2string(NSSystemPath::GetDirectoryName(strFilepath));
|
||||
CString strFilename = std_string2string(NSSystemPath::GetFileName(strFilepath));
|
||||
std::wstring strFilepath = sFilepath;
|
||||
CString strDir = NSSystemPath::GetDirectoryName(strFilepath);
|
||||
CString strFilename = NSSystemPath::GetFileName(strFilepath);
|
||||
|
||||
OOX::CPath pathRelsDir = strDir + FILE_SEPARATOR_STR + _T("_rels");
|
||||
|
||||
@ -250,11 +252,11 @@ namespace BinXlsxRW{
|
||||
}
|
||||
return bRes;
|
||||
}
|
||||
void CXlsxSerializer::setFontDir(CString& sFontDir)
|
||||
void CXlsxSerializer::setFontDir(std::wstring& sFontDir)
|
||||
{
|
||||
m_sFontDir = sFontDir;
|
||||
}
|
||||
void CXlsxSerializer::setEmbeddedFontsDir(CString& sEmbeddedFontsDir)
|
||||
void CXlsxSerializer::setEmbeddedFontsDir(std::wstring& sEmbeddedFontsDir)
|
||||
{
|
||||
m_sEmbeddedFontsDir = sEmbeddedFontsDir;
|
||||
}
|
||||
@ -275,7 +277,7 @@ namespace BinXlsxRW{
|
||||
CString sXmlOptions = _T("");
|
||||
CString sMediaPath;// will be filled by 'CreateXlsxFolders' method
|
||||
CString sEmbedPath; // will be filled by 'CreateXlsxFolders' method
|
||||
CreateXlsxFolders (sXmlOptions, std_string2string(sTempDir), sMediaPath, sEmbedPath);
|
||||
CreateXlsxFolders (sXmlOptions, sTempDir, sMediaPath, sEmbedPath);
|
||||
//заполняем Xlsx
|
||||
OOX::Spreadsheet::CXlsx oXlsx;
|
||||
helper.toXlsx(oXlsx);
|
||||
|
||||
@ -32,13 +32,7 @@
|
||||
#ifndef XLSX_SERIALIZER
|
||||
#define XLSX_SERIALIZER
|
||||
|
||||
#if defined(_WIN32) || defined (_WIN64)
|
||||
#include <atlbase.h>
|
||||
#include <atlstr.h>
|
||||
#else
|
||||
#include "../../Common/DocxFormat/Source/Base/ASCString.h"
|
||||
#endif
|
||||
|
||||
#include "../../Common/DocxFormat/Source/Base/ASCString.h"
|
||||
#include <string>
|
||||
|
||||
namespace OOX
|
||||
@ -74,8 +68,8 @@ namespace BinXlsxRW {
|
||||
bool loadChart(CString& sChartPath, NSBinPptxRW::CBinaryFileWriter& oBufferedStream, long& lDataSize);
|
||||
bool saveChart(NSBinPptxRW::CBinaryFileReader& oBufferedStream, long lLength, CString& sFilename, CString& sContentTypePath, CString** sContentTypeElement, const long& lChartNumber);
|
||||
|
||||
void setFontDir(CString& sFontDir);
|
||||
void setEmbeddedFontsDir(CString& sEmbeddedFontsDir);
|
||||
void setFontDir (std::wstring& sFontDir);
|
||||
void setEmbeddedFontsDir(std::wstring& sEmbeddedFontsDir);
|
||||
void setDrawingConverter(NSBinPptxRW::CDrawingConverter* pDrawingConverter);
|
||||
|
||||
void writeChartXlsx(const std::wstring& sDstFile ,const OOX::Spreadsheet::CChartSpace& oChart);
|
||||
|
||||
@ -37,12 +37,21 @@
|
||||
|
||||
#include "../../src/ConvertOO2OOX.h"
|
||||
|
||||
#if defined(_WIN64)
|
||||
#pragma comment(lib, "../../../build/bin/icu/win_64/icuuc.lib")
|
||||
#elif defined (_WIN32)
|
||||
#pragma comment(lib, "../../../build/bin/icu/win_32/icuuc.lib")
|
||||
#endif
|
||||
|
||||
int _tmain(int argc, _TCHAR* argv[])
|
||||
{
|
||||
if (argc < 2) return 1;
|
||||
|
||||
HRESULT hr = S_OK;
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
std::wstring srcFileName = argv[1];
|
||||
std::wstring dstPath = argv[2];
|
||||
std::wstring dstPath = argc > 2 ? argv[2] : sSrcDoc + L"-my.docx"; //xlsx pptx
|
||||
|
||||
std::wstring outputDir = FileSystem::Directory::GetFolderPath(dstPath);
|
||||
|
||||
std::wstring srcTempPath = FileSystem::Directory::CreateDirectoryWithUniqueName(outputDir);
|
||||
|
||||
@ -345,6 +345,30 @@
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\Common\3dParty\pole\pole.cpp"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Debug|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
<File
|
||||
RelativePath="..\..\..\UnicodeConverter\UnicodeConverter.cpp"
|
||||
>
|
||||
<FileConfiguration
|
||||
Name="Debug|Win32"
|
||||
>
|
||||
<Tool
|
||||
Name="VCCLCompilerTool"
|
||||
UsePrecompiledHeader="0"
|
||||
/>
|
||||
</FileConfiguration>
|
||||
</File>
|
||||
</Filter>
|
||||
</Files>
|
||||
<Globals>
|
||||
|
||||
@ -213,7 +213,6 @@ SOURCES += \
|
||||
../src/docx/hyperlinks.cpp \
|
||||
../src/docx/measuredigits.cpp \
|
||||
../src/docx/mediaitems.cpp \
|
||||
../src/docx/mediaitems_utils.cpp \
|
||||
../src/docx/namespaces.cpp \
|
||||
../src/docx/oox_chart_axis.cpp \
|
||||
../src/docx/oox_chart_context.cpp \
|
||||
@ -462,7 +461,6 @@ HEADERS += \
|
||||
../src/docx/hyperlinks.h \
|
||||
../src/docx/measuredigits.h \
|
||||
../src/docx/mediaitems.h \
|
||||
../src/docx/mediaitems_utils.h \
|
||||
../src/docx/namespaces.h \
|
||||
../src/docx/oox_chart_axis.h \
|
||||
../src/docx/oox_chart_context.h \
|
||||
|
||||
@ -622,7 +622,8 @@ void _docx_drawing::serialize(std::wostream & strm/*, bool insideOtherDrawing*/)
|
||||
if (inGroup)
|
||||
return docx_serialize_child(strm, *this);
|
||||
|
||||
if (type == typeObject)
|
||||
if (type == typeMsObject ||
|
||||
type == typeOleObject)
|
||||
{
|
||||
docx_serialize_object(strm, *this);
|
||||
}
|
||||
|
||||
@ -141,7 +141,7 @@ void word_files::update_rels(docx_conversion_context & Context)
|
||||
|
||||
void word_files::set_media(mediaitems & _Mediaitems, CApplicationFonts *pAppFonts)
|
||||
{
|
||||
if (_Mediaitems.count_image > 0)
|
||||
if (_Mediaitems.count_image + _Mediaitems.count_media > 0)
|
||||
{
|
||||
media_ = element_ptr( new media(_Mediaitems, pAppFonts) );
|
||||
}
|
||||
|
||||
@ -52,6 +52,8 @@ struct drawing_object_description
|
||||
oox::RelsType type_;
|
||||
|
||||
std::wstring name_;
|
||||
std::wstring descriptor_;
|
||||
|
||||
_CP_OPT(_rect) svg_rect_;
|
||||
|
||||
std::wstring anchor_;
|
||||
@ -66,7 +68,6 @@ struct drawing_object_description
|
||||
|
||||
_oox_fill fill_;
|
||||
|
||||
bool use_image_replace_;
|
||||
bool in_group_;
|
||||
|
||||
int shape_type_; //default - frame
|
||||
|
||||
@ -39,15 +39,27 @@
|
||||
|
||||
#include <cpdoccore/xml/utils.h>
|
||||
|
||||
#include "mediaitems_utils.h"
|
||||
|
||||
#include "../../Common/DocxFormat/Source/Base/Base.h"
|
||||
#include "../../Common/DocxFormat/Source/SystemUtility/File.h"
|
||||
#include "../../Common/DocxFormat/Source/SystemUtility/FileSystem/Directory.h"
|
||||
|
||||
#include "../../DesktopEditor/raster/ImageFileFormatChecker.h"
|
||||
|
||||
namespace cpdoccore {
|
||||
namespace oox {
|
||||
|
||||
bool is_internal(const std::wstring & uri, const std::wstring & packetRoot)
|
||||
{
|
||||
if (uri.empty())return false;
|
||||
|
||||
std::wstring mediaPath = boost::regex_search(uri.begin(), uri.end(), boost::wregex(L"^/[A-Za-z]:"))
|
||||
? std::wstring(uri.begin() + 1, uri.end())
|
||||
: uri;
|
||||
|
||||
std::wstring resultPath = packetRoot + FILE_SEPARATOR_STR + mediaPath;
|
||||
|
||||
return FileSystem::Directory::IsExist(resultPath) || FileSystem::Directory::IsExist(mediaPath);
|
||||
}
|
||||
|
||||
mediaitems::item::item( std::wstring const & _href,
|
||||
RelsType _type,
|
||||
@ -55,12 +67,12 @@ mediaitems::item::item( std::wstring const & _href,
|
||||
bool _mediaInternal,
|
||||
std::wstring const & _Id
|
||||
)
|
||||
: href(_href),
|
||||
type(_type),
|
||||
outputName(_outputName),
|
||||
mediaInternal(_mediaInternal),
|
||||
Id(_Id),
|
||||
valid(true) //вообще говоря даже если файл покоцанный то мы все равно обязаны перенести "объект"
|
||||
: href(_href),
|
||||
type(_type),
|
||||
outputName(_outputName),
|
||||
mediaInternal(_mediaInternal),
|
||||
Id(_Id),
|
||||
valid(true) //вообще говоря даже если файл покоцанный то мы все равно обязаны перенести "объект"
|
||||
{
|
||||
count_add = 1;
|
||||
count_used = 0;
|
||||
@ -82,8 +94,10 @@ std::wstring static get_default_file_name(RelsType type)
|
||||
return L"chart";
|
||||
case typeMedia:
|
||||
return L"media";
|
||||
case typeObject:
|
||||
return L"oleObject";
|
||||
case typeMsObject:
|
||||
return L"msObject";
|
||||
case typeOleObject:
|
||||
return L"oleObject";
|
||||
default:
|
||||
return L"";
|
||||
}
|
||||
@ -123,7 +137,7 @@ std::wstring mediaitems::create_file_name(const std::wstring & uri, RelsType typ
|
||||
}
|
||||
}
|
||||
|
||||
if (type == typeObject && sExt.empty())
|
||||
if (type == typeOleObject && sExt.empty())
|
||||
sExt = L".bin";
|
||||
|
||||
return get_default_file_name(type) + std::to_wstring(Num) + sExt;
|
||||
@ -134,7 +148,7 @@ std::wstring mediaitems::detectImageFileExtension(std::wstring &fileName)
|
||||
CFile file;
|
||||
|
||||
std::wstring sExt;
|
||||
if (file.OpenFile(std_string2string(fileName)) == S_OK)
|
||||
if (file.OpenFile(fileName) == S_OK)
|
||||
{
|
||||
BYTE buffer[128];
|
||||
int buffer_size = 128;
|
||||
@ -152,7 +166,7 @@ std::wstring mediaitems::detectImageFileExtension(std::wstring &fileName)
|
||||
|
||||
std::wstring mediaitems::add_or_find(const std::wstring & href, RelsType type, bool & isInternal, std::wstring & ref)
|
||||
{
|
||||
bool isMediaInternal = utils::media::is_internal(href, odf_packet_);
|
||||
bool isMediaInternal = is_internal(href, odf_packet_);
|
||||
|
||||
std::wstring sub_path = L"media/";
|
||||
|
||||
@ -161,17 +175,18 @@ std::wstring mediaitems::add_or_find(const std::wstring & href, RelsType type, b
|
||||
{
|
||||
sub_path = L"charts/";
|
||||
}
|
||||
if ( type == typeObject)
|
||||
if ( type == typeMsObject || type == typeOleObject)
|
||||
{
|
||||
sub_path = L"embeddings/";
|
||||
}
|
||||
int number=0;
|
||||
|
||||
if ( type == typeChart) number = count_charts + 1;
|
||||
else if ( type == typeImage) number = count_image + 1;
|
||||
else if ( type == typeShape) number = count_shape + 1;
|
||||
else if ( type == typeMedia) number = count_media + 1;
|
||||
else if ( type == typeObject) number = count_object + 1;
|
||||
if ( type == typeChart) number = count_charts + 1;
|
||||
else if ( type == typeImage) number = count_image + 1;
|
||||
else if ( type == typeShape) number = count_shape + 1;
|
||||
else if ( type == typeMedia) number = count_media + 1;
|
||||
else if ( type == typeMsObject ||
|
||||
type == typeOleObject) number = count_object + 1;
|
||||
else
|
||||
number = items_.size() + 1;
|
||||
|
||||
@ -218,7 +233,7 @@ std::wstring mediaitems::add_or_find(const std::wstring & href, RelsType type, b
|
||||
id = std::wstring(L"picId") + std::to_wstring(count_image + 1);
|
||||
count_image++;
|
||||
}
|
||||
else if ( type == typeObject)
|
||||
else if ( type == typeMsObject || type == typeOleObject)
|
||||
{
|
||||
id = std::wstring(L"objId") + std::to_wstring(count_object + 1);
|
||||
count_object++;
|
||||
@ -240,16 +255,17 @@ std::wstring mediaitems::add_or_find(const std::wstring & href, RelsType type, b
|
||||
void mediaitems::dump_rels(rels & Rels)
|
||||
{
|
||||
size_t i = 0;
|
||||
BOOST_FOREACH(item & elm, items_)
|
||||
for (int i = 0; i < items_.size(); i++)
|
||||
{
|
||||
if (elm.count_used > elm.count_add)continue; // уже использовали этот релс выше(колонтитул ....)
|
||||
Rels.add( relationship(
|
||||
elm.Id,
|
||||
utils::media::get_rel_type(elm.type),
|
||||
elm.valid ? elm.outputName : L"NULL",
|
||||
elm.mediaInternal ? L"" : L"External" )
|
||||
if (items_[i].count_used > items_[i].count_add) continue; // уже использовали этот релс выше(колонтитул ....)
|
||||
|
||||
Rels.add( relationship(
|
||||
items_[i].Id,
|
||||
get_rel_type (items_[i].type),
|
||||
items_[i].valid ? items_[i].outputName : L"NULL",
|
||||
items_[i].mediaInternal ? L"" : L"External" )
|
||||
);
|
||||
elm.count_used++;
|
||||
items_[i].count_used++;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -39,7 +39,6 @@
|
||||
namespace cpdoccore {
|
||||
namespace oox {
|
||||
|
||||
|
||||
class mediaitems
|
||||
{
|
||||
public:
|
||||
@ -85,6 +84,20 @@ public:
|
||||
void dump_rels(rels & Rels);
|
||||
items_array & items() { return items_; }
|
||||
|
||||
static std::wstring get_rel_type(RelsType type)
|
||||
{
|
||||
switch (type)
|
||||
{
|
||||
case typeImage: return L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/image";
|
||||
case typeChart: return L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart";
|
||||
case typeMsObject: return L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/package";
|
||||
case typeOleObject: return L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/oleObject";
|
||||
case typeHyperlink: return L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink";
|
||||
default:
|
||||
return L"";
|
||||
}
|
||||
}
|
||||
|
||||
private:
|
||||
std::wstring create_file_name (const std::wstring & uri, RelsType type, bool & isInternal, size_t Num);
|
||||
std::wstring detectImageFileExtension (std::wstring &fileName);
|
||||
|
||||
@ -1,99 +0,0 @@
|
||||
/*
|
||||
* (c) Copyright Ascensio System SIA 2010-2016
|
||||
*
|
||||
* This program is a free software product. You can redistribute it and/or
|
||||
* modify it under the terms of the GNU Affero General Public License (AGPL)
|
||||
* version 3 as published by the Free Software Foundation. In accordance with
|
||||
* Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
|
||||
* that Ascensio System SIA expressly excludes the warranty of non-infringement
|
||||
* of any third-party rights.
|
||||
*
|
||||
* This program is distributed WITHOUT ANY WARRANTY; without even the implied
|
||||
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For
|
||||
* details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
|
||||
*
|
||||
* You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
|
||||
* EU, LV-1021.
|
||||
*
|
||||
* The interactive user interfaces in modified source and object code versions
|
||||
* of the Program must display Appropriate Legal Notices, as required under
|
||||
* Section 5 of the GNU AGPL version 3.
|
||||
*
|
||||
* Pursuant to Section 7(b) of the License you must retain the original Product
|
||||
* logo when distributing the program. Pursuant to Section 7(e) we decline to
|
||||
* grant you any rights under trademark law for use of our trademarks.
|
||||
*
|
||||
* All the Product's GUI elements, including illustrations and icon sets, as
|
||||
* well as technical writing content are licensed under the terms of the
|
||||
* Creative Commons Attribution-ShareAlike 4.0 International. See the License
|
||||
* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
|
||||
*
|
||||
*/
|
||||
|
||||
#include "mediaitems_utils.h"
|
||||
|
||||
#include <boost/foreach.hpp>
|
||||
#include <boost/lexical_cast.hpp>
|
||||
#include <boost/regex.hpp>
|
||||
|
||||
#include "../../Common/DocxFormat/Source/Base/Base.h"
|
||||
#include "../../Common/DocxFormat/Source/SystemUtility/FileSystem/Directory.h"
|
||||
|
||||
|
||||
namespace cpdoccore {
|
||||
namespace oox {
|
||||
namespace utils {
|
||||
|
||||
namespace media {
|
||||
|
||||
|
||||
bool is_internal(const std::wstring & uri, const std::wstring & packetRoot)
|
||||
{
|
||||
if (uri.empty())return false;
|
||||
|
||||
std::wstring mediaPath = boost::regex_search(uri.begin(), uri.end(), boost::wregex(L"^/[A-Za-z]:"))
|
||||
? std::wstring(uri.begin() + 1, uri.end())
|
||||
: uri;
|
||||
|
||||
std::wstring resultPath = packetRoot + FILE_SEPARATOR_STR + mediaPath;
|
||||
|
||||
return FileSystem::Directory::IsExist(resultPath) || FileSystem::Directory::IsExist(mediaPath);
|
||||
}
|
||||
|
||||
std::wstring get_rel_type(RelsType type)
|
||||
{
|
||||
switch (type)
|
||||
{
|
||||
case typeImage:
|
||||
{
|
||||
return L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/image";
|
||||
}
|
||||
case typeChart:
|
||||
{
|
||||
return L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/chart";
|
||||
}
|
||||
case typeObject:
|
||||
{
|
||||
return L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/package";
|
||||
}break;
|
||||
default:
|
||||
return L"";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
std::wstring replace_extension(const std::wstring & ext)
|
||||
{
|
||||
// TODO
|
||||
if (ext == L"jpg")
|
||||
return L"jpeg";
|
||||
else
|
||||
return ext;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
@ -1,52 +0,0 @@
|
||||
/*
|
||||
* (c) Copyright Ascensio System SIA 2010-2016
|
||||
*
|
||||
* This program is a free software product. You can redistribute it and/or
|
||||
* modify it under the terms of the GNU Affero General Public License (AGPL)
|
||||
* version 3 as published by the Free Software Foundation. In accordance with
|
||||
* Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect
|
||||
* that Ascensio System SIA expressly excludes the warranty of non-infringement
|
||||
* of any third-party rights.
|
||||
*
|
||||
* This program is distributed WITHOUT ANY WARRANTY; without even the implied
|
||||
* warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For
|
||||
* details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html
|
||||
*
|
||||
* You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia,
|
||||
* EU, LV-1021.
|
||||
*
|
||||
* The interactive user interfaces in modified source and object code versions
|
||||
* of the Program must display Appropriate Legal Notices, as required under
|
||||
* Section 5 of the GNU AGPL version 3.
|
||||
*
|
||||
* Pursuant to Section 7(b) of the License you must retain the original Product
|
||||
* logo when distributing the program. Pursuant to Section 7(e) we decline to
|
||||
* grant you any rights under trademark law for use of our trademarks.
|
||||
*
|
||||
* All the Product's GUI elements, including illustrations and icon sets, as
|
||||
* well as technical writing content are licensed under the terms of the
|
||||
* Creative Commons Attribution-ShareAlike 4.0 International. See the License
|
||||
* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
|
||||
*
|
||||
*/
|
||||
#ifndef CPDOCCORE_MEDIAITEMS_UTILS_H_
|
||||
#define CPDOCCORE_MEDIAITEMS_UTILS_H_
|
||||
|
||||
#include <string>
|
||||
|
||||
#include "mediaitems.h"
|
||||
|
||||
namespace cpdoccore {
|
||||
namespace oox {
|
||||
namespace utils {
|
||||
namespace media {
|
||||
|
||||
bool is_internal(const std::wstring & uri, const std::wstring & packetRoot);
|
||||
std::wstring get_rel_type(RelsType type);
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
@ -31,13 +31,12 @@
|
||||
*/
|
||||
|
||||
|
||||
#include <boost/foreach.hpp>
|
||||
#include <vector>
|
||||
#include <cpdoccore/xml/simple_xml_writer.h>
|
||||
#include "mediaitems_utils.h"
|
||||
#include "oox_rels.h"
|
||||
|
||||
#include "oox_rels.h"
|
||||
#include "oox_chart_context.h"
|
||||
#include "mediaitems.h"
|
||||
|
||||
namespace cpdoccore {
|
||||
namespace oox {
|
||||
@ -87,7 +86,7 @@ void oox_chart_context::dump_rels(rels & Rels)
|
||||
{
|
||||
Rels.add(relationship(
|
||||
r.rid,
|
||||
utils::media::get_rel_type(r.type),
|
||||
L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/image",
|
||||
r.is_internal ? std::wstring(L"../") + r.ref : r.ref,
|
||||
(r.is_internal ? L"" : L"External")
|
||||
)
|
||||
|
||||
@ -426,7 +426,7 @@ void _oox_drawing::serialize_shape(std::wostream & strm)
|
||||
}
|
||||
}
|
||||
|
||||
void _oox_drawing::serialize_xfrm(std::wostream & strm, const std::wstring & name_space)
|
||||
void _oox_drawing::serialize_xfrm(std::wostream & strm, const std::wstring & name_space, bool always_position)
|
||||
{
|
||||
CP_XML_WRITER(strm)
|
||||
{
|
||||
@ -470,7 +470,7 @@ void _oox_drawing::serialize_xfrm(std::wostream & strm, const std::wstring & nam
|
||||
|
||||
CP_XML_NODE(L"a:off")
|
||||
{
|
||||
if (inGroup)
|
||||
if (inGroup || always_position)
|
||||
{
|
||||
CP_XML_ATTR(L"x", x);
|
||||
CP_XML_ATTR(L"y", y);
|
||||
|
||||
@ -81,7 +81,7 @@ namespace oox {
|
||||
virtual void serialize (std::wostream & strm) = 0;
|
||||
|
||||
void serialize_shape (std::wostream & strm);
|
||||
void serialize_xfrm (std::wostream & strm, const std::wstring & namespace_ = L"a");
|
||||
void serialize_xfrm (std::wostream & strm, const std::wstring & namespace_ = L"a", bool always_position = false);
|
||||
void serialize_bodyPr (std::wostream & strm, const std::wstring & namespace_ = L"a");
|
||||
};
|
||||
|
||||
|
||||
@ -74,6 +74,8 @@ static std::wstring get_mime_type(const std::wstring & extension)
|
||||
else if (L"wav" == extension) return L"audio/wav";
|
||||
else if (L"bin" == extension) return L"application/vnd.openxmlformats-officedocument.oleObject";
|
||||
else if (L"xlsx" == extension) return L"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
|
||||
else if (L"docx" == extension) return L"application/vnd.openxmlformats-officedocument.wordprocessingml.document";
|
||||
else if (L"doc" == extension) return L"application/msword";
|
||||
else return L"application/octet-stream";
|
||||
|
||||
|
||||
@ -135,15 +137,23 @@ bool content_types_file::add_or_find_override(const std::wstring & fileName)
|
||||
}
|
||||
|
||||
std::wstring content_type;
|
||||
int pos = fileName.rfind(L".");
|
||||
|
||||
int pos = fileName.rfind(L".");
|
||||
std::wstring extension = pos >= 0 ? fileName.substr(pos + 1) : L"";
|
||||
|
||||
if (extension == L"xlsx")
|
||||
{
|
||||
content_type = L"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet";
|
||||
content_type_content_.add_override(fileName, content_type);
|
||||
}
|
||||
if (extension == L"bin")
|
||||
{
|
||||
//content_type = L"application/vnd.openxmlformats-officedocument.oleObject";
|
||||
|
||||
content_type_content_.add_override(fileName, content_type);
|
||||
//add_or_find_default(extension);
|
||||
add_or_find_default(extension);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void content_types_file::set_media(mediaitems & _Mediaitems)
|
||||
@ -309,12 +319,13 @@ void media::write(const std::wstring & RootPath)
|
||||
std::wstring path = RootPath + FILE_SEPARATOR_STR + L"media";
|
||||
FileSystem::Directory::CreateDirectory(path.c_str());
|
||||
|
||||
BOOST_FOREACH( mediaitems::item & item, mediaitems_.items() )
|
||||
mediaitems::items_array & items = mediaitems_.items();
|
||||
for (int i = 0; i < items.size(); i++ )
|
||||
{
|
||||
if (item.mediaInternal && item.valid && (item.type == typeImage || item.type == typeMedia))
|
||||
if (items[i].mediaInternal && items[i].valid && (items[i].type == typeImage || items[i].type == typeMedia))
|
||||
{
|
||||
std::wstring & file_name = item.href;
|
||||
std::wstring file_name_out = RootPath + FILE_SEPARATOR_STR + item.outputName;
|
||||
std::wstring & file_name = items[i].href;
|
||||
std::wstring file_name_out = RootPath + FILE_SEPARATOR_STR + items[i].outputName;
|
||||
|
||||
CImageFileFormatChecker svmFileChecker;
|
||||
if (svmFileChecker.isSvmFile(file_name))
|
||||
@ -322,7 +333,7 @@ void media::write(const std::wstring & RootPath)
|
||||
ConvertSvmToImage(file_name, file_name_out, appFonts_);
|
||||
}
|
||||
else
|
||||
NSFile::CFileBinary::Copy(item.href, file_name_out);
|
||||
NSFile::CFileBinary::Copy(items[i].href, file_name_out);
|
||||
}
|
||||
}
|
||||
|
||||
@ -347,15 +358,20 @@ void embeddings::write(const std::wstring & RootPath)
|
||||
|
||||
content_types_file & content_types = get_main_document()->get_content_types_file();
|
||||
|
||||
BOOST_FOREACH( mediaitems::item & item, embeddingsitems_.items() )
|
||||
mediaitems::items_array & items = embeddingsitems_.items();
|
||||
for (int i = 0; i < items.size(); i++ )
|
||||
{
|
||||
if (item.mediaInternal && item.valid && item.type == typeObject )
|
||||
if ( items[i].mediaInternal && items[i].valid &&
|
||||
(items[i].type == typeMsObject || items[i].type == typeOleObject))
|
||||
{
|
||||
content_types.add_or_find_override(std::wstring(L"/word/") + item.outputName);
|
||||
|
||||
std::wstring file_name_out = RootPath + FILE_SEPARATOR_STR + item.outputName;
|
||||
int pos = items[i].outputName.rfind(L".");
|
||||
std::wstring extension = pos >= 0 ? items[i].outputName.substr(pos + 1) : L"";
|
||||
|
||||
NSFile::CFileBinary::Copy(item.href, file_name_out);
|
||||
content_types.add_or_find_default(extension);
|
||||
|
||||
std::wstring file_name_out = RootPath + FILE_SEPARATOR_STR + items[i].outputName;
|
||||
|
||||
NSFile::CFileBinary::Copy(items[i].href, file_name_out);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -40,7 +40,20 @@
|
||||
namespace cpdoccore {
|
||||
namespace oox {
|
||||
|
||||
enum RelsType { typeUnknown = 0, typeImage, typeChart, typeShape, typeTable, typeHyperlink, typeComment, typeMedia, typeGroupShape, typeObject};
|
||||
enum RelsType
|
||||
{
|
||||
typeUnknown = 0,
|
||||
typeImage,
|
||||
typeChart,
|
||||
typeShape,
|
||||
typeTable,
|
||||
typeHyperlink,
|
||||
typeComment,
|
||||
typeMedia,
|
||||
typeGroupShape,
|
||||
typeMsObject,
|
||||
typeOleObject
|
||||
};
|
||||
|
||||
struct _rel
|
||||
{
|
||||
|
||||
@ -514,7 +514,7 @@ void pptx_conversion_context::end_page()
|
||||
}
|
||||
|
||||
get_slide_context().serialize_background(current_slide().Background());
|
||||
get_slide_context().serialize_objects(current_slide().Data());
|
||||
get_slide_context().serialize_objects (current_slide().Data());
|
||||
get_slide_context().serialize_animations(current_slide().Timing());
|
||||
|
||||
get_slide_context().dump_rels(current_slide().Rels());//hyperlinks, mediaitems, ...
|
||||
@ -543,9 +543,9 @@ std::pair<int,int> pptx_conversion_context::add_author_comments(std::wstring aut
|
||||
|
||||
void pptx_conversion_context::end_master()
|
||||
{
|
||||
get_slide_context().serialize_background(current_master().Background(),true);
|
||||
get_slide_context().serialize_objects(current_master().Data());
|
||||
get_slide_context().serialize_HeaderFooter(current_master().DataExtra());
|
||||
get_slide_context().serialize_background (current_master().Background(),true);
|
||||
get_slide_context().serialize_objects (current_master().Data());
|
||||
get_slide_context().serialize_HeaderFooter (current_master().DataExtra());
|
||||
|
||||
get_slide_context().dump_rels(current_master().Rels());//hyperlinks, mediaitems, ...
|
||||
|
||||
|
||||
@ -87,10 +87,10 @@ void pptx_serialize_image(std::wostream & strm, _pptx_drawing & val)
|
||||
{
|
||||
CP_XML_NODE(L"p:cNvPr")
|
||||
{
|
||||
CP_XML_ATTR(L"id", val.id);
|
||||
CP_XML_ATTR(L"name", val.name);
|
||||
CP_XML_ATTR(L"id", val.id);
|
||||
CP_XML_ATTR(L"name", val.name);
|
||||
|
||||
oox_serialize_hlink(CP_XML_STREAM(),val.hlinks);
|
||||
oox_serialize_hlink(CP_XML_STREAM(), val.hlinks);
|
||||
|
||||
}
|
||||
CP_XML_NODE(L"p:cNvPicPr")
|
||||
@ -107,7 +107,7 @@ void pptx_serialize_image(std::wostream & strm, _pptx_drawing & val)
|
||||
|
||||
CP_XML_NODE(L"p:spPr")
|
||||
{
|
||||
val.serialize_xfrm(CP_XML_STREAM());
|
||||
val.serialize_xfrm(CP_XML_STREAM(), L"a", true);
|
||||
|
||||
CP_XML_NODE(L"a:prstGeom")
|
||||
{
|
||||
@ -170,7 +170,7 @@ void pptx_serialize_shape(std::wostream & strm, _pptx_drawing & val)
|
||||
|
||||
if (!bNoRect)
|
||||
{
|
||||
val.serialize_xfrm(CP_XML_STREAM());
|
||||
val.serialize_xfrm(CP_XML_STREAM(), L"a", true);
|
||||
val.serialize_shape(CP_XML_STREAM());
|
||||
|
||||
oox_serialize_ln(CP_XML_STREAM(), val.additional);
|
||||
@ -198,7 +198,7 @@ void pptx_serialize_chart(std::wostream & strm, _pptx_drawing & val)
|
||||
CP_XML_NODE(L"p:cNvGraphicFramePr");
|
||||
CP_XML_NODE(L"p:nvPr");
|
||||
}
|
||||
val.serialize_xfrm(CP_XML_STREAM(), L"p");
|
||||
val.serialize_xfrm(CP_XML_STREAM(), L"p", true);
|
||||
|
||||
//oox_serialize_ln(CP_XML_STREAM(),val.additional);
|
||||
|
||||
@ -218,7 +218,6 @@ void pptx_serialize_chart(std::wostream & strm, _pptx_drawing & val)
|
||||
} // p:graphicFrame
|
||||
} // CP_XML_WRITER
|
||||
}
|
||||
|
||||
void pptx_serialize_table(std::wostream & strm, _pptx_drawing & val)
|
||||
{
|
||||
CP_XML_WRITER(strm)
|
||||
@ -236,7 +235,7 @@ void pptx_serialize_table(std::wostream & strm, _pptx_drawing & val)
|
||||
CP_XML_NODE(L"p:cNvGraphicFramePr");
|
||||
CP_XML_NODE(L"p:nvPr");
|
||||
}
|
||||
val.serialize_xfrm(CP_XML_STREAM(), L"p");
|
||||
val.serialize_xfrm(CP_XML_STREAM(), L"p", true);
|
||||
|
||||
//oox_serialize_ln(CP_XML_STREAM(),val.additional);
|
||||
|
||||
@ -260,11 +259,55 @@ void pptx_serialize_table(std::wostream & strm, _pptx_drawing & val)
|
||||
}
|
||||
|
||||
|
||||
void pptx_serialize_object(std::wostream & strm, _pptx_drawing & val)
|
||||
{
|
||||
CP_XML_WRITER(strm)
|
||||
{
|
||||
CP_XML_NODE(L"p:graphicFrame")
|
||||
{
|
||||
CP_XML_NODE(L"p:nvGraphicFramePr")
|
||||
{
|
||||
CP_XML_NODE(L"p:cNvPr")
|
||||
{
|
||||
CP_XML_ATTR(L"id", val.id);
|
||||
CP_XML_ATTR(L"name", val.name);
|
||||
}
|
||||
|
||||
CP_XML_NODE(L"p:cNvGraphicFramePr");
|
||||
CP_XML_NODE(L"p:nvPr");
|
||||
}
|
||||
val.serialize_xfrm(CP_XML_STREAM(), L"p", true);
|
||||
|
||||
//oox_serialize_ln(CP_XML_STREAM(),val.additional);
|
||||
|
||||
CP_XML_NODE(L"a:graphic")
|
||||
{
|
||||
CP_XML_NODE(L"a:graphicData")
|
||||
{
|
||||
CP_XML_ATTR(L"uri", L"http://schemas.openxmlformats.org/presentationml/2006/ole");
|
||||
CP_XML_NODE(L"p:oleObj")
|
||||
{
|
||||
CP_XML_ATTR(L"r:id", val.objectId);
|
||||
CP_XML_ATTR(L"progId", val.objectProgId);
|
||||
CP_XML_ATTR(L"imgW", val.cx );
|
||||
CP_XML_ATTR(L"imgH", val.cy );
|
||||
CP_XML_NODE(L"p:embed");
|
||||
|
||||
val.id = 0;
|
||||
pptx_serialize_image(CP_XML_STREAM(), val);
|
||||
}
|
||||
}
|
||||
}
|
||||
} // p:graphicFrame
|
||||
} // CP_XML_WRITER
|
||||
}
|
||||
|
||||
|
||||
void _pptx_drawing::serialize(std::wostream & strm)
|
||||
{
|
||||
if (type == typeShape)
|
||||
{
|
||||
serialize_shape(strm);
|
||||
pptx_serialize_shape(strm, *this);
|
||||
}
|
||||
else if (type == typeImage)
|
||||
{
|
||||
@ -278,6 +321,11 @@ void _pptx_drawing::serialize(std::wostream & strm)
|
||||
{
|
||||
pptx_serialize_table(strm, *this);
|
||||
}
|
||||
else if (type == typeMsObject ||
|
||||
type == typeOleObject)
|
||||
{
|
||||
pptx_serialize_object(strm, *this);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
@ -34,7 +34,6 @@
|
||||
#include <vector>
|
||||
#include <cpdoccore/xml/simple_xml_writer.h>
|
||||
|
||||
#include "mediaitems_utils.h"
|
||||
#include "oox_rels.h"
|
||||
|
||||
#include "pptx_drawings.h"
|
||||
@ -57,18 +56,18 @@ public:
|
||||
pptx_drawings_.push_back(d);
|
||||
|
||||
bool present = false;
|
||||
BOOST_FOREACH(_rel const & r, pptx_drawing_rels_)
|
||||
for (int i = 0; i < pptx_drawing_rels_.size(); i++)
|
||||
{
|
||||
if (r.rid == rid && r.ref == ref)
|
||||
if (pptx_drawing_rels_[i].rid == rid && pptx_drawing_rels_[i].ref == ref)
|
||||
present = true;
|
||||
}
|
||||
if (!present)
|
||||
{
|
||||
pptx_drawing_rels_.push_back(_rel(isInternal, rid, ref, type));
|
||||
}
|
||||
BOOST_FOREACH(_hlink_desc h, d.hlinks)
|
||||
for (int i = 0; i < d.hlinks.size(); i++)
|
||||
{
|
||||
pptx_drawing_rels_.push_back(_rel(false, h.hId, h.hRef, typeHyperlink));
|
||||
pptx_drawing_rels_.push_back(_rel(false, d.hlinks[i].hId, d.hlinks[i].hRef, typeHyperlink));
|
||||
}
|
||||
}
|
||||
|
||||
@ -80,13 +79,14 @@ public:
|
||||
{
|
||||
|
||||
bool present = false;
|
||||
BOOST_FOREACH(_rel const & r, pptx_drawing_rels_)
|
||||
for (int i = 0; i < pptx_drawing_rels_.size(); i++)
|
||||
{
|
||||
if (r.rid == rid && r.ref == ref)
|
||||
if (pptx_drawing_rels_[i].rid == rid && pptx_drawing_rels_[i].ref == ref)
|
||||
present = true;
|
||||
}
|
||||
if (!present)
|
||||
{
|
||||
if (type == typeHyperlink) isInternal = false;
|
||||
pptx_drawing_rels_.push_back(_rel(isInternal, rid, ref, type));
|
||||
}
|
||||
}
|
||||
@ -105,47 +105,28 @@ public:
|
||||
|
||||
void dump_rels(rels & Rels)
|
||||
{
|
||||
BOOST_FOREACH(_rel const & r, pptx_drawing_rels_)
|
||||
for (int i = 0; i < pptx_drawing_rels_.size(); i++)
|
||||
{
|
||||
if (r.type == typeChart)//временно - нужно потом все загнать в релс
|
||||
if (pptx_drawing_rels_[i].type == typeUnknown ||
|
||||
pptx_drawing_rels_[i].type == typeTable ||
|
||||
pptx_drawing_rels_[i].type == typeShape ||
|
||||
pptx_drawing_rels_[i].type == typeGroupShape) continue;
|
||||
|
||||
if (pptx_drawing_rels_[i].type == typeComment)
|
||||
{
|
||||
Rels.add(relationship(
|
||||
r.rid,
|
||||
utils::media::get_rel_type(r.type),
|
||||
(r.is_internal ? std::wstring(L"../") + r.ref : r.ref),
|
||||
(r.is_internal ? L"" : L"External")
|
||||
)
|
||||
);
|
||||
}
|
||||
else if (r.type == typeImage)
|
||||
{
|
||||
Rels.add(relationship(
|
||||
r.rid,
|
||||
utils::media::get_rel_type(r.type),
|
||||
r.is_internal ? std::wstring(L"../") + r.ref : r.ref,
|
||||
(r.is_internal ? L"" : L"External")
|
||||
)
|
||||
);
|
||||
}
|
||||
else if (r.type == typeHyperlink)
|
||||
{
|
||||
Rels.add(relationship(
|
||||
r.rid,
|
||||
L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink",
|
||||
r.ref,
|
||||
L"External")
|
||||
);
|
||||
}
|
||||
else if (r.type == typeComment)
|
||||
{
|
||||
Rels.add(relationship(
|
||||
r.rid,
|
||||
Rels.add(relationship( pptx_drawing_rels_[i].rid,
|
||||
L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments",
|
||||
r.ref)
|
||||
);
|
||||
pptx_drawing_rels_[i].ref) );
|
||||
}
|
||||
else
|
||||
{
|
||||
Rels.add(relationship( pptx_drawing_rels_[i].rid,
|
||||
mediaitems::get_rel_type(pptx_drawing_rels_[i].type),
|
||||
(pptx_drawing_rels_[i].is_internal ? std::wstring(L"../") + pptx_drawing_rels_[i].ref : pptx_drawing_rels_[i].ref),
|
||||
(pptx_drawing_rels_[i].is_internal ? L"" : L"External")) );
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private:
|
||||
|
||||
|
||||
@ -33,10 +33,6 @@
|
||||
#include "pptx_package.h"
|
||||
#include "pptx_output_xml.h"
|
||||
|
||||
#include <boost/foreach.hpp>
|
||||
#include <boost/lexical_cast.hpp>
|
||||
#include <boost/ref.hpp>
|
||||
|
||||
#include <cpdoccore/utf8cpp/utf8.h>
|
||||
|
||||
namespace cpdoccore {
|
||||
@ -99,11 +95,13 @@ void slide_content::add_rel(relationship const & r)
|
||||
rels_->get_rels().add(r);
|
||||
}
|
||||
|
||||
void slide_content::add_rels(rels & r)
|
||||
void slide_content::add_rels(rels & _r)
|
||||
{
|
||||
BOOST_FOREACH(relationship & item, r.relationships())
|
||||
std::vector<relationship> & r = _r.relationships();
|
||||
|
||||
for (int i = 0; i < r.size(); i++)
|
||||
{
|
||||
rels_->get_rels().add(item);
|
||||
rels_->get_rels().add(r[i]);
|
||||
}
|
||||
}
|
||||
////////////
|
||||
@ -124,33 +122,29 @@ void slides_files::write(const std::wstring & RootPath)
|
||||
content_type_content * contentTypes = this->get_main_document()->get_content_types_file().content();
|
||||
static const std::wstring kWSConType = L"application/vnd.openxmlformats-officedocument.presentationml.slide+xml";
|
||||
|
||||
size_t count = 0;
|
||||
|
||||
BOOST_FOREACH(const slide_content_ptr & item, slides_)
|
||||
for (int i = 0; i < slides_.size(); i++)
|
||||
{
|
||||
if (item)
|
||||
if (!slides_[i]) continue;
|
||||
|
||||
const std::wstring fileName = std::wstring(L"slide") + std::to_wstring( i + 1 ) + L".xml";
|
||||
|
||||
contentTypes->add_override(std::wstring(L"/ppt/slides/") + fileName, kWSConType);
|
||||
|
||||
if (rels_)
|
||||
{
|
||||
count++;
|
||||
const std::wstring fileName = std::wstring(L"slide") + boost::lexical_cast<std::wstring>(count) + L".xml";
|
||||
|
||||
contentTypes->add_override(std::wstring(L"/ppt/slides/") + fileName, kWSConType);
|
||||
|
||||
if (rels_)
|
||||
{
|
||||
const std::wstring id = std::wstring(L"sId") + boost::lexical_cast<std::wstring>(count);
|
||||
static const std::wstring kWSRel = L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/slide";
|
||||
const std::wstring fileRef = std::wstring(L"slides/") + fileName;
|
||||
rels_->add(id, kWSRel, fileRef);
|
||||
}
|
||||
|
||||
item->get_rel_file()->set_file_name(fileName + L".rels");//внитренние релсы
|
||||
|
||||
rels_files relFiles;
|
||||
relFiles.add_rel_file(item->get_rel_file());
|
||||
relFiles.write(path);
|
||||
|
||||
package::simple_element(fileName, item->str()).write(path);
|
||||
const std::wstring id = std::wstring(L"sId") + std::to_wstring( i + 1);
|
||||
static const std::wstring kWSRel = L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/slide";
|
||||
const std::wstring fileRef = std::wstring(L"slides/") + fileName;
|
||||
rels_->add(id, kWSRel, fileRef);
|
||||
}
|
||||
|
||||
slides_[i]->get_rel_file()->set_file_name(fileName + L".rels");//внитренние релсы
|
||||
|
||||
rels_files relFiles;
|
||||
relFiles.add_rel_file(slides_[i]->get_rel_file());
|
||||
relFiles.write(path);
|
||||
|
||||
package::simple_element(fileName, slides_[i]->str()).write(path);
|
||||
}
|
||||
}
|
||||
|
||||
@ -171,32 +165,28 @@ void slideMasters_files::write(const std::wstring & RootPath)
|
||||
content_type_content * contentTypes = this->get_main_document()->get_content_types_file().content();
|
||||
static const std::wstring kWSConType = L"application/vnd.openxmlformats-officedocument.presentationml.slideMaster+xml";
|
||||
|
||||
size_t count = 0;
|
||||
|
||||
BOOST_FOREACH(const slide_content_ptr & item, slides_)
|
||||
for (int i = 0; i < slides_.size(); i++)
|
||||
{
|
||||
if (item)
|
||||
if (!slides_[i]) continue;
|
||||
|
||||
const std::wstring fileName = std::wstring(L"slideMaster") + std::to_wstring( i + 1 ) + L".xml";
|
||||
contentTypes->add_override(std::wstring(L"/ppt/slideMasters/") + fileName, kWSConType);
|
||||
|
||||
if (rels_)
|
||||
{
|
||||
count++;
|
||||
const std::wstring fileName = std::wstring(L"slideMaster") + boost::lexical_cast<std::wstring>(count) + L".xml";
|
||||
contentTypes->add_override(std::wstring(L"/ppt/slideMasters/") + fileName, kWSConType);
|
||||
|
||||
if (rels_)
|
||||
{
|
||||
const std::wstring id = std::wstring(L"smId") + boost::lexical_cast<std::wstring>(count);
|
||||
static const std::wstring kWSRel = L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideMaster";
|
||||
const std::wstring fileRef = std::wstring(L"slideMasters/") + fileName;
|
||||
rels_->add(id, kWSRel, fileRef);
|
||||
}
|
||||
|
||||
item->get_rel_file()->set_file_name(fileName + L".rels");//внитренние релсы
|
||||
|
||||
rels_files relFiles;
|
||||
relFiles.add_rel_file(item->get_rel_file());
|
||||
relFiles.write(path);
|
||||
|
||||
package::simple_element(fileName, item->str()).write(path);
|
||||
const std::wstring id = std::wstring(L"smId") + std::to_wstring( i + 1);
|
||||
static const std::wstring kWSRel = L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideMaster";
|
||||
const std::wstring fileRef = std::wstring(L"slideMasters/") + fileName;
|
||||
rels_->add(id, kWSRel, fileRef);
|
||||
}
|
||||
|
||||
slides_[i]->get_rel_file()->set_file_name(fileName + L".rels");//внитренние релсы
|
||||
|
||||
rels_files relFiles;
|
||||
relFiles.add_rel_file(slides_[i]->get_rel_file());
|
||||
relFiles.write(path);
|
||||
|
||||
package::simple_element(fileName, slides_[i]->str()).write(path);
|
||||
}
|
||||
}
|
||||
|
||||
@ -214,27 +204,23 @@ void slideLayouts_files::write(const std::wstring & RootPath)
|
||||
std::wstring path = RootPath + FILE_SEPARATOR_STR + L"slideLayouts" ;
|
||||
FileSystem::Directory::CreateDirectory(path.c_str());
|
||||
|
||||
size_t count = 0;
|
||||
|
||||
BOOST_FOREACH(const slide_content_ptr & item, slides_)
|
||||
for (int i = 0; i < slides_.size(); i++)
|
||||
{
|
||||
if (item)
|
||||
{
|
||||
count++;
|
||||
const std::wstring fileName = std::wstring(L"slideLayout") + boost::lexical_cast<std::wstring>(count) + L".xml";
|
||||
const std::wstring kWSConType = L"application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml";
|
||||
|
||||
content_type_content * contentTypes = get_main_document()->get_content_types_file().content();
|
||||
contentTypes->add_override(std::wstring(L"/ppt/slideLayouts/") + fileName, kWSConType);
|
||||
if (!slides_[i]) continue;
|
||||
|
||||
item->get_rel_file()->set_file_name(fileName + L".rels");//внитренние релсы
|
||||
|
||||
rels_files relFiles;
|
||||
relFiles.add_rel_file(item->get_rel_file());
|
||||
relFiles.write(path);
|
||||
const std::wstring fileName = std::wstring(L"slideLayout") + std::to_wstring( i + 1 ) + L".xml";
|
||||
const std::wstring kWSConType = L"application/vnd.openxmlformats-officedocument.presentationml.slideLayout+xml";
|
||||
|
||||
content_type_content * contentTypes = get_main_document()->get_content_types_file().content();
|
||||
contentTypes->add_override(std::wstring(L"/ppt/slideLayouts/") + fileName, kWSConType);
|
||||
|
||||
package::simple_element(fileName, item->str()).write(path);
|
||||
}
|
||||
slides_[i]->get_rel_file()->set_file_name(fileName + L".rels");//внитренние релсы
|
||||
|
||||
rels_files relFiles;
|
||||
relFiles.add_rel_file(slides_[i]->get_rel_file());
|
||||
relFiles.write(path);
|
||||
|
||||
package::simple_element(fileName, slides_[i]->str()).write(path);
|
||||
}
|
||||
}
|
||||
|
||||
@ -270,28 +256,24 @@ void ppt_charts_files::write(const std::wstring & RootPath)
|
||||
std::wstring path = RootPath + FILE_SEPARATOR_STR + L"charts";
|
||||
FileSystem::Directory::CreateDirectory(path.c_str());
|
||||
|
||||
size_t count = 0;
|
||||
|
||||
BOOST_FOREACH(const chart_content_ptr & item, charts_)
|
||||
for (int i = 0; i < charts_.size(); i++)
|
||||
{
|
||||
if (item)
|
||||
{
|
||||
count++;
|
||||
const std::wstring fileName = std::wstring(L"chart") + boost::lexical_cast<std::wstring>(count) + L".xml";
|
||||
content_type_content * contentTypes = get_main_document()->get_content_types_file().content();
|
||||
|
||||
static const std::wstring kWSConType = L"application/vnd.openxmlformats-officedocument.drawingml.chart+xml";
|
||||
contentTypes->add_override(std::wstring(L"/ppt/charts/") + fileName, kWSConType);
|
||||
if (!charts_[i]) continue;
|
||||
|
||||
const std::wstring fileName = std::wstring(L"chart") + std::to_wstring( i + 1 ) + L".xml";
|
||||
content_type_content * contentTypes = get_main_document()->get_content_types_file().content();
|
||||
|
||||
static const std::wstring kWSConType = L"application/vnd.openxmlformats-officedocument.drawingml.chart+xml";
|
||||
contentTypes->add_override(std::wstring(L"/ppt/charts/") + fileName, kWSConType);
|
||||
|
||||
package::simple_element(fileName, item->str()).write(path);
|
||||
|
||||
rels_files relFiles;
|
||||
package::simple_element(fileName, charts_[i]->str()).write(path);
|
||||
|
||||
rels_files relFiles;
|
||||
|
||||
item->get_rel_file()->set_file_name(fileName + L".rels");
|
||||
|
||||
relFiles.add_rel_file(item->get_rel_file());
|
||||
relFiles.write(path);
|
||||
}
|
||||
charts_[i]->get_rel_file()->set_file_name(fileName + L".rels");
|
||||
|
||||
relFiles.add_rel_file(charts_[i]->get_rel_file());
|
||||
relFiles.write(path);
|
||||
}
|
||||
}
|
||||
///////////////////////////////////
|
||||
@ -304,24 +286,19 @@ void ppt_themes_files::write(const std::wstring & RootPath)
|
||||
std::wstring path = RootPath + FILE_SEPARATOR_STR + L"theme" ;
|
||||
FileSystem::Directory::CreateDirectory(path.c_str());
|
||||
|
||||
size_t count = 0;
|
||||
|
||||
BOOST_FOREACH(const pptx_xml_theme_ptr & item, themes_)
|
||||
for (int i = 0; i < themes_.size(); i++)
|
||||
{
|
||||
if (item)
|
||||
{
|
||||
count++;
|
||||
if (!themes_[i]) continue;
|
||||
|
||||
const std::wstring fileName = std::wstring(L"theme") + boost::lexical_cast<std::wstring>(count) + L".xml";
|
||||
const std::wstring kWSConType = L"application/vnd.openxmlformats-officedocument.theme+xml";
|
||||
|
||||
content_type_content * contentTypes = get_main_document()->get_content_types_file().content();
|
||||
contentTypes->add_override(std::wstring(L"/ppt/theme/") + fileName, kWSConType);
|
||||
const std::wstring fileName = std::wstring(L"theme") + std::to_wstring( i + 1) + L".xml";
|
||||
const std::wstring kWSConType = L"application/vnd.openxmlformats-officedocument.theme+xml";
|
||||
|
||||
content_type_content * contentTypes = get_main_document()->get_content_types_file().content();
|
||||
contentTypes->add_override(std::wstring(L"/ppt/theme/") + fileName, kWSConType);
|
||||
|
||||
std::wstringstream content;
|
||||
item->write_to(content);
|
||||
package::simple_element(fileName, content.str()).write(path);
|
||||
}
|
||||
std::wstringstream content;
|
||||
themes_[i]->write_to(content);
|
||||
package::simple_element(fileName, content.str()).write(path);
|
||||
}
|
||||
}
|
||||
//////////////////////////////
|
||||
@ -335,14 +312,14 @@ void ppt_comments_files::write(const std::wstring & RootPath)
|
||||
std::wstring comm_path = RootPath + FILE_SEPARATOR_STR + L"comments";
|
||||
FileSystem::Directory::CreateDirectory(comm_path.c_str());
|
||||
|
||||
BOOST_FOREACH(pptx_comment_elm const & e, comments_)
|
||||
for (int i = 0; i < comments_.size(); i++)
|
||||
{
|
||||
content_type_content * contentTypes = get_main_document()->get_content_types_file().content();
|
||||
|
||||
static const std::wstring kWSConType = L"application/vnd.openxmlformats-officedocument.presentationml.comments+xml";
|
||||
contentTypes->add_override(std::wstring(L"/ppt/comments/") + e.filename, kWSConType);
|
||||
contentTypes->add_override(std::wstring(L"/ppt/comments/") + comments_[i].filename, kWSConType);
|
||||
|
||||
package::simple_element(e.filename, e.content).write( comm_path);
|
||||
package::simple_element(comments_[i].filename, comments_[i].content).write( comm_path);
|
||||
}
|
||||
}
|
||||
////////////////////////////////////////////
|
||||
@ -386,7 +363,12 @@ void ppt_files::write(const std::wstring & RootPath)
|
||||
media_->set_main_document(get_main_document());
|
||||
media_->write(path);
|
||||
}
|
||||
if (embeddings_)
|
||||
{
|
||||
embeddings_->set_main_document(get_main_document());
|
||||
embeddings_->write(path);
|
||||
}
|
||||
{
|
||||
charts_files_.set_main_document(get_main_document());
|
||||
charts_files_.write(path);
|
||||
}
|
||||
@ -440,7 +422,14 @@ void ppt_files::add_slideMaster(slide_content_ptr slide)
|
||||
|
||||
void ppt_files::set_media(mediaitems & _Mediaitems, CApplicationFonts *pAppFonts)
|
||||
{
|
||||
media_ = element_ptr( new media(_Mediaitems, pAppFonts) );
|
||||
if (_Mediaitems.count_image + _Mediaitems.count_media > 0)
|
||||
{
|
||||
media_ = element_ptr( new media(_Mediaitems, pAppFonts) );
|
||||
}
|
||||
if (_Mediaitems.count_object > 0)
|
||||
{
|
||||
embeddings_ = element_ptr( new embeddings(_Mediaitems) );
|
||||
}
|
||||
}
|
||||
void ppt_files::set_authors_comments(pptx_xml_authors_comments_ptr & authors_comments)
|
||||
{
|
||||
|
||||
@ -238,6 +238,7 @@ private:
|
||||
|
||||
element_ptr comments_;
|
||||
element_ptr media_;
|
||||
element_ptr embeddings_;
|
||||
};
|
||||
|
||||
// xlsx_document
|
||||
|
||||
@ -36,8 +36,6 @@
|
||||
#include <cpdoccore/xml/utils.h>
|
||||
#include <cpdoccore/odf/odf_document.h>
|
||||
|
||||
#include "mediaitems_utils.h"
|
||||
|
||||
#include "pptx_drawing.h"
|
||||
#include "pptx_drawings.h"
|
||||
#include "pptx_slide_context.h"
|
||||
@ -73,16 +71,12 @@ public:
|
||||
clear();
|
||||
}
|
||||
|
||||
drawing_object_description object_description_;
|
||||
drawing_object_description object_description_;
|
||||
std::vector<drawing_object_description> objects_;
|
||||
|
||||
std::vector<drawing_object_description> images_;
|
||||
std::vector<drawing_object_description> charts_;
|
||||
std::vector<drawing_object_description> shapes_;
|
||||
std::vector<drawing_object_description> tables_;
|
||||
|
||||
_CP_OPT(_oox_fill) background_fill_;
|
||||
|
||||
_transition transition_;
|
||||
_CP_OPT(_oox_fill) background_fill_;
|
||||
_transition transition_;
|
||||
bool use_image_replacement_;
|
||||
|
||||
bool header, footer, date_time, slideNum;
|
||||
|
||||
@ -111,10 +105,7 @@ public:
|
||||
|
||||
void clear()
|
||||
{
|
||||
images_.clear();
|
||||
charts_.clear();
|
||||
shapes_.clear();
|
||||
tables_.clear();
|
||||
objects_.clear();
|
||||
|
||||
background_fill_ = boost::none;
|
||||
|
||||
@ -142,14 +133,46 @@ public:
|
||||
return pptx_drawings_;
|
||||
}
|
||||
std::wstring odfPacket_;
|
||||
|
||||
void process_drawings();
|
||||
|
||||
private:
|
||||
void process_common_properties(drawing_object_description& obj,_pptx_drawing & drawing);
|
||||
|
||||
void process_shape (drawing_object_description& obj, _pptx_drawing & drawing);
|
||||
void process_image (drawing_object_description& obj, _pptx_drawing & drawing);
|
||||
void process_chart (drawing_object_description& obj, _pptx_drawing & drawing);
|
||||
void process_table (drawing_object_description& obj, _pptx_drawing & drawing);
|
||||
void process_object (drawing_object_description& obj, _pptx_drawing & drawing);
|
||||
|
||||
size_t rId_;
|
||||
mediaitems mediaitems_;
|
||||
pptx_drawings_ptr pptx_drawings_;
|
||||
};
|
||||
|
||||
void pptx_slide_context::Impl::process_drawings()
|
||||
{
|
||||
for (int i = 0; i < objects_.size(); i++)
|
||||
{
|
||||
_pptx_drawing drawing =_pptx_drawing();
|
||||
|
||||
drawing.type = objects_[i].type_;
|
||||
drawing.name = objects_[i].name_;
|
||||
drawing.id = next_rId();
|
||||
|
||||
process_common_properties(objects_[i], drawing);
|
||||
|
||||
switch(objects_[i].type_)
|
||||
{
|
||||
case typeImage: process_image(objects_[i], drawing); break;
|
||||
case typeChart: process_chart(objects_[i], drawing); break;
|
||||
case typeShape: process_shape(objects_[i], drawing); break;
|
||||
case typeTable: process_table(objects_[i], drawing); break;
|
||||
case typeMsObject:
|
||||
case typeOleObject: process_object(objects_[i], drawing); break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pptx_slide_context::pptx_slide_context(pptx_conversion_context & Context)
|
||||
: impl_(new pptx_slide_context::Impl(Context.root()->get_folder()))
|
||||
@ -200,12 +223,11 @@ void pptx_slide_context::set_transitionSpeed(std::wstring val)
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
void pptx_slide_context::default_set()
|
||||
{
|
||||
impl_->object_description_.xlink_href_ = L"";
|
||||
|
||||
impl_->object_description_.name_ = L"";
|
||||
|
||||
impl_->object_description_.xlink_href_ = L"";
|
||||
impl_->object_description_.name_ = L"";
|
||||
impl_->object_description_.descriptor_ = L"";
|
||||
impl_->object_description_.anchor_ = L"";
|
||||
impl_->object_description_.additional_.clear();
|
||||
impl_->object_description_.anchor_ =L"";
|
||||
|
||||
impl_->object_description_.clipping_string_= L"";
|
||||
impl_->object_description_.svg_rect_ = boost::none;
|
||||
@ -215,7 +237,12 @@ void pptx_slide_context::default_set()
|
||||
|
||||
impl_->object_description_.fill_.clear();
|
||||
|
||||
impl_->object_description_.use_image_replace_ = false;
|
||||
impl_->use_image_replacement_ = false;
|
||||
}
|
||||
|
||||
void pptx_slide_context::set_use_image_replacement()
|
||||
{
|
||||
impl_->use_image_replacement_ = true;
|
||||
}
|
||||
|
||||
void pptx_slide_context::set_placeHolder_type(std::wstring typeHolder)
|
||||
@ -341,54 +368,72 @@ void pptx_slide_context::start_shape(int type)
|
||||
impl_->object_description_.shape_type_ = type; //2,3...
|
||||
}
|
||||
|
||||
void pptx_slide_context::start_image(std::wstring const & path)
|
||||
{
|
||||
impl_->object_description_.type_ = typeImage;
|
||||
impl_->object_description_.xlink_href_ = path;
|
||||
}
|
||||
|
||||
void pptx_slide_context::start_table()
|
||||
{
|
||||
impl_->object_description_.type_ = typeTable;
|
||||
impl_->object_description_.type_ = typeTable;
|
||||
}
|
||||
|
||||
void pptx_slide_context::set_use_image_replacement()
|
||||
void pptx_slide_context::set_text_box()
|
||||
{
|
||||
impl_->object_description_.use_image_replace_ = true;
|
||||
impl_->object_description_.type_ = typeShape;
|
||||
impl_->object_description_.shape_type_ = 2; //2,3...
|
||||
}
|
||||
|
||||
void pptx_slide_context::start_object_ole()
|
||||
void pptx_slide_context::set_ms_object(const std::wstring & path, const std::wstring & progId)
|
||||
{
|
||||
impl_->object_description_.type_ = typeMsObject;
|
||||
impl_->object_description_.xlink_href_ = path;
|
||||
impl_->object_description_.descriptor_ = progId;
|
||||
}
|
||||
void pptx_slide_context::set_ole_object(const std::wstring & path, const std::wstring & progId)
|
||||
{
|
||||
impl_->object_description_.type_ = typeOleObject;
|
||||
impl_->object_description_.xlink_href_ = path;
|
||||
impl_->object_description_.descriptor_ = progId;
|
||||
}
|
||||
|
||||
void pptx_slide_context::start_chart(std::wstring const & path)
|
||||
void pptx_slide_context::set_image(const std::wstring & path)
|
||||
{
|
||||
if (impl_->object_description_.type_ == typeUnknown)
|
||||
{
|
||||
impl_->object_description_.type_ = typeImage;
|
||||
impl_->object_description_.xlink_href_ = path;
|
||||
}
|
||||
else if (impl_->use_image_replacement_)
|
||||
{
|
||||
impl_->object_description_.fill_.type = 2;
|
||||
impl_->object_description_.fill_.bitmap = oox::oox_bitmap_fill::create();
|
||||
impl_->object_description_.fill_.bitmap->xlink_href_ = path;
|
||||
impl_->object_description_.fill_.bitmap->bStretch = true;
|
||||
}
|
||||
}
|
||||
|
||||
void pptx_slide_context::start_frame()
|
||||
{
|
||||
impl_->object_description_.type_ = typeUnknown;
|
||||
}
|
||||
|
||||
void pptx_slide_context::set_chart(const std::wstring & path)
|
||||
{
|
||||
impl_->object_description_.type_ = typeChart;
|
||||
impl_->object_description_.xlink_href_ = path;
|
||||
}
|
||||
void pptx_slide_context::end_object_ole()
|
||||
|
||||
void pptx_slide_context::end_frame()
|
||||
{
|
||||
}
|
||||
void pptx_slide_context::end_shape()
|
||||
{
|
||||
impl_->shapes_.push_back(impl_->object_description_);
|
||||
impl_->objects_.push_back(impl_->object_description_);
|
||||
default_set();
|
||||
}
|
||||
|
||||
void pptx_slide_context::end_image()
|
||||
|
||||
void pptx_slide_context::end_shape()
|
||||
{
|
||||
impl_->images_.push_back(impl_->object_description_);
|
||||
default_set();
|
||||
}
|
||||
void pptx_slide_context::end_chart()
|
||||
{
|
||||
impl_->charts_.push_back(impl_->object_description_);
|
||||
impl_->objects_.push_back(impl_->object_description_);
|
||||
default_set();
|
||||
}
|
||||
|
||||
void pptx_slide_context::end_table()
|
||||
{
|
||||
impl_->tables_.push_back(impl_->object_description_);
|
||||
impl_->objects_.push_back(impl_->object_description_);
|
||||
default_set();
|
||||
}
|
||||
|
||||
@ -399,112 +444,115 @@ bool pptx_slide_context::empty() const
|
||||
|
||||
void pptx_slide_context::process_drawings()
|
||||
{
|
||||
process_shapes();
|
||||
process_images();
|
||||
process_tables();
|
||||
process_charts();
|
||||
return impl_->process_drawings();
|
||||
}
|
||||
|
||||
void pptx_slide_context::process_images()
|
||||
void pptx_slide_context::Impl::process_image(drawing_object_description& pic, _pptx_drawing & drawing)
|
||||
{
|
||||
int pos_replaicement=0, pos_preview=0;
|
||||
int pos_replaicement = 0, pos_preview = 0;
|
||||
|
||||
BOOST_FOREACH(drawing_object_description & pic, impl_->images_)
|
||||
{
|
||||
pos_replaicement = pic.xlink_href_.find(L"ObjectReplacements");
|
||||
pos_preview = pic.xlink_href_.find(L"TablePreview");
|
||||
|
||||
if ((pos_replaicement <0 && pos_preview <0) || pic.use_image_replace_)//оригинал, а не заменяемый объект (при наличии объекта)
|
||||
{
|
||||
_pptx_drawing drawing =_pptx_drawing();
|
||||
|
||||
drawing.type = pic.type_;
|
||||
drawing.name = pic.name_;
|
||||
drawing.id = impl_->next_rId();
|
||||
|
||||
process_common_properties(pic,drawing);
|
||||
|
||||
drawing.fill.bitmap = oox_bitmap_fill::create();
|
||||
drawing.fill.type = 2;
|
||||
|
||||
_CP_OPT(std::wstring) sTextContent;
|
||||
GetProperty(pic.additional_,L"text-content",sTextContent);
|
||||
if (sTextContent)//в ms office на картинке нельзя сделать надпись - меняем тип на рект с заливкой картинкой
|
||||
{
|
||||
drawing.type = typeShape;
|
||||
drawing.sub_type = 2;//rect
|
||||
}
|
||||
|
||||
drawing.fill.bitmap = oox_bitmap_fill::create();
|
||||
drawing.fill.type = 2;
|
||||
|
||||
_CP_OPT(std::wstring) sTextContent;
|
||||
GetProperty(pic.additional_, L"text-content", sTextContent);
|
||||
if (sTextContent)//в ms office на картинке нельзя сделать надпись - меняем тип на рект с заливкой картинкой
|
||||
{
|
||||
drawing.type = typeShape;
|
||||
drawing.sub_type = 2;//rect
|
||||
}
|
||||
|
||||
std::wstring fileName = impl_->odfPacket_ + FILE_SEPARATOR_STR + pic.xlink_href_;
|
||||
drawing.fill.bitmap->bCrop = odf_reader::parse_clipping(pic.clipping_string_,fileName,drawing.fill.bitmap->cropRect, NULL);
|
||||
drawing.fill.bitmap->bStretch = true;
|
||||
std::wstring fileName = odfPacket_ + FILE_SEPARATOR_STR + pic.xlink_href_;
|
||||
drawing.fill.bitmap->bCrop = odf_reader::parse_clipping(pic.clipping_string_,fileName,drawing.fill.bitmap->cropRect, NULL);
|
||||
drawing.fill.bitmap->bStretch = true;
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
std::wstring ref;/// это ссылка на выходной внешний объект
|
||||
bool isMediaInternal = false;
|
||||
|
||||
drawing.fill.bitmap->rId = impl_->get_mediaitems().add_or_find(pic.xlink_href_, typeImage, isMediaInternal, ref);
|
||||
|
||||
if (drawing.type == typeShape)
|
||||
{
|
||||
impl_->add_additional_rels(isMediaInternal, drawing.fill.bitmap->rId, ref, typeImage);//собственно это не объект, а доп рел и ref объекта
|
||||
|
||||
isMediaInternal = true;
|
||||
std::wstring rId = impl_->get_mediaitems().add_or_find(L"", typeShape, isMediaInternal, ref);
|
||||
impl_->add_drawing(drawing, isMediaInternal, rId, ref, typeShape);//объект
|
||||
std::wstring ref;/// это ссылка на выходной внешний объект
|
||||
bool isMediaInternal = false;
|
||||
|
||||
drawing.fill.bitmap->rId = get_mediaitems().add_or_find(pic.xlink_href_, typeImage, isMediaInternal, ref);
|
||||
|
||||
if (drawing.type == typeShape)
|
||||
{
|
||||
add_additional_rels(isMediaInternal, drawing.fill.bitmap->rId, ref, typeImage);//собственно это не объект, а доп рел и ref объекта
|
||||
|
||||
isMediaInternal = true;
|
||||
std::wstring rId = get_mediaitems().add_or_find(L"", typeShape, isMediaInternal, ref);
|
||||
add_drawing(drawing, isMediaInternal, rId, ref, typeShape);//объект
|
||||
|
||||
}else if (!drawing.fill.bitmap->rId.empty())
|
||||
{
|
||||
impl_->add_drawing(drawing, isMediaInternal, drawing.fill.bitmap->rId , ref, drawing.type);//объект
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}else if (!drawing.fill.bitmap->rId.empty())
|
||||
{
|
||||
add_drawing(drawing, isMediaInternal, drawing.fill.bitmap->rId , ref, drawing.type);//объект
|
||||
}
|
||||
}
|
||||
void pptx_slide_context::process_charts()
|
||||
void pptx_slide_context::Impl::process_chart(drawing_object_description & obj, _pptx_drawing & drawing)
|
||||
{
|
||||
BOOST_FOREACH(drawing_object_description & pic, impl_->charts_)
|
||||
{
|
||||
_pptx_drawing drawing=_pptx_drawing();
|
||||
|
||||
drawing.type = pic.type_;
|
||||
drawing.name = pic.name_;
|
||||
drawing.id = impl_->next_rId();
|
||||
|
||||
process_common_properties(pic,drawing);
|
||||
|
||||
////////////////////////////////////////////////////////////////
|
||||
std::wstring ref;
|
||||
bool isMediaInternal = true;
|
||||
drawing.objectId = impl_->get_mediaitems().add_or_find(pic.xlink_href_, typeChart, isMediaInternal, ref);
|
||||
impl_->add_drawing(drawing, isMediaInternal, drawing.objectId, ref, typeChart);
|
||||
}
|
||||
std::wstring ref;
|
||||
bool isMediaInternal = true;
|
||||
|
||||
drawing.objectId = get_mediaitems().add_or_find(obj.xlink_href_, obj.type_, isMediaInternal, ref);
|
||||
add_drawing(drawing, isMediaInternal, drawing.objectId, ref, drawing.type);
|
||||
}
|
||||
|
||||
void pptx_slide_context::process_tables()
|
||||
void pptx_slide_context::Impl::process_table(drawing_object_description & obj, _pptx_drawing & drawing)
|
||||
{
|
||||
BOOST_FOREACH(drawing_object_description & pic, impl_->tables_)
|
||||
{
|
||||
_pptx_drawing drawing=_pptx_drawing();
|
||||
|
||||
drawing.type = pic.type_;
|
||||
drawing.name = pic.name_;
|
||||
drawing.id = impl_->next_rId();
|
||||
|
||||
process_common_properties(pic,drawing);
|
||||
|
||||
|
||||
|
||||
////////////////////////////////////////////////////////////////
|
||||
std::wstring ref;
|
||||
bool isMediaInternal = true;
|
||||
std::wstring rId = impl_->get_mediaitems().add_or_find(L"", typeTable, isMediaInternal, ref);
|
||||
impl_->add_drawing(drawing, isMediaInternal, rId, ref, typeTable);
|
||||
}
|
||||
std::wstring ref;
|
||||
bool isMediaInternal = true;
|
||||
std::wstring rId = get_mediaitems().add_or_find(L"", obj.type_, isMediaInternal, ref);
|
||||
|
||||
add_drawing(drawing, isMediaInternal, rId, ref, drawing.type);
|
||||
}
|
||||
|
||||
void pptx_slide_context::process_common_properties(drawing_object_description & pic,_pptx_drawing & drawing)
|
||||
void pptx_slide_context::Impl::process_shape(drawing_object_description & obj, _pptx_drawing & drawing)
|
||||
{
|
||||
int PlaceHolderIndex = 1;
|
||||
|
||||
std::wstring ref;
|
||||
bool isMediaInternal = true;
|
||||
|
||||
if (drawing.fill.bitmap)
|
||||
{
|
||||
drawing.fill.bitmap->rId = get_mediaitems().add_or_find(drawing.fill.bitmap->xlink_href_, typeImage, isMediaInternal, ref);
|
||||
add_additional_rels(isMediaInternal, drawing.fill.bitmap->rId, ref, typeImage);
|
||||
}
|
||||
|
||||
std::wstring rId = get_mediaitems().add_or_find(L"", typeShape, isMediaInternal, ref);
|
||||
|
||||
////////////////////////////////////////////////////////////////
|
||||
_CP_OPT(std::wstring) sPlaceHolderType;
|
||||
GetProperty(obj.additional_, L"PlaceHolderType", sPlaceHolderType);
|
||||
if (sPlaceHolderType)
|
||||
{
|
||||
drawing.place_holder_type_ = *sPlaceHolderType;
|
||||
|
||||
_CP_OPT(int) iPlaceHolderIdx;
|
||||
GetProperty(obj.additional_, L"PlaceHolderIdx", iPlaceHolderIdx);
|
||||
if (iPlaceHolderIdx) drawing.place_holder_idx_ = *iPlaceHolderIdx;
|
||||
}
|
||||
|
||||
drawing.sub_type = obj.shape_type_;
|
||||
|
||||
add_drawing(drawing, isMediaInternal, rId, ref, typeShape);
|
||||
}
|
||||
|
||||
void pptx_slide_context::Impl::process_object(drawing_object_description& obj, _pptx_drawing & drawing)
|
||||
{
|
||||
std::wstring ref;
|
||||
bool isMediaInternal = true;
|
||||
|
||||
drawing.objectId = get_mediaitems().add_or_find(obj.xlink_href_, obj.type_, isMediaInternal, ref);
|
||||
drawing.objectProgId = obj.descriptor_;
|
||||
|
||||
add_drawing(drawing, isMediaInternal, drawing.objectId, ref, drawing.type);
|
||||
|
||||
if (drawing.fill.bitmap)
|
||||
{
|
||||
drawing.fill.bitmap->rId = get_mediaitems().add_or_find(drawing.fill.bitmap->xlink_href_, typeImage, isMediaInternal, ref);
|
||||
add_additional_rels(isMediaInternal, drawing.fill.bitmap->rId, ref, typeImage);
|
||||
}
|
||||
}
|
||||
|
||||
void pptx_slide_context::Impl::process_common_properties(drawing_object_description & pic, _pptx_drawing & drawing)
|
||||
{
|
||||
if (pic.svg_rect_)
|
||||
{
|
||||
@ -529,47 +577,6 @@ void pptx_slide_context::process_common_properties(drawing_object_description &
|
||||
drawing.fill = pic.fill_;
|
||||
}
|
||||
|
||||
void pptx_slide_context::process_shapes()
|
||||
{
|
||||
int PlaceHolderIndex = 1;
|
||||
BOOST_FOREACH(drawing_object_description & pic, impl_->shapes_)
|
||||
{
|
||||
_pptx_drawing drawing=_pptx_drawing();
|
||||
|
||||
drawing.type = pic.type_;
|
||||
drawing.name = pic.name_;
|
||||
drawing.id = impl_->next_rId();
|
||||
|
||||
process_common_properties(pic,drawing);
|
||||
|
||||
std::wstring ref;
|
||||
bool isMediaInternal = true;
|
||||
|
||||
if (drawing.fill.bitmap)
|
||||
{
|
||||
drawing.fill.bitmap->rId = impl_->get_mediaitems().add_or_find(drawing.fill.bitmap->xlink_href_, typeImage, isMediaInternal, ref);
|
||||
impl_->add_additional_rels(isMediaInternal, drawing.fill.bitmap->rId, ref, typeImage);
|
||||
}
|
||||
|
||||
std::wstring rId = impl_->get_mediaitems().add_or_find(L"", typeShape, isMediaInternal, ref);
|
||||
|
||||
////////////////////////////////////////////////////////////////
|
||||
_CP_OPT(std::wstring) sPlaceHolderType;
|
||||
GetProperty(pic.additional_,L"PlaceHolderType",sPlaceHolderType);
|
||||
if (sPlaceHolderType)
|
||||
{
|
||||
drawing.place_holder_type_ = *sPlaceHolderType;
|
||||
|
||||
_CP_OPT(int) iPlaceHolderIdx;
|
||||
GetProperty(pic.additional_,L"PlaceHolderIdx",iPlaceHolderIdx);
|
||||
if (iPlaceHolderIdx) drawing.place_holder_idx_ = *iPlaceHolderIdx;
|
||||
}
|
||||
|
||||
drawing.sub_type = pic.shape_type_;
|
||||
|
||||
impl_->add_drawing(drawing, isMediaInternal, rId, ref, typeShape);
|
||||
}
|
||||
}
|
||||
|
||||
void pptx_slide_context::dump_rels(rels & Rels)
|
||||
{
|
||||
@ -627,7 +634,6 @@ void pptx_slide_context::serialize_background(std::wostream & strm, bool always)
|
||||
|
||||
void pptx_slide_context::serialize_animations(std::wostream & strm)
|
||||
{
|
||||
|
||||
CP_XML_WRITER(strm)
|
||||
{
|
||||
if (impl_->transition_.Enabled)
|
||||
|
||||
@ -50,38 +50,40 @@ public:
|
||||
pptx_slide_context(pptx_conversion_context & Context);
|
||||
|
||||
void start_slide();
|
||||
void end_slide(){}
|
||||
void end_slide (){}
|
||||
////////////////////////////////////////////////////////////////////////////////////////
|
||||
void start_slide_animation();
|
||||
void end_slide_animation(){}
|
||||
void start_slide_animation ();
|
||||
void end_slide_animation (){}
|
||||
|
||||
void set_transitionFilter(std::wstring & type,_CP_OPT(std::wstring) & dir, _CP_OPT(std::wstring) & dop, _CP_OPT(int) & time);
|
||||
void set_transitionAction(bool val);
|
||||
void set_transitionSpeed(std::wstring val);
|
||||
void set_transitionFilter (std::wstring & type,_CP_OPT(std::wstring) & dir, _CP_OPT(std::wstring) & dop, _CP_OPT(int) & time);
|
||||
void set_transitionAction (bool val);
|
||||
void set_transitionSpeed (std::wstring val);
|
||||
///////////////////////////////////////////////////////////////////////////////////////////
|
||||
void set_rect(double width_pt, double height_pt, double x_pt, double y_pt);
|
||||
void set_rect (double width_pt, double height_pt, double x_pt, double y_pt);
|
||||
|
||||
void set_translate(double x_pt, double y_pt);
|
||||
void set_scale(double cx_pt, double cy_pt);
|
||||
void set_rotate(double angle);
|
||||
void set_translate (double x_pt, double y_pt);
|
||||
void set_scale (double cx_pt, double cy_pt);
|
||||
void set_rotate (double angle);
|
||||
|
||||
void set_name(std::wstring const & name);
|
||||
void set_anchor(std::wstring anchor, double x_pt, double y_pt);
|
||||
void set_property(odf_reader::_property p);
|
||||
void set_name (std::wstring const & name);
|
||||
void set_anchor (std::wstring anchor, double x_pt, double y_pt);
|
||||
void set_property (odf_reader::_property p);
|
||||
std::vector<odf_reader::_property> & get_properties();
|
||||
void set_clipping(const std::wstring & str );
|
||||
void set_fill(_oox_fill & fill);
|
||||
void set_clipping (const std::wstring & str );
|
||||
void set_fill (_oox_fill & fill);
|
||||
|
||||
void set_placeHolder_type(std::wstring typeHolder);
|
||||
void set_placeHolder_idx(int idx);
|
||||
void set_placeHolder_type (std::wstring typeHolder);
|
||||
void set_placeHolder_idx (int idx);
|
||||
|
||||
std::wstring add_hyperlink(std::wstring const & ref, bool object);
|
||||
|
||||
void start_image(std::wstring const & path);
|
||||
void end_image();
|
||||
|
||||
void start_chart(std::wstring const & path);
|
||||
void end_chart();
|
||||
void start_frame();
|
||||
void set_image (const std::wstring & path);
|
||||
void set_chart (const std::wstring & path);
|
||||
void set_ms_object (const std::wstring & path, const std::wstring & progId);
|
||||
void set_ole_object (const std::wstring & path, const std::wstring & progId);
|
||||
void set_text_box ();
|
||||
void end_frame();
|
||||
|
||||
void start_table();
|
||||
void end_table();
|
||||
@ -89,9 +91,6 @@ public:
|
||||
void start_shape(int type);
|
||||
void end_shape();
|
||||
|
||||
void start_object_ole();
|
||||
void end_object_ole();
|
||||
|
||||
void set_use_image_replacement();
|
||||
|
||||
bool empty() const;
|
||||
@ -109,7 +108,6 @@ public:
|
||||
|
||||
void add_background(_oox_fill & fill);
|
||||
|
||||
|
||||
void add_rels( bool isInternal,
|
||||
std::wstring const & rid,
|
||||
std::wstring const & ref,
|
||||
@ -121,13 +119,7 @@ public:
|
||||
void set_page_number();
|
||||
void set_date_time();
|
||||
private:
|
||||
void process_common_properties(drawing_object_description& pic,_pptx_drawing & drawing);
|
||||
void default_set();
|
||||
|
||||
void process_shapes();
|
||||
void process_images();
|
||||
void process_charts();
|
||||
void process_tables();
|
||||
|
||||
int hlinks_size_;
|
||||
|
||||
|
||||
@ -141,9 +141,9 @@ public:
|
||||
if (c.rules[j].text) CP_XML_ATTR(L"text", *c.rules[j].text);
|
||||
if (c.rules[j].rank) CP_XML_ATTR(L"rank", *c.rules[j].rank);
|
||||
|
||||
//CP_XML_ATTR(L"bottom" , 0);
|
||||
//CP_XML_ATTR(L"equalAverage" , 0);
|
||||
//CP_XML_ATTR(L"aboveAverage" , 0);
|
||||
//CP_XML_ATTR(L"bottom" , 0);
|
||||
//CP_XML_ATTR(L"equalAverage" , 0);
|
||||
//CP_XML_ATTR(L"aboveAverage" , 0);
|
||||
if (c.rules[j].type == 1)
|
||||
{
|
||||
CP_XML_ATTR(L"type", *c.rules[j].formula_type);
|
||||
|
||||
@ -71,11 +71,11 @@ void xlsx_serialize_text(std::wostream & strm, _xlsx_drawing & val)
|
||||
}
|
||||
}
|
||||
|
||||
void xlsx_drawing_position::serialize(std::wostream & strm)
|
||||
void xlsx_drawing_position::serialize(std::wostream & strm, std::wstring ns)
|
||||
{
|
||||
CP_XML_WRITER(strm)
|
||||
{
|
||||
CP_XML_NODE(std::wstring(L"xdr:") + (type == xlsx_drawing_position::from ? L"from" : L"to") )
|
||||
CP_XML_NODE( ns + (type == xlsx_drawing_position::from ? L"from" : L"to") )
|
||||
{
|
||||
CP_XML_NODE(L"xdr:col")
|
||||
{
|
||||
@ -182,6 +182,34 @@ void xlsx_serialize_shape(std::wostream & strm, _xlsx_drawing & val)
|
||||
}
|
||||
} // CP_XML_WRITER
|
||||
}
|
||||
void xlsx_serialize_object(std::wostream & strm, _xlsx_drawing & val)
|
||||
{//отображательная часть
|
||||
CP_XML_WRITER(strm)
|
||||
{
|
||||
CP_XML_NODE(L"xdr:sp")
|
||||
{
|
||||
CP_XML_NODE(L"xdr:nvSpPr")
|
||||
{
|
||||
CP_XML_NODE(L"xdr:cNvPr")
|
||||
{
|
||||
CP_XML_ATTR(L"id", val.id); //числовое значение val.rId
|
||||
CP_XML_ATTR(L"name", val.name);
|
||||
}
|
||||
CP_XML_NODE(L"xdr:cNvSpPr");
|
||||
|
||||
}
|
||||
CP_XML_NODE(L"xdr:spPr")
|
||||
{
|
||||
val.serialize_xfrm(CP_XML_STREAM());
|
||||
|
||||
CP_XML_NODE(L"a:prstGeom")
|
||||
{
|
||||
CP_XML_ATTR(L"prst", L"rect");
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
void xlsx_serialize_group(std::wostream & strm, _xlsx_drawing & val)
|
||||
{
|
||||
CP_XML_WRITER(strm)
|
||||
@ -192,8 +220,8 @@ void xlsx_serialize_group(std::wostream & strm, _xlsx_drawing & val)
|
||||
{
|
||||
CP_XML_NODE(L"xdr:cNvPr")
|
||||
{
|
||||
CP_XML_ATTR(L"id", val.id);
|
||||
CP_XML_ATTR(L"name", val.name);
|
||||
CP_XML_ATTR(L"id", val.id);
|
||||
CP_XML_ATTR(L"name", val.name);
|
||||
}
|
||||
CP_XML_NODE(L"xdr:cNvGrpSpPr");
|
||||
}
|
||||
@ -208,7 +236,7 @@ void xlsx_serialize_group(std::wostream & strm, _xlsx_drawing & val)
|
||||
}
|
||||
|
||||
void xlsx_serialize_chart(std::wostream & strm, _xlsx_drawing & val)
|
||||
{
|
||||
{//отображательная часть
|
||||
CP_XML_WRITER(strm)
|
||||
{
|
||||
CP_XML_NODE(L"xdr:graphicFrame")
|
||||
@ -217,14 +245,13 @@ void xlsx_serialize_chart(std::wostream & strm, _xlsx_drawing & val)
|
||||
{
|
||||
CP_XML_NODE(L"xdr:cNvPr")
|
||||
{
|
||||
CP_XML_ATTR(L"id", val.id);
|
||||
CP_XML_ATTR(L"name", val.name);
|
||||
CP_XML_ATTR(L"id", val.id);
|
||||
CP_XML_ATTR(L"name", val.name);
|
||||
}
|
||||
|
||||
CP_XML_NODE(L"xdr:cNvGraphicFramePr");
|
||||
}
|
||||
val.serialize_xfrm(CP_XML_STREAM(), L"xdr");
|
||||
|
||||
//oox_serialize_ln(CP_XML_STREAM(),val.additional);
|
||||
|
||||
CP_XML_NODE(L"a:graphic")
|
||||
@ -240,10 +267,10 @@ void xlsx_serialize_chart(std::wostream & strm, _xlsx_drawing & val)
|
||||
}
|
||||
}
|
||||
}
|
||||
} // xdr:graphicFrame
|
||||
} // CP_XML_WRITER
|
||||
}
|
||||
}
|
||||
}
|
||||
void xlsx_serialize_object(std::wostream & strm, _xlsx_drawing & val)
|
||||
void xlsx_serialize(std::wostream & strm, _xlsx_drawing & val)
|
||||
{
|
||||
if (val.type == typeShape)
|
||||
{
|
||||
@ -261,12 +288,17 @@ void xlsx_serialize_object(std::wostream & strm, _xlsx_drawing & val)
|
||||
{
|
||||
xlsx_serialize_group(strm, val);
|
||||
}
|
||||
else if (val.type == typeOleObject ||
|
||||
val.type == typeMsObject )
|
||||
{
|
||||
xlsx_serialize_object(strm, val);
|
||||
}
|
||||
}
|
||||
|
||||
void _xlsx_drawing::serialize(std::wostream & strm)
|
||||
{
|
||||
if (inGroup)
|
||||
return xlsx_serialize_object(strm, *this);
|
||||
return xlsx_serialize(strm, *this);
|
||||
|
||||
CP_XML_WRITER(strm)
|
||||
{
|
||||
@ -279,8 +311,7 @@ void _xlsx_drawing::serialize(std::wostream & strm)
|
||||
from_.serialize (CP_XML_STREAM());
|
||||
to_.serialize (CP_XML_STREAM());
|
||||
|
||||
xlsx_serialize_object (CP_XML_STREAM(), *this);
|
||||
|
||||
xlsx_serialize (CP_XML_STREAM(), *this);
|
||||
CP_XML_NODE(L"xdr:clientData");
|
||||
}
|
||||
}
|
||||
@ -293,15 +324,12 @@ void _xlsx_drawing::serialize(std::wostream & strm)
|
||||
CP_XML_ATTR(L"x", x);
|
||||
CP_XML_ATTR(L"y", y);
|
||||
}
|
||||
|
||||
CP_XML_NODE(L"xdr:ext")
|
||||
{
|
||||
CP_XML_ATTR(L"cx", cx);
|
||||
CP_XML_ATTR(L"cy", cy);
|
||||
}
|
||||
|
||||
xlsx_serialize_object (CP_XML_STREAM(), *this);
|
||||
|
||||
xlsx_serialize(CP_XML_STREAM(), *this);
|
||||
CP_XML_NODE(L"xdr:clientData");
|
||||
}
|
||||
}
|
||||
@ -310,5 +338,38 @@ void _xlsx_drawing::serialize(std::wostream & strm)
|
||||
}
|
||||
|
||||
|
||||
void _xlsx_drawing::serialize_object (std::wostream & strm)
|
||||
{
|
||||
if (type != typeOleObject && type != typeMsObject) return;
|
||||
|
||||
CP_XML_WRITER(strm)
|
||||
{
|
||||
CP_XML_NODE(L"oleObject")
|
||||
{
|
||||
CP_XML_ATTR(L"r:id", objectId);
|
||||
CP_XML_ATTR(L"shapeId", id);
|
||||
CP_XML_ATTR(L"progId", objectProgId);
|
||||
|
||||
CP_XML_NODE(L"objectPr")
|
||||
{
|
||||
CP_XML_ATTR(L"defaultSize", 0);
|
||||
if (fill.bitmap)
|
||||
{
|
||||
CP_XML_ATTR(L"r:id", fill.bitmap->rId);
|
||||
}
|
||||
CP_XML_NODE(L"anchor")
|
||||
{
|
||||
CP_XML_ATTR(L"moveWithCells", 1);
|
||||
|
||||
from_.serialize (CP_XML_STREAM(), L"");
|
||||
to_.serialize (CP_XML_STREAM(), L"");
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -49,7 +49,7 @@ struct xlsx_drawing_position
|
||||
enum type_t {from, to} type;
|
||||
xlsx_table_position position;
|
||||
|
||||
void serialize(std::wostream & _Wostream);
|
||||
void serialize(std::wostream & _Wostream, std::wstring ns = L"xdr:");
|
||||
};
|
||||
|
||||
|
||||
@ -65,7 +65,8 @@ public:
|
||||
|
||||
std::wstring content_group_;
|
||||
|
||||
void serialize (std::wostream & _Wostream);
|
||||
void serialize (std::wostream & strm);
|
||||
void serialize_object (std::wostream & strm);
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
@ -34,8 +34,6 @@
|
||||
#include <iostream>
|
||||
#include <cpdoccore/xml/utils.h>
|
||||
|
||||
#include "mediaitems_utils.h"
|
||||
|
||||
#include "xlsx_drawing.h"
|
||||
#include "xlsx_drawings.h"
|
||||
#include "xlsx_utils.h"
|
||||
@ -111,7 +109,8 @@ class xlsx_drawing_context::Impl
|
||||
public:
|
||||
Impl(xlsx_drawing_context_handle & handle) : xlsx_drawings_(xlsx_drawings::create(false)), handle_(handle)
|
||||
{
|
||||
current_level_ = &objects_;
|
||||
current_level_ = &objects_;
|
||||
use_image_replacement_ = false;
|
||||
}
|
||||
|
||||
xlsx_drawing_context_handle& handle_;
|
||||
@ -121,13 +120,14 @@ public:
|
||||
std::vector<drawing_object_description*> groups_;
|
||||
|
||||
std::vector<drawing_object_description> * current_level_;
|
||||
bool use_image_replacement_;
|
||||
//-----------------------------------------------------------------------------------
|
||||
|
||||
mediaitems & get_mediaitems() { return handle_.impl_->get_mediaitems(); }
|
||||
|
||||
void serialize(std::wostream & strm)
|
||||
{
|
||||
xlsx_serialize(strm, *xlsx_drawings_);
|
||||
xlsx_drawings_->serialize(strm);
|
||||
}
|
||||
|
||||
bool empty() const
|
||||
@ -167,12 +167,12 @@ void xlsx_drawing_context::clear()
|
||||
impl_->object_description_.anchor_y_ = 0;
|
||||
impl_->object_description_.clipping_string_ = L"";
|
||||
impl_->object_description_.svg_rect_ = boost::none;
|
||||
impl_->object_description_.use_image_replace_ = false;
|
||||
|
||||
impl_->object_description_.additional_.clear();
|
||||
impl_->object_description_.hlinks_.clear();
|
||||
impl_->object_description_.additional_.clear();
|
||||
|
||||
impl_->use_image_replacement_ = false;
|
||||
}
|
||||
|
||||
xlsx_drawing_context::~xlsx_drawing_context()
|
||||
@ -272,37 +272,62 @@ void xlsx_drawing_context::end_shape()
|
||||
impl_->current_level_->push_back(impl_->object_description_);
|
||||
}
|
||||
|
||||
void xlsx_drawing_context::start_object_ole()
|
||||
void xlsx_drawing_context::set_use_image_replacement()
|
||||
{
|
||||
impl_->use_image_replacement_ = true;
|
||||
}
|
||||
void xlsx_drawing_context::set_text_box()
|
||||
{
|
||||
impl_->object_description_.type_ = typeShape;
|
||||
impl_->object_description_.shape_type_ = 2; //2,3...
|
||||
}
|
||||
|
||||
void xlsx_drawing_context::end_object_ole()
|
||||
void xlsx_drawing_context::set_ole_object(const std::wstring & path, const std::wstring & progId)
|
||||
{
|
||||
}
|
||||
|
||||
void xlsx_drawing_context::start_image(std::wstring const & path)
|
||||
{
|
||||
impl_->object_description_.type_ = typeImage;
|
||||
impl_->object_description_.type_ = typeOleObject;
|
||||
impl_->object_description_.xlink_href_ = path;
|
||||
impl_->object_description_.descriptor_ = progId;
|
||||
}
|
||||
void xlsx_drawing_context::end_image()
|
||||
void xlsx_drawing_context::set_ms_object(const std::wstring & path, const std::wstring & progId)
|
||||
{
|
||||
impl_->object_description_.type_ = typeMsObject;
|
||||
impl_->object_description_.xlink_href_ = path;
|
||||
impl_->object_description_.descriptor_ = progId;
|
||||
}
|
||||
void xlsx_drawing_context::set_image(const std::wstring & path)
|
||||
{
|
||||
if (impl_->object_description_.type_ == typeUnknown)
|
||||
{
|
||||
impl_->object_description_.type_ = typeImage;
|
||||
impl_->object_description_.xlink_href_ = path;
|
||||
}
|
||||
else if (impl_->use_image_replacement_)
|
||||
{
|
||||
impl_->object_description_.fill_.type = 2;
|
||||
impl_->object_description_.fill_.bitmap = oox::oox_bitmap_fill::create();
|
||||
impl_->object_description_.fill_.bitmap->xlink_href_ = path;
|
||||
}
|
||||
}
|
||||
void xlsx_drawing_context::start_frame()
|
||||
{
|
||||
impl_->object_description_.type_ = typeUnknown;
|
||||
}
|
||||
void xlsx_drawing_context::end_frame()
|
||||
{
|
||||
impl_->current_level_->push_back(impl_->object_description_);
|
||||
}
|
||||
void xlsx_drawing_context::start_chart(std::wstring const & path)
|
||||
|
||||
void xlsx_drawing_context::set_chart(const std::wstring & path)
|
||||
{
|
||||
impl_->object_description_.type_ = typeChart;
|
||||
impl_->object_description_.xlink_href_ = path;
|
||||
}
|
||||
void xlsx_drawing_context::end_chart()
|
||||
{
|
||||
impl_->current_level_->push_back(impl_->object_description_);
|
||||
}
|
||||
|
||||
void xlsx_drawing_context::set_rect(double width_pt, double height_pt, double x_pt, double y_pt)
|
||||
{
|
||||
impl_->object_description_.svg_rect_ = _rect(width_pt, height_pt, x_pt, y_pt);
|
||||
}
|
||||
|
||||
void xlsx_drawing_context::set_translate(double x_pt, double y_pt)
|
||||
{
|
||||
if (impl_->object_description_.svg_rect_)
|
||||
@ -313,6 +338,7 @@ void xlsx_drawing_context::set_translate(double x_pt, double y_pt)
|
||||
r.y += y_pt;
|
||||
}
|
||||
}
|
||||
|
||||
void xlsx_drawing_context::set_rotate(double angle)
|
||||
{
|
||||
set_property(odf_reader::_property(L"svg:rotate", angle));
|
||||
@ -369,6 +395,7 @@ void xlsx_drawing_context::set_fill(_oox_fill & fill)
|
||||
{
|
||||
impl_->object_description_.fill_= fill;
|
||||
}
|
||||
|
||||
std::wstring xlsx_drawing_context::add_hyperlink(std::wstring const & href,bool object)
|
||||
{
|
||||
++hlinks_size_;
|
||||
@ -384,11 +411,6 @@ std::wstring xlsx_drawing_context::add_hyperlink(std::wstring const & href,bool
|
||||
return hId;
|
||||
}
|
||||
|
||||
void xlsx_drawing_context::set_use_image_replacement()
|
||||
{
|
||||
impl_->object_description_.use_image_replace_ = true;
|
||||
}
|
||||
|
||||
bool xlsx_drawing_context::empty() const
|
||||
{
|
||||
return impl_->empty();
|
||||
@ -542,6 +564,19 @@ void xlsx_drawing_context::process_chart(drawing_object_description & obj,_xlsx_
|
||||
impl_->get_drawings()->add(isMediaInternal, drawing.objectId, ref, obj.type_); // не объект
|
||||
}
|
||||
|
||||
void xlsx_drawing_context::process_object(drawing_object_description & obj,_xlsx_drawing & drawing, xlsx_drawings_ptr xlsx_drawings_)
|
||||
{
|
||||
std::wstring ref;
|
||||
bool isMediaInternal = true;
|
||||
|
||||
drawing.objectId = impl_->get_mediaitems().add_or_find(obj.xlink_href_, obj.type_, isMediaInternal, ref);
|
||||
drawing.objectProgId = obj.descriptor_;
|
||||
|
||||
xlsx_drawings_->add(drawing, isMediaInternal, drawing.objectId, ref, obj.type_, true);
|
||||
|
||||
if (drawing.inGroup)
|
||||
impl_->get_drawings()->add(isMediaInternal, drawing.objectId, ref, obj.type_); // не объект
|
||||
}
|
||||
void xlsx_drawing_context::process_shape(drawing_object_description & obj,_xlsx_drawing & drawing, xlsx_drawings_ptr xlsx_drawings_)
|
||||
{
|
||||
std::wstring ref;
|
||||
@ -559,7 +594,7 @@ void xlsx_drawing_context::process_group(drawing_object_description & obj, xlsx_
|
||||
|
||||
std::wstringstream strm;
|
||||
|
||||
xlsx_serialize(strm, *xlsx_drawings_child);
|
||||
xlsx_drawings_child->serialize(strm);
|
||||
|
||||
drawing.content_group_ = strm.str();
|
||||
|
||||
@ -581,9 +616,6 @@ void xlsx_drawing_context::process_objects(std::vector<drawing_object_descriptio
|
||||
{
|
||||
drawing_object_description & obj = objects[i];
|
||||
|
||||
int pos_replaicement = obj.xlink_href_.find(L"ObjectReplacements");
|
||||
if (pos_replaicement >= 0 && !obj.use_image_replace_)continue; //объект
|
||||
|
||||
_xlsx_drawing drawing =_xlsx_drawing();
|
||||
|
||||
drawing.type = obj.type_;
|
||||
@ -600,7 +632,11 @@ void xlsx_drawing_context::process_objects(std::vector<drawing_object_descriptio
|
||||
bool isMediaInternal = true;
|
||||
|
||||
drawing.fill.bitmap->rId = impl_->get_mediaitems().add_or_find(drawing.fill.bitmap->xlink_href_, typeImage, isMediaInternal, ref);
|
||||
impl_->get_drawings()->add(isMediaInternal, drawing.fill.bitmap->rId, ref, typeImage);//собственно это не объект, а доп рел и ref объекта
|
||||
|
||||
bool in_sheet = (obj.type_== typeOleObject || obj.type_== typeMsObject) ? true : false;
|
||||
impl_->get_drawings()->add(isMediaInternal, drawing.fill.bitmap->rId, ref, typeImage, in_sheet);//собственно это не объект, а доп рел и ref объекта
|
||||
|
||||
//object dumps in sheet rels !!
|
||||
}
|
||||
|
||||
process_common_properties(obj, drawing, table_metrics);
|
||||
@ -611,6 +647,9 @@ void xlsx_drawing_context::process_objects(std::vector<drawing_object_descriptio
|
||||
case typeImage: process_image ( obj, drawing, xlsx_drawings_); break;
|
||||
case typeShape: process_shape ( obj, drawing, xlsx_drawings_); break;
|
||||
case typeGroupShape: process_group ( obj, table_metrics, drawing, xlsx_drawings_); break;
|
||||
case typeMsObject:
|
||||
case typeOleObject:
|
||||
process_object ( obj, drawing, xlsx_drawings_); break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -80,35 +80,34 @@ public:
|
||||
|
||||
void set_odf_packet_path(std::wstring path){odf_packet_path_ = path;}//для анализа картинок
|
||||
|
||||
void start_drawing(std::wstring const & name);
|
||||
void end_drawing();
|
||||
void start_drawing (std::wstring const & name);
|
||||
void end_drawing ();
|
||||
|
||||
void start_group(std::wstring const & name);
|
||||
void end_group();
|
||||
|
||||
void start_image(std::wstring const & path);
|
||||
void end_image();
|
||||
|
||||
void start_chart(std::wstring const & path);
|
||||
void end_chart();
|
||||
void end_group ();
|
||||
|
||||
void start_shape(int type);
|
||||
//...пока тока общие свойства ... частные для каждого объекта пооозже
|
||||
void end_shape();
|
||||
|
||||
void start_object_ole();
|
||||
void end_object_ole();
|
||||
void start_frame();
|
||||
void set_image (const std::wstring & path);
|
||||
void set_chart (const std::wstring & path);
|
||||
void set_ole_object (const std::wstring & path, const std::wstring & progId);
|
||||
void set_ms_object (const std::wstring & path, const std::wstring & progId);
|
||||
void set_text_box ();
|
||||
void end_frame();
|
||||
|
||||
void set_rect(double width_pt, double height_pt, double x_pt, double y_pt);
|
||||
|
||||
void set_translate(double x_pt, double y_pt);
|
||||
void set_scale(double cx_pt, double cy_pt);
|
||||
void set_rotate(double angle);
|
||||
void set_translate (double x_pt, double y_pt);
|
||||
void set_scale (double cx_pt, double cy_pt);
|
||||
void set_rotate (double angle);
|
||||
|
||||
void set_anchor(std::wstring anchor, double x_pt, double y_pt, bool group = false);
|
||||
void set_property(odf_reader::_property p);
|
||||
void set_clipping(const std::wstring & str );
|
||||
void set_fill(_oox_fill & fill);
|
||||
void set_anchor (std::wstring anchor, double x_pt, double y_pt, bool group = false);
|
||||
void set_property (odf_reader::_property p);
|
||||
void set_clipping (const std::wstring & str );
|
||||
void set_fill (_oox_fill & fill);
|
||||
|
||||
std::vector<odf_reader::_property> & get_properties();
|
||||
|
||||
@ -136,6 +135,7 @@ private:
|
||||
void process_image (drawing_object_description & obj, _xlsx_drawing & drawing, xlsx_drawings_ptr xlsx_drawings_);
|
||||
void process_chart (drawing_object_description & obj, _xlsx_drawing & drawing, xlsx_drawings_ptr xlsx_drawings_);
|
||||
void process_shape (drawing_object_description & obj, _xlsx_drawing & drawing, xlsx_drawings_ptr xlsx_drawings_);
|
||||
void process_object (drawing_object_description & obj, _xlsx_drawing & drawing, xlsx_drawings_ptr xlsx_drawings_);
|
||||
|
||||
void process_common_properties (drawing_object_description & obj, _xlsx_drawing & drawing, xlsx_table_metrics & table_metrics);
|
||||
|
||||
|
||||
@ -36,7 +36,6 @@
|
||||
#include <vector>
|
||||
#include <cpdoccore/xml/simple_xml_writer.h>
|
||||
|
||||
#include "mediaitems_utils.h"
|
||||
#include "oox_rels.h"
|
||||
|
||||
namespace cpdoccore {
|
||||
@ -45,40 +44,44 @@ namespace oox {
|
||||
class xlsx_drawings::Impl
|
||||
{
|
||||
public:
|
||||
void add(_xlsx_drawing const & d, bool isInternal, std::wstring const & rid, std::wstring const & ref, RelsType type)
|
||||
void add(_xlsx_drawing const & d, bool isInternal, std::wstring const & rid, std::wstring const & ref, RelsType type, bool sheet_rel )//объект
|
||||
{
|
||||
xlsx_drawings_.push_back(d);
|
||||
|
||||
bool present = false;
|
||||
for (int i = 0 ; i < xlsx_drawing_rels_.size(); i++)
|
||||
{
|
||||
if (xlsx_drawing_rels_[i].rid == rid && xlsx_drawing_rels_[i].ref == ref)
|
||||
present = true;
|
||||
}
|
||||
if (!present)
|
||||
{
|
||||
xlsx_drawing_rels_.push_back(_rel(isInternal, rid, ref, type));
|
||||
}
|
||||
for (int i = 0 ; i < d.hlinks.size(); i++)
|
||||
add (isInternal, rid, ref, type, sheet_rel);
|
||||
|
||||
for (int i = 0 ; i < d.hlinks.size(); i++)
|
||||
{
|
||||
xlsx_drawing_rels_.push_back(_rel(false, d.hlinks[i].hId, d.hlinks[i].hRef, typeHyperlink));
|
||||
}
|
||||
}
|
||||
void add( bool isInternal, std::wstring const & rid, std::wstring const & ref, RelsType type)
|
||||
void add( bool isInternal, std::wstring const & rid, std::wstring const & ref, RelsType type, bool sheet_rel) //не объект
|
||||
{
|
||||
bool present = false;
|
||||
for (int i = 0 ; i < xlsx_drawing_rels_.size(); i++)
|
||||
{
|
||||
if (xlsx_drawing_rels_[i].rid == rid && xlsx_drawing_rels_[i].ref == ref)
|
||||
present = true;
|
||||
}
|
||||
if (!present)
|
||||
|
||||
if (type == typeHyperlink) isInternal = false;
|
||||
|
||||
if (sheet_rel)
|
||||
{
|
||||
xlsx_drawing_rels_.push_back(_rel(isInternal, rid, ref, type));
|
||||
for (int i = 0 ; i < xlsx_sheet_rels_.size(); i++)
|
||||
{
|
||||
if (xlsx_sheet_rels_[i].rid == rid && xlsx_sheet_rels_[i].ref == ref)
|
||||
present = true;
|
||||
}
|
||||
if (!present)
|
||||
xlsx_sheet_rels_.push_back (_rel(isInternal, rid, ref, type));
|
||||
}
|
||||
else
|
||||
{
|
||||
for (int i = 0 ; i < xlsx_drawing_rels_.size(); i++)
|
||||
{
|
||||
if (xlsx_drawing_rels_[i].rid == rid && xlsx_drawing_rels_[i].ref == ref)
|
||||
present = true;
|
||||
}
|
||||
if (!present)
|
||||
xlsx_drawing_rels_.push_back(_rel(isInternal, rid, ref, type));
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
void serialize(std::wostream & strm)
|
||||
{
|
||||
@ -107,54 +110,56 @@ public:
|
||||
}
|
||||
}
|
||||
}
|
||||
void serialize_objects(std::wostream & strm)
|
||||
{
|
||||
for (int i = 0 ; i < xlsx_drawings_.size(); i++)
|
||||
{
|
||||
if (xlsx_drawings_[i].type != typeOleObject && xlsx_drawings_[i].type != typeMsObject) continue;
|
||||
|
||||
xlsx_drawings_[i].serialize_object(strm);
|
||||
}
|
||||
}
|
||||
|
||||
bool empty() const
|
||||
{
|
||||
return (xlsx_drawings_.empty());
|
||||
}
|
||||
|
||||
void dump_rels(rels & Rels)
|
||||
void dump_rels_drawing(rels & Rels)
|
||||
{
|
||||
for (int i = 0 ; i < xlsx_drawing_rels_.size(); i++)
|
||||
{
|
||||
if (xlsx_drawing_rels_[i].type == typeChart)
|
||||
if (xlsx_drawing_rels_[i].type == typeImage ||
|
||||
xlsx_drawing_rels_[i].type == typeMedia ||
|
||||
xlsx_drawing_rels_[i].type == typeChart ||
|
||||
xlsx_drawing_rels_[i].type == typeHyperlink )
|
||||
{
|
||||
Rels.add(relationship(
|
||||
xlsx_drawing_rels_[i].rid,
|
||||
utils::media::get_rel_type(xlsx_drawing_rels_[i].type),
|
||||
|
||||
Rels.add(relationship( xlsx_drawing_rels_[i].rid,
|
||||
mediaitems::get_rel_type(xlsx_drawing_rels_[i].type),
|
||||
(xlsx_drawing_rels_[i].is_internal ? std::wstring(L"../") + xlsx_drawing_rels_[i].ref : xlsx_drawing_rels_[i].ref),
|
||||
(xlsx_drawing_rels_[i].is_internal ? L"" : L"External")
|
||||
)
|
||||
);
|
||||
}
|
||||
else if (xlsx_drawing_rels_[i].type == typeImage)
|
||||
{
|
||||
Rels.add(relationship(
|
||||
xlsx_drawing_rels_[i].rid,
|
||||
utils::media::get_rel_type(xlsx_drawing_rels_[i].type),
|
||||
xlsx_drawing_rels_[i].is_internal ? std::wstring(L"../") + xlsx_drawing_rels_[i].ref : xlsx_drawing_rels_[i].ref,
|
||||
(xlsx_drawing_rels_[i].is_internal ? L"" : L"External")
|
||||
)
|
||||
);
|
||||
}
|
||||
else if (xlsx_drawing_rels_[i].type == typeHyperlink)
|
||||
{
|
||||
Rels.add(relationship(
|
||||
xlsx_drawing_rels_[i].rid,
|
||||
L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/hyperlink",
|
||||
xlsx_drawing_rels_[i].ref,
|
||||
L"External")
|
||||
);
|
||||
(xlsx_drawing_rels_[i].is_internal ? L"" : L"External")) );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void dump_rels_sheet(rels & Rels)
|
||||
{
|
||||
for (int i = 0 ; i < xlsx_sheet_rels_.size(); i++)
|
||||
{
|
||||
Rels.add(relationship( xlsx_sheet_rels_[i].rid,
|
||||
mediaitems::get_rel_type(xlsx_sheet_rels_[i].type),
|
||||
(xlsx_sheet_rels_[i].is_internal ? std::wstring(L"../") + xlsx_sheet_rels_[i].ref : xlsx_sheet_rels_[i].ref),
|
||||
(xlsx_sheet_rels_[i].is_internal ? L"" : L"External")) );
|
||||
}
|
||||
}
|
||||
bool inGroup;
|
||||
|
||||
private:
|
||||
|
||||
std::vector<_xlsx_drawing> xlsx_drawings_;
|
||||
|
||||
std::vector<_rel> xlsx_drawing_rels_;
|
||||
std::vector<_rel> xlsx_sheet_rels_;
|
||||
};
|
||||
|
||||
xlsx_drawings::xlsx_drawings(bool inGroup_) : impl_( new xlsx_drawings::Impl() )
|
||||
@ -167,19 +172,24 @@ xlsx_drawings::~xlsx_drawings()
|
||||
}
|
||||
|
||||
void xlsx_drawings::add(_xlsx_drawing const & d, bool isInternal, std::wstring const & rid,
|
||||
std::wstring const & ref, RelsType type)
|
||||
std::wstring const & ref, RelsType type, bool sheet_rel)
|
||||
{
|
||||
impl_->add(d, isInternal, rid, ref, type);
|
||||
impl_->add(d, isInternal, rid, ref, type, sheet_rel);
|
||||
}
|
||||
|
||||
void xlsx_drawings::add( bool isInternal, std::wstring const & rid, std::wstring const & ref, RelsType type)
|
||||
void xlsx_drawings::add( bool isInternal, std::wstring const & rid, std::wstring const & ref, RelsType type, bool sheet_rel)
|
||||
{
|
||||
impl_->add(isInternal, rid, ref, type);
|
||||
impl_->add(isInternal, rid, ref, type, sheet_rel);
|
||||
}
|
||||
|
||||
void xlsx_serialize(std::wostream & _Wostream, xlsx_drawings const & val)
|
||||
void xlsx_drawings::serialize(std::wostream & strm)
|
||||
{
|
||||
val.impl_->serialize(_Wostream);
|
||||
impl_->serialize(strm);
|
||||
}
|
||||
|
||||
void xlsx_drawings::serialize_objects(std::wostream & strm)
|
||||
{
|
||||
impl_->serialize_objects(strm);
|
||||
}
|
||||
|
||||
bool xlsx_drawings::empty() const
|
||||
@ -187,9 +197,14 @@ bool xlsx_drawings::empty() const
|
||||
return impl_->empty();
|
||||
}
|
||||
|
||||
void xlsx_drawings::dump_rels(rels & Rels)
|
||||
void xlsx_drawings::dump_rels_drawing(rels & Rels)
|
||||
{
|
||||
return impl_->dump_rels(Rels);
|
||||
return impl_->dump_rels_drawing(Rels);
|
||||
}
|
||||
|
||||
void xlsx_drawings::dump_rels_sheet(rels & Rels)
|
||||
{
|
||||
return impl_->dump_rels_sheet(Rels);
|
||||
}
|
||||
|
||||
xlsx_drawings_ptr xlsx_drawings::create(bool inGroup)
|
||||
|
||||
@ -55,7 +55,7 @@ struct drawing_elm
|
||||
xlsx_drawings_ptr drawings;
|
||||
};
|
||||
|
||||
struct _xlsx_drawing;
|
||||
class _xlsx_drawing;
|
||||
|
||||
class xlsx_drawings
|
||||
{
|
||||
@ -64,14 +64,15 @@ public:
|
||||
~xlsx_drawings ();
|
||||
static xlsx_drawings_ptr create(bool inGroup);
|
||||
|
||||
public:
|
||||
void add (_xlsx_drawing const & d, bool isInternal, std::wstring const & rid, std::wstring const & ref, RelsType type);
|
||||
void add (bool isInternal, std::wstring const & rid, std::wstring const & ref, RelsType type );
|
||||
void add ( _xlsx_drawing const & d, bool isInternal, std::wstring const & rid, std::wstring const & ref, RelsType type, bool sheet_rel = false );
|
||||
void add ( bool isInternal, std::wstring const & rid, std::wstring const & ref, RelsType type, bool sheet_rel = false );
|
||||
|
||||
bool empty () const;
|
||||
void dump_rels (rels & Rels);
|
||||
bool empty () const;
|
||||
void dump_rels_sheet (rels & Rels);
|
||||
void dump_rels_drawing (rels & Rels);
|
||||
|
||||
friend void xlsx_serialize(std::wostream & _Wostream, xlsx_drawings const & val);
|
||||
void serialize (std::wostream & _Wostream);
|
||||
void serialize_objects (std::wostream & _Wostream);
|
||||
private:
|
||||
class Impl;
|
||||
_CP_SCOPED_PTR(Impl) impl_;
|
||||
|
||||
@ -54,8 +54,10 @@ public:
|
||||
std::wstringstream sort_;
|
||||
std::wstringstream autofilter_;
|
||||
std::wstringstream conditionalFormatting_;
|
||||
std::wstringstream ole_objects_;
|
||||
|
||||
rels hyperlinks_rels_;
|
||||
rels ole_objects_rels_;
|
||||
|
||||
std::wstring drawingName_;
|
||||
std::wstring drawingId_;
|
||||
@ -128,20 +130,31 @@ std::wostream & xlsx_xml_worksheet::hyperlinks()
|
||||
{
|
||||
return impl_->hyperlinks_;
|
||||
}
|
||||
std::wostream & xlsx_xml_worksheet::ole_objects()
|
||||
{
|
||||
return impl_->ole_objects_;
|
||||
}
|
||||
//---------------------------------------------------------------------------------------
|
||||
rels & xlsx_xml_worksheet::hyperlinks_rels()
|
||||
{
|
||||
return impl_->hyperlinks_rels_;
|
||||
}
|
||||
rels & xlsx_xml_worksheet::ole_objects_rels()
|
||||
{
|
||||
return impl_->ole_objects_rels_;
|
||||
}
|
||||
void xlsx_xml_worksheet::write_to(std::wostream & strm)
|
||||
{
|
||||
CP_XML_WRITER(strm)
|
||||
{
|
||||
CP_XML_NODE(L"worksheet")
|
||||
{
|
||||
CP_XML_ATTR(L"xmlns", L"http://schemas.openxmlformats.org/spreadsheetml/2006/main");
|
||||
CP_XML_ATTR(L"xmlns:r", L"http://schemas.openxmlformats.org/officeDocument/2006/relationships");
|
||||
CP_XML_ATTR(L"xmlns:mc", L"http://schemas.openxmlformats.org/markup-compatibility/2006");
|
||||
CP_XML_ATTR(L"mc:Ignorable", L"x14ac");
|
||||
CP_XML_ATTR(L"xmlns", L"http://schemas.openxmlformats.org/spreadsheetml/2006/main");
|
||||
CP_XML_ATTR(L"xmlns:r", L"http://schemas.openxmlformats.org/officeDocument/2006/relationships");
|
||||
CP_XML_ATTR(L"xmlns:xdr", L"http://schemas.openxmlformats.org/drawingml/2006/spreadsheetDrawing");
|
||||
CP_XML_ATTR(L"xmlns:x14", L"http://schemas.microsoft.com/office/spreadsheetml/2009/9/main");
|
||||
CP_XML_ATTR(L"xmlns:mc", L"http://schemas.openxmlformats.org/markup-compatibility/2006");
|
||||
CP_XML_ATTR(L"mc:Ignorable",L"x14ac");
|
||||
CP_XML_ATTR(L"xmlns:x14ac", L"http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac");
|
||||
|
||||
CP_XML_STREAM() << impl_->sheetFormat_.str();
|
||||
@ -179,7 +192,13 @@ void xlsx_xml_worksheet::write_to(std::wostream & strm)
|
||||
CP_XML_ATTR(L"r:id",impl_->vml_drawingId_);
|
||||
}
|
||||
}
|
||||
|
||||
if (!impl_->ole_objects_.str().empty())
|
||||
{
|
||||
CP_XML_NODE(L"oleObjects")
|
||||
{
|
||||
CP_XML_STREAM() << impl_->ole_objects_.str();
|
||||
}
|
||||
}
|
||||
//CP_XML_NODE(L"headerFooter){}
|
||||
|
||||
//CP_XML_NODE(L"rowBreaks){}
|
||||
@ -217,43 +236,5 @@ std::pair<std::wstring, std::wstring> xlsx_xml_worksheet::get_vml_drawing_link()
|
||||
return std::pair<std::wstring, std::wstring>(impl_->vml_drawingName_, impl_->vml_drawingId_);
|
||||
}
|
||||
|
||||
//class xlsx_xml_workbook::Impl: noncopyable
|
||||
//{
|
||||
//public:
|
||||
// std::wstringstream sheets_;
|
||||
//};
|
||||
//
|
||||
//xlsx_xml_workbook::xlsx_xml_workbook() : impl_(new xlsx_xml_workbook::Impl)
|
||||
//{
|
||||
//}
|
||||
//
|
||||
//xlsx_xml_workbook::~xlsx_xml_workbook()
|
||||
//{
|
||||
//}
|
||||
//
|
||||
//std::wostream & xlsx_xml_workbook::sheets()
|
||||
//{
|
||||
// return impl_->sheets_;
|
||||
//}
|
||||
//
|
||||
//void xlsx_xml_workbook::write_to(std::wostream & strm)
|
||||
//{
|
||||
// CP_XML_WRITER(strm)
|
||||
// {
|
||||
// CP_XML_NODE(L"workbook")
|
||||
// {
|
||||
// CP_XML_ATTR(L"xmlns", L"http://schemas.openxmlformats.org/spreadsheetml/2006/main");
|
||||
// CP_XML_ATTR(L"xmlns:r", L"http://schemas.openxmlformats.org/officeDocument/2006/relationships");
|
||||
//
|
||||
// CP_XML_NODE(L"sheets")
|
||||
// {
|
||||
// CP_XML_STREAM() << impl_->sheets_.str();
|
||||
// }
|
||||
// }
|
||||
// }
|
||||
//}
|
||||
//
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -62,8 +62,10 @@ public:
|
||||
std::wostream & autofilter();
|
||||
std::wostream & conditionalFormatting();
|
||||
std::wostream & sort();
|
||||
std::wostream & ole_objects();
|
||||
|
||||
rels & hyperlinks_rels();
|
||||
rels & ole_objects_rels();
|
||||
|
||||
void write_to(std::wostream & strm);
|
||||
|
||||
|
||||
@ -181,30 +181,30 @@ void xl_files::write(const std::wstring & RootPath)
|
||||
sharedStrings_->write(path);
|
||||
rels_files_.add( relationship( L"shId1", L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/sharedStrings", L"sharedStrings.xml" ) );
|
||||
}
|
||||
|
||||
if (styles_)
|
||||
{
|
||||
styles_->write(path);
|
||||
rels_files_.add( relationship( L"stId1", L"http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles", L"styles.xml" ) );
|
||||
}
|
||||
|
||||
if (workbook_)
|
||||
{
|
||||
workbook_->write(path);
|
||||
}
|
||||
|
||||
if (theme_)
|
||||
{
|
||||
theme_->write(path);
|
||||
}
|
||||
|
||||
if (media_)
|
||||
{
|
||||
media_->set_main_document(get_main_document());
|
||||
media_->write(path);
|
||||
}
|
||||
|
||||
if (embeddings_)
|
||||
{
|
||||
embeddings_->set_main_document(get_main_document());
|
||||
embeddings_->write(path);
|
||||
}
|
||||
{
|
||||
charts_files_.set_main_document(get_main_document());
|
||||
charts_files_.write(path);
|
||||
}
|
||||
@ -243,7 +243,15 @@ void xl_files::add_sheet(sheet_content_ptr sheet)
|
||||
|
||||
void xl_files::set_media(mediaitems & _Mediaitems, CApplicationFonts *pAppFonts)
|
||||
{
|
||||
media_ = element_ptr( new media(_Mediaitems, pAppFonts) );
|
||||
if (_Mediaitems.count_image + _Mediaitems.count_media > 0)
|
||||
{
|
||||
media_ = element_ptr( new media(_Mediaitems, pAppFonts) );
|
||||
}
|
||||
|
||||
if (_Mediaitems.count_object > 0)
|
||||
{
|
||||
embeddings_ = element_ptr( new embeddings(_Mediaitems) );
|
||||
}
|
||||
}
|
||||
void xl_files::set_comments(element_ptr Element)
|
||||
{
|
||||
@ -313,7 +321,7 @@ void xl_drawings::write(const std::wstring & RootPath)
|
||||
rels_files relFiles;
|
||||
rels_file_ptr r = rels_file::create(e.filename + L".rels");
|
||||
|
||||
e.drawings->dump_rels(r->get_rels());
|
||||
e.drawings->dump_rels_drawing(r->get_rels());
|
||||
|
||||
relFiles.add_rel_file(r);
|
||||
relFiles.write(path);
|
||||
|
||||
@ -169,18 +169,20 @@ public:
|
||||
void add_charts(chart_content_ptr chart);
|
||||
|
||||
private:
|
||||
rels_files rels_files_;
|
||||
sheets_files sheets_files_;
|
||||
rels_files rels_files_;
|
||||
sheets_files sheets_files_;
|
||||
xl_charts_files charts_files_;
|
||||
element_ptr theme_;
|
||||
element_ptr workbook_;
|
||||
|
||||
element_ptr theme_;
|
||||
element_ptr workbook_;
|
||||
|
||||
element_ptr styles_;
|
||||
element_ptr sharedStrings_;
|
||||
element_ptr media_;
|
||||
element_ptr drawings_;
|
||||
element_ptr vml_drawings_;
|
||||
element_ptr comments_;
|
||||
element_ptr styles_;
|
||||
element_ptr sharedStrings_;
|
||||
element_ptr media_;
|
||||
element_ptr embeddings_;
|
||||
element_ptr drawings_;
|
||||
element_ptr vml_drawings_;
|
||||
element_ptr comments_;
|
||||
|
||||
};
|
||||
|
||||
@ -191,7 +193,7 @@ public:
|
||||
xlsx_document();
|
||||
|
||||
public:
|
||||
virtual void write(const std::wstring & RootPath);
|
||||
virtual void write(const std::wstring & RootPath);
|
||||
|
||||
virtual content_types_file & get_content_types_file() { return content_type_file_; }
|
||||
xl_files & get_xl_files() { return xl_files_; }
|
||||
|
||||
@ -344,6 +344,7 @@ double charsToSize(unsigned int charsCount, double maxDigitSize)
|
||||
void xlsx_table_state::serialize_table_format(std::wostream & _Wostream)
|
||||
{
|
||||
odf_reader::odf_read_context & odfContext = context_->root()->odf_context();
|
||||
|
||||
CP_XML_WRITER(_Wostream)
|
||||
{
|
||||
odf_reader::style_table_properties * table_prop = NULL;
|
||||
@ -367,13 +368,64 @@ void xlsx_table_state::serialize_table_format(std::wostream & _Wostream)
|
||||
//<pageSetUpPr fitToPage="true"/>
|
||||
}
|
||||
}
|
||||
//<dimension ref="B1:T65536"/>
|
||||
CP_XML_NODE(L"sheetView")
|
||||
int columns = (std::max)(current_table_column_, (int)columns_count_);
|
||||
int rows = (std::max)(current_table_row_, 1);
|
||||
|
||||
if (columns < 1024 && columns > 1 &&
|
||||
rows < 1024 && rows > 1)
|
||||
{
|
||||
// -showGridLines
|
||||
CP_XML_NODE(L"dimension")
|
||||
{
|
||||
std::wstring ref2 = getCellAddress( current_table_column_, current_table_row_);
|
||||
CP_XML_ATTR(L"ref", L"A1:" + ref2);
|
||||
}
|
||||
}
|
||||
if (odfContext.Settings().get_views_count() > 0)
|
||||
{
|
||||
CP_XML_NODE(L"sheetViews")
|
||||
{
|
||||
CP_XML_NODE(L"sheetView")
|
||||
{
|
||||
CP_XML_ATTR(L"workbookViewId", 0);
|
||||
|
||||
std::wstring s_col, s_row;
|
||||
for (int i = 0; i < odfContext.Settings().get_table_view_count(0, tableName_); i++)
|
||||
{
|
||||
std::pair<std::wstring, std::wstring> value = odfContext.Settings().get_table_view(0, tableName_, i);
|
||||
|
||||
if (value.first == L"ZoomValue")
|
||||
{
|
||||
CP_XML_ATTR(L"zoomScale", value.second);
|
||||
CP_XML_ATTR(L"zoomScaleNormal", value.second);
|
||||
}
|
||||
if (value.first == L"ShowGrid") CP_XML_ATTR(L"showGridLines", value.second);
|
||||
if (value.first == L"CursorPositionX") s_col = value.second;
|
||||
if (value.first == L"CursorPositionY") s_row = value.second;
|
||||
}
|
||||
|
||||
int col = -1, row = -1;
|
||||
try
|
||||
{
|
||||
col = boost::lexical_cast<int>(s_col);
|
||||
row = boost::lexical_cast<int>(s_row);
|
||||
}
|
||||
catch(...){}
|
||||
|
||||
if (col >= 0 && row >= 0)
|
||||
{
|
||||
CP_XML_NODE(L"selection")
|
||||
{
|
||||
CP_XML_ATTR(L"sqref", getCellAddress(col, row));
|
||||
CP_XML_ATTR(L"activeCellId", 0);
|
||||
CP_XML_ATTR(L"activeCell", getCellAddress(col, row));
|
||||
CP_XML_ATTR(L"pane", L"topLeft");
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
// -showRowColHeaders
|
||||
// -rightToLeft
|
||||
// -zoomScale
|
||||
}
|
||||
|
||||
double default_height = (2 * context_->getMaxDigitSize().second * 72. / 96. * 100.) /100.;//in point size.
|
||||
@ -403,7 +455,10 @@ void xlsx_table_state::serialize_merge_cells(std::wostream & _Wostream)
|
||||
{
|
||||
return xlsx_merge_cells_.xlsx_serialize(_Wostream);
|
||||
}
|
||||
|
||||
void xlsx_table_state::serialize_ole_objects(std::wostream & _Wostream)
|
||||
{
|
||||
return xlsx_drawing_context_.get_drawings()->serialize_objects(_Wostream);
|
||||
}
|
||||
void xlsx_table_state::serialize_hyperlinks(std::wostream & _Wostream)
|
||||
{
|
||||
return xlsx_hyperlinks_.xlsx_serialize(_Wostream);
|
||||
@ -416,6 +471,10 @@ void xlsx_table_state::dump_rels_hyperlinks(rels & Rels)
|
||||
{
|
||||
return xlsx_hyperlinks_.dump_rels(Rels);
|
||||
}
|
||||
void xlsx_table_state::dump_rels_ole_objects(rels & Rels)
|
||||
{
|
||||
return get_drawing_context().get_drawings()->dump_rels_sheet(Rels);
|
||||
}
|
||||
|
||||
void xlsx_table_state::start_hyperlink()
|
||||
{
|
||||
|
||||
@ -127,7 +127,10 @@ public:
|
||||
void serialize_table_format (std::wostream & _Wostream);
|
||||
void serialize_merge_cells (std::wostream & _Wostream);
|
||||
void serialize_hyperlinks (std::wostream & _Wostream);
|
||||
void dump_rels_hyperlinks (rels & Rels);
|
||||
void serialize_ole_objects (std::wostream & _Wostream);
|
||||
|
||||
void dump_rels_hyperlinks (rels & Rels);
|
||||
void dump_rels_ole_objects (rels & Rels);
|
||||
|
||||
std::wstring get_table_name() const { return tableName_; }
|
||||
int get_table_id() const { return tableId_; }
|
||||
|
||||
@ -320,10 +320,18 @@ void xlsx_table_context::serialize_hyperlinks(std::wostream & _Wostream)
|
||||
{
|
||||
return state()->serialize_hyperlinks(_Wostream);
|
||||
}
|
||||
void xlsx_table_context::serialize_ole_objects(std::wostream & _Wostream)
|
||||
{
|
||||
return state()->serialize_ole_objects(_Wostream);
|
||||
}
|
||||
void xlsx_table_context::dump_rels_hyperlinks(rels & Rels)
|
||||
{
|
||||
return state()->dump_rels_hyperlinks(Rels);
|
||||
}
|
||||
void xlsx_table_context::dump_rels_ole_objects(rels & Rels)
|
||||
{
|
||||
return state()->dump_rels_ole_objects(Rels);
|
||||
}
|
||||
|
||||
xlsx_table_metrics & xlsx_table_context::get_table_metrics()
|
||||
{
|
||||
|
||||
@ -88,6 +88,8 @@ public:
|
||||
void serialize_merge_cells (std::wostream & _Wostream);
|
||||
void serialize_table_format (std::wostream & _Wostream);
|
||||
void serialize_conditionalFormatting(std::wostream & _Wostream);
|
||||
void serialize_hyperlinks (std::wostream & _Wostream);
|
||||
void serialize_ole_objects (std::wostream & _Wostream);
|
||||
|
||||
xlsx_table_metrics & get_table_metrics();
|
||||
|
||||
@ -103,10 +105,9 @@ public:
|
||||
void start_hyperlink();
|
||||
std::wstring end_hyperlink(std::wstring const & ref, std::wstring const & href, std::wstring const & display);
|
||||
|
||||
void dump_rels_hyperlinks(rels & Rels);
|
||||
|
||||
void serialize_hyperlinks(std::wostream & _Wostream);
|
||||
|
||||
void dump_rels_hyperlinks (rels & Rels);
|
||||
void dump_rels_ole_objects (rels & Rels);
|
||||
|
||||
void start_database_range(std::wstring table_name, std::wstring ref);
|
||||
void set_database_orientation (bool val);
|
||||
void set_database_header (bool val);
|
||||
|
||||
@ -53,8 +53,8 @@ std::wstring getColAddress(size_t col)
|
||||
|
||||
if (r0 > 0)
|
||||
{
|
||||
const std::wstring rest = getColAddress(col - r*r0);
|
||||
const std::wstring res = getColAddress(r0-1) + rest;
|
||||
const std::wstring rest = getColAddress(col - r * r0);
|
||||
const std::wstring res = getColAddress(r0-1) + rest;
|
||||
return res;
|
||||
}
|
||||
else
|
||||
@ -65,12 +65,12 @@ std::wstring getColAddress(size_t col)
|
||||
|
||||
std::wstring getRowAddress(size_t row)
|
||||
{
|
||||
return boost::lexical_cast<std::wstring>(row+1);
|
||||
return boost::lexical_cast<std::wstring>(row + 1);
|
||||
}
|
||||
|
||||
std::wstring getCellAddress(size_t col, size_t row)
|
||||
{
|
||||
return getColAddress(col) + getRowAddress(row);
|
||||
return getColAddress(col) + getRowAddress(row);
|
||||
}
|
||||
|
||||
//_ASSERTE(getColAddressInv(L"A") == 0);
|
||||
@ -148,11 +148,11 @@ void splitCellAddress(const std::wstring & a_, std::wstring & col, std::wstring
|
||||
//_ASSERTE(rowS == 999);
|
||||
void getCellAddressInv(const std::wstring & a_, size_t & col, size_t & row)
|
||||
{
|
||||
std::wstring colStr=L"", rowStr=L"";
|
||||
std::wstring colStr = L"", rowStr = L"";
|
||||
splitCellAddress(a_, colStr, rowStr);
|
||||
|
||||
col = getColAddressInv(colStr);
|
||||
row = getRowAdderssInv(rowStr);
|
||||
col = getColAddressInv( colStr );
|
||||
row = getRowAdderssInv( rowStr );
|
||||
}
|
||||
|
||||
bool parseBoolVal(const std::wstring & str)
|
||||
|
||||
@ -41,6 +41,8 @@
|
||||
#include "xlsx_package.h"
|
||||
#include "xlsx_utils.h"
|
||||
#include "xlsx_cell_format.h"
|
||||
|
||||
#include "../odf/odfcontext.h"
|
||||
#include "../odf/calcs_styles.h"
|
||||
|
||||
#include "../../DesktopEditor/fontengine/ApplicationFonts.h"
|
||||
@ -132,12 +134,11 @@ void xlsx_conversion_context::end_document()
|
||||
{
|
||||
std::wstringstream workbook_content;
|
||||
|
||||
unsigned int count = 0;
|
||||
// добавляем таблицы
|
||||
BOOST_FOREACH(const xlsx_xml_worksheet_ptr& sheet, sheets_)
|
||||
for (int i = 0; i < sheets_.size(); i++)
|
||||
{
|
||||
count++;
|
||||
const std::wstring id = std::wstring(L"sId") + boost::lexical_cast<std::wstring>(count);
|
||||
xlsx_xml_worksheet_ptr& sheet = sheets_[i];
|
||||
|
||||
const std::wstring id = std::wstring(L"sId") + std::to_wstring(i + 1);
|
||||
|
||||
package::sheet_content_ptr content = package::sheet_content::create();
|
||||
////////////////////////////////////////////////////////////////////////////////////////////
|
||||
@ -152,6 +153,7 @@ void xlsx_conversion_context::end_document()
|
||||
}
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
content->add_rels(sheet->hyperlinks_rels());
|
||||
content->add_rels(sheet->ole_objects_rels());
|
||||
/////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
const std::pair<std::wstring, std::wstring> p2 = sheet->get_comments_link();
|
||||
if (!p2.first.empty())
|
||||
@ -179,24 +181,22 @@ void xlsx_conversion_context::end_document()
|
||||
{
|
||||
CP_XML_NODE(L"sheet")
|
||||
{
|
||||
CP_XML_ATTR(L"name", sheet->name()); // office 2010 ! ограничение на длину имени !!!
|
||||
CP_XML_ATTR(L"sheetId", count);
|
||||
CP_XML_ATTR(L"state", L"visible");
|
||||
CP_XML_ATTR(L"r:id", id);
|
||||
CP_XML_ATTR(L"name", sheet->name()); // office 2010 ! ограничение на длину имени !!!
|
||||
CP_XML_ATTR(L"sheetId", i + 1);
|
||||
CP_XML_ATTR(L"state", L"visible");
|
||||
CP_XML_ATTR(L"r:id", id);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
//добавляем диаграммы
|
||||
|
||||
count = 0;
|
||||
BOOST_FOREACH(const oox_chart_context_ptr& chart, charts_)
|
||||
for (int i = 0; i < charts_.size(); i++)
|
||||
{
|
||||
count++;
|
||||
package::chart_content_ptr content = package::chart_content::create();
|
||||
|
||||
chart->serialize(content->content());
|
||||
chart->dump_rels(content->get_rel_file()->get_rels());
|
||||
charts_[i]->serialize(content->content());
|
||||
charts_[i]->dump_rels(content->get_rel_file()->get_rels());
|
||||
|
||||
output_document_->get_xl_files().add_charts(content);
|
||||
}
|
||||
@ -224,6 +224,8 @@ void xlsx_conversion_context::end_document()
|
||||
CP_XML_ATTR(L"xmlns", L"http://schemas.openxmlformats.org/spreadsheetml/2006/main");
|
||||
CP_XML_ATTR(L"xmlns:r", L"http://schemas.openxmlformats.org/officeDocument/2006/relationships");
|
||||
|
||||
serialize_bookViews (CP_XML_STREAM());
|
||||
|
||||
CP_XML_NODE(L"sheets")
|
||||
{
|
||||
CP_XML_STREAM() << workbook_content.str();
|
||||
@ -242,10 +244,59 @@ void xlsx_conversion_context::end_document()
|
||||
output_document_->get_xl_files().set_drawings(drawings);
|
||||
|
||||
package::xl_comments_ptr comments = package::xl_comments::create(xlsx_comments_context_handle_.content());
|
||||
output_document_->get_xl_files().set_comments(comments);
|
||||
|
||||
output_document_->get_xl_files().set_comments(comments);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
void xlsx_conversion_context::serialize_bookViews(std::wostream & strm)
|
||||
{
|
||||
odf_reader::settings_container &settings = odf_document_->odf_context().Settings();
|
||||
|
||||
if (settings.get_views_count() < 1) return;
|
||||
|
||||
CP_XML_WRITER(strm)
|
||||
{
|
||||
CP_XML_NODE(L"bookViews")
|
||||
{
|
||||
for (int i = 0; i < settings.get_views_count(); i++)
|
||||
{
|
||||
_CP_OPT(std::wstring) sActiveTable = settings.find_view_by_name(L"ActiveTable", i);
|
||||
_CP_OPT(std::wstring) sAreaWidth = settings.find_view_by_name(L"VisibleAreaWidth", i);
|
||||
_CP_OPT(std::wstring) sAreaHeight = settings.find_view_by_name(L"VisibleAreaHeight", i);
|
||||
_CP_OPT(std::wstring) sAreaTop = settings.find_view_by_name(L"VisibleAreaTop", i);
|
||||
_CP_OPT(std::wstring) sAreaLeft = settings.find_view_by_name(L"VisibleAreaLeft", i);
|
||||
|
||||
CP_XML_NODE(L"workbookView")
|
||||
{
|
||||
if (sActiveTable)
|
||||
{
|
||||
for (int i = 0; i < sheets_.size(); i++)
|
||||
{
|
||||
if (sheets_[i]->name() == *sActiveTable)
|
||||
{
|
||||
CP_XML_ATTR(L"activeTab", i);
|
||||
}
|
||||
}
|
||||
}
|
||||
if (sAreaWidth) CP_XML_ATTR(L"windowWidth", *sAreaWidth);
|
||||
if (sAreaHeight) CP_XML_ATTR(L"windowHeight", *sAreaHeight);
|
||||
|
||||
if (sAreaTop) CP_XML_ATTR(L"yWindow", *sAreaTop);
|
||||
if (sAreaLeft) CP_XML_ATTR(L"xWindow", *sAreaLeft);
|
||||
|
||||
CP_XML_ATTR(L"showSheetTabs", true);
|
||||
CP_XML_ATTR(L"showVerticalScroll", true);
|
||||
CP_XML_ATTR(L"showHorizontalScroll",true);
|
||||
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
void xlsx_conversion_context::serialize_calcPr (std::wostream & strm)
|
||||
{
|
||||
}
|
||||
|
||||
void xlsx_conversion_context::start_body()
|
||||
@ -322,12 +373,16 @@ void xlsx_conversion_context::end_table()
|
||||
get_table_context().serialize_autofilter (current_sheet().autofilter());
|
||||
get_table_context().serialize_sort (current_sheet().sort());
|
||||
get_table_context().serialize_merge_cells (current_sheet().mergeCells());
|
||||
get_table_context().serialize_hyperlinks (current_sheet().hyperlinks());
|
||||
|
||||
get_drawing_context().set_odf_packet_path (root()->get_folder());
|
||||
get_drawing_context().process_objects (get_table_metrics());
|
||||
|
||||
get_table_context().serialize_hyperlinks (current_sheet().hyperlinks());
|
||||
get_table_context().serialize_ole_objects (current_sheet().ole_objects());
|
||||
|
||||
get_table_context().dump_rels_hyperlinks (current_sheet().hyperlinks_rels());
|
||||
get_table_context().dump_rels_ole_objects (current_sheet().ole_objects_rels());
|
||||
|
||||
get_drawing_context().set_odf_packet_path(root()->get_folder());
|
||||
|
||||
get_drawing_context().process_objects(get_table_metrics());
|
||||
|
||||
if (!get_drawing_context().empty())
|
||||
{
|
||||
|
||||
@ -177,7 +177,10 @@ public:
|
||||
mediaitems & get_mediaitems() { return mediaitems_; }
|
||||
|
||||
private:
|
||||
void create_new_sheet(std::wstring const & name);
|
||||
void create_new_sheet (std::wstring const & name);
|
||||
|
||||
void serialize_bookViews(std::wostream & strm);
|
||||
void serialize_calcPr (std::wostream & strm);
|
||||
|
||||
package::xlsx_document *output_document_;
|
||||
const odf_reader::office_element *spreadsheet_;
|
||||
@ -201,7 +204,6 @@ private:
|
||||
math_context math_context_;
|
||||
xlsx_drawing_context_handle xlsx_drawing_context_handle_;
|
||||
xlsx_comments_context_handle xlsx_comments_context_handle_;
|
||||
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
@ -40,8 +40,6 @@
|
||||
#include "style_chart_properties.h"
|
||||
#include "style_text_properties.h"
|
||||
|
||||
#include "office_settings.h"
|
||||
|
||||
#include "draw_common.h"
|
||||
|
||||
#include "number_style.h"
|
||||
@ -137,11 +135,12 @@ void object_odf_context::add_grid(std::wstring const & className, std::wstring c
|
||||
_CP_LOG << "[warning] unexpected chart:grid" << std::endl;
|
||||
}
|
||||
}
|
||||
void object_odf_context::add_series(std::wstring const & cellRangeAddress,
|
||||
std::wstring const & labelCell,
|
||||
class_type classType,
|
||||
std::wstring const & attachedAxis,
|
||||
std::wstring const & styleName)
|
||||
void object_odf_context::add_series(
|
||||
std::wstring const & cellRangeAddress,
|
||||
std::wstring const & labelCell,
|
||||
class_type classType,
|
||||
std::wstring const & attachedAxis,
|
||||
std::wstring const & styleName)
|
||||
{
|
||||
if (class_ == chart_ring) classType = chart_ring;
|
||||
//if (class_ == chart_stock) classType = chart_stock;
|
||||
@ -175,7 +174,7 @@ void object_odf_context::xlsx_convert(oox::xlsx_conversion_context & Context)
|
||||
}
|
||||
else if (object_type_ == 2 && office_text_)
|
||||
{
|
||||
office_text_->xlsx_convert(Context);
|
||||
//embedded
|
||||
}
|
||||
else if (object_type_ == 3 && office_math_)
|
||||
{
|
||||
@ -183,6 +182,10 @@ void object_odf_context::xlsx_convert(oox::xlsx_conversion_context & Context)
|
||||
Context.get_math_context().start();
|
||||
office_math_->oox_convert(Context.get_math_context());
|
||||
}
|
||||
else if(object_type_ == 4 && office_spreadsheet_)
|
||||
{
|
||||
//embedded
|
||||
}
|
||||
}
|
||||
void object_odf_context::docx_convert(oox::docx_conversion_context & Context)
|
||||
{
|
||||
@ -199,7 +202,7 @@ void object_odf_context::docx_convert(oox::docx_conversion_context & Context)
|
||||
}
|
||||
else if (object_type_ == 2 && office_text_)
|
||||
{
|
||||
office_text_->docx_convert(Context);
|
||||
//embedded
|
||||
}
|
||||
else if (object_type_ == 3 && office_math_)
|
||||
{
|
||||
@ -227,7 +230,7 @@ void object_odf_context::docx_convert(oox::docx_conversion_context & Context)
|
||||
}
|
||||
else if(object_type_ == 4 && office_spreadsheet_)
|
||||
{
|
||||
//office_spreadsheet_
|
||||
//embedded
|
||||
}
|
||||
}
|
||||
void object_odf_context::pptx_convert(oox::pptx_conversion_context & Context)
|
||||
@ -244,7 +247,7 @@ void object_odf_context::pptx_convert(oox::pptx_conversion_context & Context)
|
||||
}
|
||||
else if (object_type_ == 2 && office_text_)
|
||||
{
|
||||
office_text_->pptx_convert(Context);
|
||||
//embedded
|
||||
}
|
||||
else if (object_type_ == 3 && office_math_)
|
||||
{
|
||||
@ -252,6 +255,10 @@ void object_odf_context::pptx_convert(oox::pptx_conversion_context & Context)
|
||||
Context.get_math_context().start();
|
||||
office_math_->oox_convert(Context.get_math_context());
|
||||
}
|
||||
else if(object_type_ == 4 && office_spreadsheet_)
|
||||
{
|
||||
//embedded
|
||||
}
|
||||
}
|
||||
void object_odf_context::calc_cache_series(std::wstring adress, std::vector<std::wstring> & cash)
|
||||
{
|
||||
@ -451,13 +458,13 @@ process_build_object::process_build_object(object_odf_context & object_odf, odf_
|
||||
,number_styles_ (context.numberStyles())
|
||||
,num_format_context_(context)
|
||||
{
|
||||
office_element_ptr sett_elm = settings_.find_by_style_name(L"BaseFontHeight");
|
||||
settings_config_item* sett = dynamic_cast<settings_config_item*>(sett_elm.get());
|
||||
if (sett)
|
||||
_CP_OPT(std::wstring) sFontHeight = settings_.find_by_name(L"BaseFontHeight");
|
||||
|
||||
if (sFontHeight)
|
||||
{
|
||||
try
|
||||
{
|
||||
object_odf_context_.baseFontHeight_ = boost::lexical_cast<int>(sett->content_);
|
||||
object_odf_context_.baseFontHeight_ = boost::lexical_cast<int>(*sFontHeight);
|
||||
}
|
||||
catch(...)
|
||||
{
|
||||
|
||||
@ -340,7 +340,7 @@ private:
|
||||
|
||||
styles_container & styles_;
|
||||
|
||||
styles_lite_container & settings_;
|
||||
settings_container & settings_;
|
||||
styles_lite_container & draw_styles_;
|
||||
styles_lite_container & number_styles_;
|
||||
|
||||
|
||||
@ -116,7 +116,6 @@ public:
|
||||
void apply_from(const common_horizontal_margin_attlist & Other);
|
||||
void serialize(CP_ATTR_NODE);
|
||||
|
||||
public:
|
||||
_CP_OPT(length_or_percent) fo_margin_left_;
|
||||
_CP_OPT(length_or_percent) fo_margin_right_;
|
||||
};
|
||||
@ -129,7 +128,6 @@ public:
|
||||
void apply_from(const common_vertical_margin_attlist & Other);
|
||||
void serialize(CP_ATTR_NODE);
|
||||
|
||||
public:
|
||||
_CP_OPT(length_or_percent) fo_margin_top_;
|
||||
_CP_OPT(length_or_percent) fo_margin_bottom_;
|
||||
};
|
||||
@ -143,10 +141,7 @@ public:
|
||||
|
||||
void serialize(CP_ATTR_NODE);
|
||||
|
||||
public:
|
||||
_CP_OPT(length_or_percent) fo_margin_;
|
||||
|
||||
friend class style_page_layout_properties_attlist;
|
||||
};
|
||||
|
||||
// common-math_style_attlist
|
||||
@ -158,9 +153,7 @@ public:
|
||||
|
||||
void serialize(CP_ATTR_NODE);
|
||||
|
||||
public:
|
||||
_CP_OPT(math_variant) mathvariant_;
|
||||
|
||||
};
|
||||
|
||||
// common-break-attlist
|
||||
@ -171,7 +164,6 @@ public:
|
||||
void apply_from(const common_break_attlist & Other);
|
||||
void serialize(CP_ATTR_NODE);
|
||||
|
||||
public:
|
||||
_CP_OPT(fo_break) fo_break_before_;
|
||||
_CP_OPT(fo_break) fo_break_after_;
|
||||
|
||||
@ -185,7 +177,6 @@ public:
|
||||
void apply_from(const common_page_number_attlist & Other);
|
||||
void serialize(CP_ATTR_NODE);
|
||||
|
||||
public:
|
||||
_CP_OPT(unsigned int) style_page_number_;
|
||||
|
||||
};
|
||||
@ -198,7 +189,6 @@ public:
|
||||
void apply_from(const common_background_color_attlist & Other);
|
||||
void serialize(CP_ATTR_NODE);
|
||||
|
||||
public:
|
||||
_CP_OPT(background_color) fo_background_color_;
|
||||
|
||||
};
|
||||
@ -211,7 +201,6 @@ public:
|
||||
void apply_from(const common_shadow_attlist & Other);
|
||||
void serialize(CP_ATTR_NODE);
|
||||
|
||||
public:
|
||||
_CP_OPT(shadow_type) style_shadow_;
|
||||
|
||||
};
|
||||
@ -224,7 +213,6 @@ public:
|
||||
void apply_from(const common_keep_with_next_attlist & Other);
|
||||
void serialize(CP_ATTR_NODE);
|
||||
|
||||
public:
|
||||
_CP_OPT(keep_together) keep_together_;
|
||||
|
||||
};
|
||||
@ -238,7 +226,6 @@ public:
|
||||
void serialize(CP_ATTR_NODE);
|
||||
|
||||
_CP_OPT(writing_mode) style_writing_mode_;
|
||||
|
||||
};
|
||||
|
||||
/// common-draw-data-attlist
|
||||
@ -249,7 +236,6 @@ public:
|
||||
void apply_from(const common_xlink_attlist & Other);
|
||||
void serialize(CP_ATTR_NODE);
|
||||
|
||||
public:
|
||||
_CP_OPT(std::wstring) href_;
|
||||
_CP_OPT(xlink_type) type_;
|
||||
_CP_OPT(xlink_show) show_;
|
||||
@ -265,7 +251,6 @@ public:
|
||||
void apply_from(const common_value_and_type_attlist & Other);
|
||||
void serialize(CP_ATTR_NODE);
|
||||
|
||||
public:
|
||||
_CP_OPT(office_value_type) office_value_type_;
|
||||
_CP_OPT(std::wstring) office_value_;
|
||||
_CP_OPT(std::wstring) office_currency_;
|
||||
@ -273,7 +258,6 @@ public:
|
||||
_CP_OPT(std::wstring) office_time_value_;
|
||||
_CP_OPT(std::wstring) office_boolean_value_;
|
||||
_CP_OPT(std::wstring) office_string_value_;
|
||||
|
||||
};
|
||||
|
||||
// common-border-attlist
|
||||
@ -284,7 +268,6 @@ public:
|
||||
void apply_from(const common_border_attlist & Other);
|
||||
void serialize(CP_ATTR_NODE);
|
||||
|
||||
public:
|
||||
_CP_OPT(border_style) fo_border_;
|
||||
_CP_OPT(border_style) fo_border_top_;
|
||||
_CP_OPT(border_style) fo_border_bottom_;
|
||||
@ -301,16 +284,10 @@ public:
|
||||
void apply_from(const common_border_line_width_attlist & Other);
|
||||
void serialize(CP_ATTR_NODE);
|
||||
|
||||
public:
|
||||
// style:border-line-width
|
||||
_CP_OPT(border_widths) style_border_line_width_;
|
||||
// style:border-line-width-top
|
||||
_CP_OPT(border_widths) style_border_line_width_top_;
|
||||
// style:border-line-width-bottom
|
||||
_CP_OPT(border_widths) style_border_line_width_bottom_;
|
||||
// style:border-line-width-left
|
||||
_CP_OPT(border_widths) style_border_line_width_left_;
|
||||
// style:border-line-width-right
|
||||
_CP_OPT(border_widths) style_border_line_width_right_;
|
||||
|
||||
};
|
||||
@ -323,7 +300,6 @@ public:
|
||||
void apply_from(const common_padding_attlist & Other);
|
||||
void serialize(CP_ATTR_NODE);
|
||||
|
||||
public:
|
||||
_CP_OPT(length) fo_padding_;
|
||||
|
||||
_CP_OPT(length) fo_padding_top_;
|
||||
@ -340,12 +316,11 @@ public:
|
||||
void apply_from(const common_rotation_angle_attlist & Other);
|
||||
void serialize(CP_ATTR_NODE);
|
||||
|
||||
public:
|
||||
_CP_OPT(unsigned int) style_rotation_angle_;
|
||||
|
||||
};
|
||||
|
||||
/// common-num-format-attlist
|
||||
// common-num-format-attlist
|
||||
class common_num_format_attlist
|
||||
{
|
||||
public:
|
||||
@ -353,13 +328,12 @@ public:
|
||||
void apply_from(const common_num_format_attlist & Other);
|
||||
void serialize(CP_ATTR_NODE);
|
||||
|
||||
public:
|
||||
_CP_OPT(std::wstring) style_num_format_;
|
||||
_CP_OPT(Bool) style_num_letter_sync_;
|
||||
|
||||
};
|
||||
|
||||
/// common-num-format-prefix-suffix-attlist
|
||||
// common-num-format-prefix-suffix-attlist
|
||||
class common_num_format_prefix_suffix_attlist
|
||||
{
|
||||
public:
|
||||
@ -367,13 +341,12 @@ public:
|
||||
void apply_from(const common_num_format_prefix_suffix_attlist & Other);
|
||||
void serialize(CP_ATTR_NODE);
|
||||
|
||||
public:
|
||||
_CP_OPT(std::wstring) style_num_prefix_;
|
||||
_CP_OPT(std::wstring) style_num_suffix_;
|
||||
};
|
||||
|
||||
|
||||
/// common-text-align
|
||||
// common-text-align
|
||||
class common_text_align
|
||||
{
|
||||
public:
|
||||
@ -381,11 +354,10 @@ public:
|
||||
void apply_from(const common_text_align & Other);
|
||||
void serialize(CP_ATTR_NODE);
|
||||
|
||||
public:
|
||||
_CP_OPT(text_align) fo_text_align_;
|
||||
};
|
||||
|
||||
/// common-draw-size-attlist
|
||||
// common-draw-size-attlist
|
||||
class common_draw_size_attlist
|
||||
{
|
||||
public:
|
||||
@ -393,7 +365,6 @@ public:
|
||||
void apply_from(const common_draw_size_attlist & Other);
|
||||
void serialize(CP_ATTR_NODE);
|
||||
|
||||
public:
|
||||
_CP_OPT(length) svg_width_;
|
||||
_CP_OPT(length) svg_height_;
|
||||
|
||||
@ -407,7 +378,6 @@ public:
|
||||
void apply_from(const common_text_anchor_attlist & Other);
|
||||
void serialize(CP_ATTR_NODE);
|
||||
|
||||
public:
|
||||
_CP_OPT(anchor_type) type_;
|
||||
_CP_OPT(unsigned int) page_number_;
|
||||
};
|
||||
@ -424,7 +394,6 @@ public:
|
||||
}
|
||||
void serialize(CP_ATTR_NODE){}
|
||||
|
||||
public:
|
||||
// _CP_OPT(animation_type) type_;
|
||||
//_CP_OPT(animation_direction) direction_;
|
||||
//text:animation
|
||||
@ -435,7 +404,7 @@ public:
|
||||
};
|
||||
|
||||
|
||||
/// common-draw-rel-size-attlist
|
||||
// common-draw-rel-size-attlist
|
||||
class common_draw_rel_size_attlist
|
||||
{
|
||||
public:
|
||||
@ -449,7 +418,7 @@ public:
|
||||
_CP_OPT(percent_or_scale) style_rel_height_;
|
||||
};
|
||||
|
||||
/// common-vertical-rel-attlist
|
||||
// common-vertical-rel-attlist
|
||||
class common_vertical_rel_attlist
|
||||
{
|
||||
public:
|
||||
@ -457,12 +426,11 @@ public:
|
||||
void apply_from(const common_vertical_rel_attlist & Other);
|
||||
void serialize(CP_ATTR_NODE);
|
||||
|
||||
public:
|
||||
_CP_OPT(vertical_rel) style_vertical_rel_;
|
||||
|
||||
};
|
||||
|
||||
/// common-horizontal-rel-attlist
|
||||
// common-horizontal-rel-attlist
|
||||
class common_horizontal_rel_attlist
|
||||
{
|
||||
public:
|
||||
@ -470,12 +438,11 @@ public:
|
||||
void apply_from(const common_horizontal_rel_attlist & Other);
|
||||
void serialize(CP_ATTR_NODE);
|
||||
|
||||
public:
|
||||
_CP_OPT(horizontal_rel) style_horizontal_rel_;
|
||||
|
||||
};
|
||||
|
||||
/// common-vertical-pos-attlist
|
||||
// common-vertical-pos-attlist
|
||||
class common_vertical_pos_attlist
|
||||
{
|
||||
public:
|
||||
@ -483,13 +450,12 @@ public:
|
||||
void apply_from(const common_vertical_pos_attlist & Other);
|
||||
void serialize(CP_ATTR_NODE);
|
||||
|
||||
public:
|
||||
_CP_OPT(vertical_pos) style_vertical_pos_;
|
||||
_CP_OPT(length) svg_y_;
|
||||
|
||||
};
|
||||
|
||||
/// common-horizontal-pos-attlist
|
||||
// common-horizontal-pos-attlist
|
||||
class common_horizontal_pos_attlist
|
||||
{
|
||||
public:
|
||||
@ -498,13 +464,12 @@ public:
|
||||
void apply_from(const common_horizontal_pos_attlist & Other);
|
||||
void serialize(CP_ATTR_NODE);
|
||||
|
||||
public:
|
||||
_CP_OPT(horizontal_pos) style_horizontal_pos_;
|
||||
_CP_OPT(length) svg_x_;
|
||||
|
||||
};
|
||||
|
||||
/// common-draw-style-name-attlist
|
||||
// common-draw-style-name-attlist
|
||||
class common_draw_style_name_attlist
|
||||
{
|
||||
public:
|
||||
@ -512,7 +477,6 @@ public:
|
||||
void apply_from(const common_draw_style_name_attlist & Other);
|
||||
void serialize(CP_ATTR_NODE);
|
||||
|
||||
public:
|
||||
_CP_OPT(style_ref) draw_style_name_;
|
||||
_CP_OPT(std::wstring) draw_class_names_;
|
||||
_CP_OPT(style_ref) presentation_style_name_;
|
||||
@ -528,7 +492,6 @@ public:
|
||||
void apply_from(const common_draw_z_index_attlist & Other);
|
||||
void serialize(CP_ATTR_NODE);
|
||||
|
||||
public:
|
||||
_CP_OPT(int) draw_z_index_;
|
||||
};
|
||||
|
||||
@ -540,7 +503,6 @@ public:
|
||||
void apply_from(const common_draw_id_attlist & Other);
|
||||
void serialize(CP_ATTR_NODE);
|
||||
|
||||
public:
|
||||
_CP_OPT(std::wstring) draw_id_;
|
||||
};
|
||||
|
||||
@ -552,7 +514,6 @@ public:
|
||||
void apply_from(const common_draw_layer_name_attlist & Other);
|
||||
void serialize(CP_ATTR_NODE);
|
||||
|
||||
public:
|
||||
_CP_OPT(std::wstring) draw_layer_;
|
||||
};
|
||||
|
||||
@ -564,7 +525,6 @@ public:
|
||||
void apply_from(const common_draw_transform_attlist & Other);
|
||||
void serialize(CP_ATTR_NODE);
|
||||
|
||||
public:
|
||||
_CP_OPT(std::wstring) draw_transform_;
|
||||
};
|
||||
|
||||
@ -576,7 +536,6 @@ public:
|
||||
void apply_from(const common_draw_name_attlist & Other);
|
||||
void serialize(CP_ATTR_NODE);
|
||||
|
||||
public:
|
||||
_CP_OPT(std::wstring) draw_name_;
|
||||
};
|
||||
|
||||
@ -588,7 +547,6 @@ public:
|
||||
void apply_from(const common_text_spreadsheet_shape_attlist & Other);
|
||||
void serialize(CP_ATTR_NODE);
|
||||
|
||||
public:
|
||||
_CP_OPT(std::wstring) table_end_cell_address_;
|
||||
_CP_OPT(length) table_end_x_;
|
||||
_CP_OPT(length) table_end_y_;
|
||||
@ -606,7 +564,6 @@ public:
|
||||
void apply_from(const common_draw_shape_with_styles_attlist & Other);
|
||||
void serialize(CP_ATTR_NODE);
|
||||
|
||||
public:
|
||||
common_draw_z_index_attlist common_draw_z_index_attlist_;
|
||||
common_draw_id_attlist common_draw_id_attlist_;
|
||||
common_draw_layer_name_attlist common_draw_layer_name_attlist_;
|
||||
@ -625,7 +582,6 @@ public:
|
||||
void apply_from(const common_draw_text_style_name_attlist & Other);
|
||||
void serialize(CP_ATTR_NODE);
|
||||
|
||||
public:
|
||||
_CP_OPT(style_ref) draw_text_style_name_;
|
||||
};
|
||||
|
||||
@ -637,7 +593,6 @@ public:
|
||||
void apply_from(const common_draw_position_attlist & Other);
|
||||
void serialize(CP_ATTR_NODE);
|
||||
|
||||
public:
|
||||
_CP_OPT(length) svg_x_;
|
||||
_CP_OPT(length) svg_y_;
|
||||
|
||||
@ -651,7 +606,6 @@ public:
|
||||
void apply_from(const common_draw_shape_with_text_and_styles_attlist & Other);
|
||||
void serialize(CP_ATTR_NODE);
|
||||
|
||||
public:
|
||||
common_draw_shape_with_styles_attlist common_draw_shape_with_styles_attlist_;
|
||||
common_draw_text_style_name_attlist common_draw_text_style_name_attlist_;
|
||||
};
|
||||
@ -664,7 +618,6 @@ public:
|
||||
void apply_from(const presentation_shape_attlist & Other);
|
||||
void serialize(CP_ATTR_NODE);
|
||||
|
||||
public:
|
||||
_CP_OPT(std::wstring) presentation_class_;
|
||||
_CP_OPT(Bool) presentation_placeholder_;
|
||||
_CP_OPT(Bool) presentation_user_transformed_;
|
||||
@ -678,7 +631,6 @@ public:
|
||||
void add_attributes( const xml::attributes_wc_ptr & Attributes );
|
||||
void serialize(CP_ATTR_NODE);
|
||||
|
||||
public:
|
||||
_CP_OPT(style_ref) style_name_;
|
||||
_CP_OPT(std::wstring) number_language_;
|
||||
_CP_OPT(std::wstring) number_country_;
|
||||
@ -710,7 +662,6 @@ public:
|
||||
void apply_from(const common_presentation_attlist & Other);
|
||||
void serialize(CP_ATTR_NODE);
|
||||
|
||||
public:
|
||||
_CP_OPT(presentation_class) presentation_class_;
|
||||
_CP_OPT(std::wstring) style_name_;
|
||||
_CP_OPT(Bool) presentation_placeholder_;
|
||||
@ -726,7 +677,6 @@ public:
|
||||
void apply_from(const common_anim_smil_attlist & Other);
|
||||
void serialize(CP_ATTR_NODE){}
|
||||
|
||||
public:
|
||||
//_CP_OPT(std::wstring) smil_direction_;
|
||||
//_CP_OPT(std::wstring) smil_subtype_;
|
||||
//_CP_OPT(std::wstring) smil_type_;
|
||||
|
||||
@ -36,7 +36,6 @@
|
||||
#include <sstream>
|
||||
#include <string>
|
||||
|
||||
#include <boost/foreach.hpp>
|
||||
#include <boost/algorithm/string.hpp>
|
||||
#include <boost/regex.hpp>
|
||||
|
||||
@ -48,16 +47,20 @@
|
||||
#include "style_graphic_properties.h"
|
||||
#include "odfcontext.h"
|
||||
|
||||
#include "../docx/xlsx_package.h"
|
||||
#include "../docx/docx_package.h"
|
||||
#include "../docx/pptx_package.h"
|
||||
|
||||
#include "datatypes/length.h"
|
||||
#include "datatypes/borderstyle.h"
|
||||
|
||||
#include "../../../OfficeUtils/src/OfficeUtils.h"
|
||||
#include "../../../Common/3dParty/pole/pole.h"
|
||||
|
||||
namespace cpdoccore {
|
||||
namespace odf_reader {
|
||||
|
||||
|
||||
|
||||
/// draw-image-attlist
|
||||
|
||||
// draw-image-attlist
|
||||
void draw_image_attlist::add_attributes( const xml::attributes_wc_ptr & Attributes )
|
||||
{
|
||||
CP_APPLY_ATTR(L"draw:filter-name", draw_filter_name_);
|
||||
@ -85,11 +88,6 @@ void draw_chart_attlist::add_attributes( const xml::attributes_wc_ptr & Attribut
|
||||
const wchar_t * draw_image::ns = L"draw";
|
||||
const wchar_t * draw_image::name = L"image";
|
||||
|
||||
std::wostream & draw_image::text_to_stream(std::wostream & _Wostream) const
|
||||
{
|
||||
return _Wostream;
|
||||
}
|
||||
|
||||
void draw_image::add_attributes( const xml::attributes_wc_ptr & Attributes )
|
||||
{
|
||||
draw_image_attlist_.add_attributes(Attributes);
|
||||
@ -288,5 +286,108 @@ void draw_object_ole::add_child_element( xml::sax * Reader, const std::wstring &
|
||||
CP_NOT_APPLICABLE_ELM();
|
||||
}
|
||||
|
||||
std::wstring draw_object_ole::detectObject(const std::wstring &fileName)
|
||||
{
|
||||
POLE::Storage *storage = new POLE::Storage(fileName.c_str());
|
||||
if (storage == NULL) return L"";
|
||||
|
||||
if (storage->open(false, false) == false)
|
||||
{
|
||||
delete storage;
|
||||
return L"";
|
||||
}
|
||||
std::wstring prog;
|
||||
POLE::Stream* pStream = new POLE::Stream(storage, "CompObj");
|
||||
if ((pStream) && (pStream->size() > 28))
|
||||
{
|
||||
//skip the CompObjHeader
|
||||
pStream->seek(28);
|
||||
|
||||
int sz_obj = pStream->size() - 28;
|
||||
|
||||
std::vector<std::string> str;
|
||||
|
||||
while (sz_obj > 0)
|
||||
{
|
||||
_UINT32 sz = 0;
|
||||
pStream->read((unsigned char*)&sz, 4); sz_obj-= 4;
|
||||
|
||||
if (sz > sz_obj)
|
||||
break;
|
||||
unsigned char *data = new unsigned char[sz];
|
||||
pStream->read(data, sz);
|
||||
|
||||
str.push_back(std::string((char*)data, sz));
|
||||
delete []data;
|
||||
|
||||
sz_obj-= sz;
|
||||
}
|
||||
if (!str.empty())
|
||||
{
|
||||
prog = std::wstring (str.back().begin(), str.back().end());
|
||||
}
|
||||
delete pStream;
|
||||
}
|
||||
delete storage;
|
||||
return prog;
|
||||
}
|
||||
|
||||
|
||||
std::wstring draw_object::office_convert(odf_document * odfDocument, int type)
|
||||
{
|
||||
std::wstring href_result;
|
||||
std::wstring folderPath = odfDocument->get_folder();
|
||||
std::wstring objectOutPath = FileSystem::Directory::CreateDirectoryWithUniqueName(folderPath);
|
||||
|
||||
if (type == 1)
|
||||
{
|
||||
oox::package::docx_document outputDocx;
|
||||
oox::docx_conversion_context conversionDocxContext ( odfDocument);
|
||||
|
||||
conversionDocxContext.set_output_document (&outputDocx);
|
||||
//conversionContext.set_font_directory (fontsPath);
|
||||
|
||||
if (odfDocument->docx_convert(conversionDocxContext))
|
||||
{
|
||||
outputDocx.write(objectOutPath);
|
||||
|
||||
href_result = common_xlink_attlist_.href_.get_value_or(L"Object");
|
||||
int pos = href_result.find(L"./");
|
||||
if (pos >= 0) href_result = href_result.substr(2);
|
||||
|
||||
href_result = L"docx" + href_result + L".docx";
|
||||
}
|
||||
}
|
||||
if (type == 2)
|
||||
{
|
||||
oox::package::xlsx_document outputXlsx;
|
||||
oox::xlsx_conversion_context conversionXlsxContext ( odfDocument);
|
||||
|
||||
conversionXlsxContext.set_output_document (&outputXlsx);
|
||||
//conversionContext.set_font_directory (fontsPath);
|
||||
|
||||
if (odfDocument->xlsx_convert(conversionXlsxContext))
|
||||
{
|
||||
outputXlsx.write(objectOutPath);
|
||||
|
||||
href_result = common_xlink_attlist_.href_.get_value_or(L"Object");
|
||||
int pos = href_result.find(L"./");
|
||||
if (pos >= 0) href_result = href_result.substr(2);
|
||||
|
||||
href_result = L"xlsx" + href_result + L".xlsx";
|
||||
}
|
||||
}
|
||||
if (!href_result.empty())
|
||||
{
|
||||
std::wstring temp_file = folderPath + FILE_SEPARATOR_STR + href_result;
|
||||
|
||||
COfficeUtils oCOfficeUtils(NULL);
|
||||
oCOfficeUtils.CompressFileOrDirectory(objectOutPath.c_str(), temp_file.c_str(), -1);
|
||||
}
|
||||
FileSystem::Directory::DeleteDirectory(objectOutPath);
|
||||
|
||||
return href_result;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@ -40,8 +40,6 @@
|
||||
#include "office_elements_create.h"
|
||||
#include "datatypes/common_attlists.h"
|
||||
|
||||
//#include "../docx/xlsxconversioncontext.h"
|
||||
|
||||
namespace cpdoccore {
|
||||
namespace oox
|
||||
{
|
||||
@ -75,22 +73,18 @@ public:
|
||||
virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
|
||||
virtual void pptx_convert(oox::pptx_conversion_context & Context);
|
||||
|
||||
public:
|
||||
virtual std::wostream & text_to_stream(std::wostream & _Wostream) const;
|
||||
private:
|
||||
virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );
|
||||
virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
|
||||
|
||||
private:
|
||||
draw_image_attlist draw_image_attlist_;
|
||||
odf_types::common_xlink_attlist common_xlink_attlist_;
|
||||
office_element_ptr office_binary_data_;
|
||||
office_element_ptr_array content_;
|
||||
|
||||
friend class odf_document;
|
||||
};
|
||||
|
||||
CP_REGISTER_OFFICE_ELEMENT2(draw_image);
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
//draw-chart-attlist
|
||||
class draw_chart_attlist
|
||||
@ -98,12 +92,10 @@ class draw_chart_attlist
|
||||
public:
|
||||
void add_attributes( const xml::attributes_wc_ptr & Attributes );
|
||||
|
||||
public:
|
||||
//_CP_OPT(std::wstring) draw_filter_name_;
|
||||
|
||||
};
|
||||
|
||||
//объект рисования не нужен .. нужно только место для фрэйма - сам чарт в другом месте
|
||||
class draw_chart : public office_element_impl<draw_chart>
|
||||
{
|
||||
public:
|
||||
@ -113,7 +105,7 @@ public:
|
||||
static const ElementType type = typeDrawChart;
|
||||
CPDOCCORE_DEFINE_VISITABLE();
|
||||
|
||||
//virtual void docx_convert(oox::docx_conversion_context & Context);
|
||||
virtual void docx_convert(oox::docx_conversion_context & Context){}
|
||||
virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
|
||||
virtual void pptx_convert(oox::pptx_conversion_context & Context);
|
||||
|
||||
@ -124,18 +116,19 @@ private:
|
||||
virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
|
||||
|
||||
private:
|
||||
draw_chart_attlist draw_chart_attlist_;
|
||||
draw_chart_attlist draw_chart_attlist_;
|
||||
odf_types::common_xlink_attlist common_xlink_attlist_;
|
||||
office_element_ptr_array content_;
|
||||
|
||||
//office_element_ptr title_;
|
||||
office_element_ptr_array content_;
|
||||
//office_element_ptr title_;
|
||||
|
||||
friend class odf_document;
|
||||
};
|
||||
|
||||
CP_REGISTER_OFFICE_ELEMENT2(draw_chart);
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
//draw-frame-attlist
|
||||
//draw-frame-attlist
|
||||
class draw_frame_attlist
|
||||
{
|
||||
public:
|
||||
@ -178,7 +171,7 @@ public:
|
||||
office_element_ptr_array content_;
|
||||
|
||||
office_element_ptr office_event_listeners_;
|
||||
// в content перенести нельзя - иначе событи будет добавляться не к этому объекту а следующему
|
||||
// в content перенести нельзя - иначе событи будет добавляться не к этому объекту а следующему
|
||||
office_element_ptr draw_glue_point_;
|
||||
office_element_ptr draw_image_map_;
|
||||
//office_element_ptr draw_chart_map_;
|
||||
@ -198,9 +191,9 @@ private:
|
||||
};
|
||||
|
||||
CP_REGISTER_OFFICE_ELEMENT2(draw_frame);
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
///////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
//draw-frame-attlist
|
||||
|
||||
//-------------------------------------------------------------------------------------------------------------
|
||||
//draw-frame-attlist
|
||||
class draw_g_attlist
|
||||
{
|
||||
public:
|
||||
@ -222,19 +215,19 @@ public:
|
||||
virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
|
||||
virtual void pptx_convert(oox::pptx_conversion_context & Context);
|
||||
|
||||
public:
|
||||
private:
|
||||
virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );
|
||||
virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
|
||||
|
||||
public:
|
||||
odf_types::union_common_draw_attlists common_draw_attlists_;
|
||||
draw_g_attlist draw_g_attlist_;
|
||||
|
||||
office_element_ptr_array content_;
|
||||
|
||||
private:
|
||||
virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );
|
||||
virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
|
||||
};
|
||||
|
||||
CP_REGISTER_OFFICE_ELEMENT2(draw_g);
|
||||
|
||||
//-------------------------------------------------------------------------------------------------------------
|
||||
// draw-text-box-attlist
|
||||
class draw_text_box_attlist
|
||||
{
|
||||
@ -250,7 +243,6 @@ public:
|
||||
|
||||
};
|
||||
|
||||
|
||||
class draw_text_box : public office_element_impl<draw_text_box>
|
||||
{
|
||||
public:
|
||||
@ -264,20 +256,20 @@ public:
|
||||
virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
|
||||
virtual void pptx_convert(oox::pptx_conversion_context & Context);
|
||||
|
||||
public:
|
||||
virtual std::wostream & text_to_stream(std::wostream & _Wostream) const;
|
||||
|
||||
draw_text_box_attlist draw_text_box_attlist_;
|
||||
office_element_ptr_array content_;
|
||||
|
||||
private:
|
||||
virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );
|
||||
virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
|
||||
virtual void add_text(const std::wstring & Text);
|
||||
|
||||
public:
|
||||
draw_text_box_attlist draw_text_box_attlist_;
|
||||
office_element_ptr_array content_;
|
||||
};
|
||||
|
||||
CP_REGISTER_OFFICE_ELEMENT2(draw_text_box);
|
||||
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
//-------------------------------------------------------------------------------------------------------------
|
||||
/// draw-object-attlist
|
||||
class draw_object_attlist
|
||||
{
|
||||
@ -300,17 +292,18 @@ public:
|
||||
static const ElementType type = typeDrawObject;
|
||||
CPDOCCORE_DEFINE_VISITABLE();
|
||||
|
||||
virtual void docx_convert(oox::docx_conversion_context & Context);
|
||||
virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
|
||||
virtual void pptx_convert(oox::pptx_conversion_context & Context);
|
||||
virtual void docx_convert (oox::docx_conversion_context & Context);
|
||||
virtual void xlsx_convert (oox::xlsx_conversion_context & Context);
|
||||
virtual void pptx_convert (oox::pptx_conversion_context & Context);
|
||||
|
||||
private:
|
||||
virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );
|
||||
virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
|
||||
|
||||
public:
|
||||
draw_object_attlist draw_object_attlist_;
|
||||
odf_types::common_xlink_attlist common_xlink_attlist_;
|
||||
|
||||
private:
|
||||
virtual void add_attributes ( const xml::attributes_wc_ptr & Attributes );
|
||||
virtual void add_child_element ( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
|
||||
|
||||
std::wstring office_convert(odf_document * odfDocument, int type);
|
||||
};
|
||||
|
||||
CP_REGISTER_OFFICE_ELEMENT2(draw_object);
|
||||
@ -329,13 +322,14 @@ public:
|
||||
virtual void xlsx_convert(oox::xlsx_conversion_context & Context);
|
||||
virtual void pptx_convert(oox::pptx_conversion_context & Context);
|
||||
|
||||
odf_types::common_xlink_attlist common_xlink_attlist_;
|
||||
_CP_OPT(std::wstring) draw_class_id_;
|
||||
|
||||
private:
|
||||
virtual void add_attributes( const xml::attributes_wc_ptr & Attributes );
|
||||
virtual void add_child_element( xml::sax * Reader, const std::wstring & Ns, const std::wstring & Name);
|
||||
|
||||
public:
|
||||
odf_types::common_xlink_attlist common_xlink_attlist_;
|
||||
_CP_OPT(std::wstring) draw_class_id_;
|
||||
std::wstring detectObject(const std::wstring &fileName);
|
||||
};
|
||||
|
||||
CP_REGISTER_OFFICE_ELEMENT2(draw_object_ole);
|
||||
|
||||
@ -49,7 +49,6 @@
|
||||
|
||||
#include "draw_common.h"
|
||||
#include "../docx/docx_drawing.h"
|
||||
#include "../docx/xlsx_package.h"
|
||||
#include "chart_build_oox.h"
|
||||
|
||||
#include "calcs_styles.h"
|
||||
@ -57,8 +56,6 @@
|
||||
#include "datatypes/length.h"
|
||||
#include "datatypes/borderstyle.h"
|
||||
|
||||
#include "../../../OfficeUtils/src/OfficeUtils.h"
|
||||
|
||||
namespace cpdoccore {
|
||||
|
||||
using namespace odf_types;
|
||||
@ -1429,24 +1426,17 @@ void draw_object::docx_convert(oox::docx_conversion_context & Context)
|
||||
{
|
||||
std::wstring href = common_xlink_attlist_.href_.get_value_or(L"");
|
||||
|
||||
odf_reader::odf_document * odf_reader = Context.root();
|
||||
|
||||
std::wstring folderPath = odf_reader->get_folder();
|
||||
|
||||
std::wstring objectPath = folderPath + FILE_SEPARATOR_STR + href;
|
||||
std::wstring folderPath = Context.root()->get_folder();
|
||||
std::wstring objectPath = folderPath + FILE_SEPARATOR_STR + href;
|
||||
|
||||
//normalize path ??? todooo
|
||||
boost::algorithm::replace_all(objectPath, FILE_SEPARATOR_STR + std::wstring(L"./"), FILE_SEPARATOR_STR);
|
||||
|
||||
cpdoccore::odf_reader::odf_document objectSubDoc(objectPath ,NULL);
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
//функциональная часть
|
||||
office_element* contentSubDoc = objectSubDoc.get_impl()->get_content();
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
draw_frame* frame = NULL;
|
||||
oox::_docx_drawing * drawing = NULL;
|
||||
|
||||
//if (!contentSubDoc)//Diagramma.odt - кривые ссылки на объекты
|
||||
// return;
|
||||
office_element* contentSubDoc = objectSubDoc.get_impl()->get_content();
|
||||
|
||||
object_odf_context objectBuild (href);
|
||||
if (contentSubDoc)
|
||||
@ -1456,11 +1446,10 @@ void draw_object::docx_convert(oox::docx_conversion_context & Context)
|
||||
|
||||
objectBuild.docx_convert(Context);
|
||||
|
||||
frame = Context.get_drawing_context().get_current_frame();//owner
|
||||
|
||||
drawing = dynamic_cast<oox::_docx_drawing *>(frame->oox_drawing_.get());
|
||||
frame = Context.get_drawing_context().get_current_frame(); //owner
|
||||
if (frame)
|
||||
drawing = dynamic_cast<oox::_docx_drawing *>(frame->oox_drawing_.get());
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------------------------------------------
|
||||
if (!frame || !drawing)
|
||||
{
|
||||
@ -1469,15 +1458,17 @@ void draw_object::docx_convert(oox::docx_conversion_context & Context)
|
||||
|
||||
if (objectBuild.object_type_ == 1) //диаграмма
|
||||
{
|
||||
drawing->type = oox::typeChart;
|
||||
drawing->type = oox::typeChart;
|
||||
|
||||
bool isMediaInternal = true;
|
||||
drawing->objectId = Context.add_mediaitem(href, drawing->type, isMediaInternal, href);
|
||||
}
|
||||
else if (objectBuild.object_type_ == 2 ) //embedded text
|
||||
{
|
||||
//text in text not support
|
||||
}
|
||||
else if (objectBuild.object_type_ == 3) //мат формулы
|
||||
{
|
||||
//skip replacement image !!!
|
||||
|
||||
const std::wstring & content = Context.get_drawing_context().get_text_stream_frame();
|
||||
|
||||
bool in_frame = !drawing->isInline;
|
||||
@ -1497,7 +1488,7 @@ void draw_object::docx_convert(oox::docx_conversion_context & Context)
|
||||
}
|
||||
else
|
||||
{//in text
|
||||
drawing->type = oox::typeUnknown;
|
||||
drawing->type = oox::typeUnknown; //not drawing
|
||||
|
||||
if (runState) Context.finish_run();
|
||||
//if (pState == false)
|
||||
@ -1515,47 +1506,26 @@ void draw_object::docx_convert(oox::docx_conversion_context & Context)
|
||||
}
|
||||
Context.get_drawing_context().clear_stream_frame();
|
||||
}
|
||||
if (objectBuild.object_type_ == 4) //embedded sheet
|
||||
else if (objectBuild.object_type_ == 4) //embedded sheet
|
||||
{
|
||||
bool & use_image_replace = Context.get_drawing_context().get_use_image_replace();
|
||||
use_image_replace = true;
|
||||
|
||||
oox::package::xlsx_document outputXlsx;
|
||||
oox::xlsx_conversion_context conversionXlsxContext ( &objectSubDoc);
|
||||
|
||||
conversionXlsxContext.set_output_document (&outputXlsx);
|
||||
//conversionContext.set_font_directory (fontsPath);
|
||||
|
||||
if (objectSubDoc.xlsx_convert(conversionXlsxContext))
|
||||
{
|
||||
drawing->type = oox::typeObject;
|
||||
|
||||
std::wstring objectXlsxPath = FileSystem::Directory::CreateDirectoryWithUniqueName(folderPath);
|
||||
outputXlsx.write(objectXlsxPath);
|
||||
std::wstring href_new = office_convert(&objectSubDoc, 2);
|
||||
|
||||
href = Context.get_drawing_context().get_current_object_name() + L".xlsx";
|
||||
|
||||
std::wstring temp_file = folderPath + FILE_SEPARATOR_STR + href;
|
||||
|
||||
COfficeUtils oCOfficeUtils(NULL);
|
||||
oCOfficeUtils.CompressFileOrDirectory(objectXlsxPath.c_str(), temp_file.c_str(), -1);
|
||||
|
||||
FileSystem::Directory::DeleteDirectory(objectXlsxPath);
|
||||
|
||||
if (!href_new.empty())
|
||||
{
|
||||
drawing->type = oox::typeMsObject;
|
||||
bool isMediaInternal = true;
|
||||
drawing->objectId = Context.add_mediaitem(href, drawing->type, isMediaInternal, temp_file);
|
||||
|
||||
href += FILE_SEPARATOR_STR + href_new;
|
||||
drawing->objectId = Context.add_mediaitem(href, drawing->type, isMediaInternal, href);
|
||||
drawing->objectProgId = L"Excel.Sheet.12";
|
||||
}
|
||||
else
|
||||
{
|
||||
objectBuild.object_type_ = 0;
|
||||
}
|
||||
}
|
||||
|
||||
if (objectBuild.object_type_ == 0)
|
||||
else
|
||||
{
|
||||
//замещающая картинка(если она конечно присутствует)
|
||||
|
||||
bool & use_image_replace = Context.get_drawing_context().get_use_image_replace();
|
||||
use_image_replace = true;
|
||||
}
|
||||
@ -1568,25 +1538,28 @@ void draw_object::docx_convert(oox::docx_conversion_context & Context)
|
||||
|
||||
void draw_object_ole::docx_convert(oox::docx_conversion_context & Context)
|
||||
{
|
||||
//временно - замещающая картинка(если она конечно присутствует)
|
||||
|
||||
bool & use_image_replace = Context.get_drawing_context().get_use_image_replace();
|
||||
use_image_replace = true;
|
||||
|
||||
std::wstring href = common_xlink_attlist_.href_.get_value_or(L"");
|
||||
//------------------------------------------------
|
||||
std::wstring href = common_xlink_attlist_.href_.get_value_or(L"");
|
||||
std::wstring folderPath = Context.root()->get_folder();
|
||||
std::wstring objectPath = folderPath + FILE_SEPARATOR_STR + href;
|
||||
|
||||
if (href.empty()) return;
|
||||
|
||||
draw_frame* frame = Context.get_drawing_context().get_current_frame(); //owner
|
||||
draw_frame* frame = Context.get_drawing_context().get_current_frame(); //owner
|
||||
if (!frame) return;
|
||||
|
||||
oox::_docx_drawing * drawing = dynamic_cast<oox::_docx_drawing *>(frame->oox_drawing_.get());
|
||||
oox::_docx_drawing * drawing = dynamic_cast<oox::_docx_drawing *>(frame->oox_drawing_.get());
|
||||
if (!drawing) return;
|
||||
|
||||
drawing->type = oox::typeObject;
|
||||
drawing->type = oox::typeOleObject;
|
||||
|
||||
bool isMediaInternal = true;
|
||||
drawing->objectId = Context.add_mediaitem(href, drawing->type, isMediaInternal, href);
|
||||
drawing->objectProgId = L""; //detect ???
|
||||
|
||||
drawing->objectProgId = detectObject(objectPath);
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -61,6 +61,8 @@
|
||||
#include "datatypes/length.h"
|
||||
#include "datatypes/borderstyle.h"
|
||||
|
||||
#include "../../../OfficeUtils/src/OfficeUtils.h"
|
||||
|
||||
namespace cpdoccore {
|
||||
|
||||
using namespace odf_types;
|
||||
@ -86,6 +88,8 @@ void draw_frame::pptx_convert_placeHolder(oox::pptx_conversion_context & Context
|
||||
}
|
||||
void draw_frame::pptx_convert(oox::pptx_conversion_context & Context)
|
||||
{
|
||||
Context.get_slide_context().start_frame();
|
||||
|
||||
common_draw_shape_with_styles_attlist common_draw_attlist_ = common_draw_attlists_.shape_with_text_and_styles_.common_draw_shape_with_styles_attlist_;
|
||||
|
||||
const int z_index = common_draw_attlist_.common_draw_z_index_attlist_.draw_z_index_.get_value_or(0);
|
||||
@ -206,13 +210,15 @@ void draw_frame::pptx_convert(oox::pptx_conversion_context & Context)
|
||||
}
|
||||
|
||||
Context.get_text_context().end_base_style();
|
||||
|
||||
Context.get_slide_context().end_frame();
|
||||
}
|
||||
|
||||
void draw_image::pptx_convert(oox::pptx_conversion_context & Context)
|
||||
{
|
||||
const std::wstring href = common_xlink_attlist_.href_.get_value_or(L"");
|
||||
|
||||
Context.get_slide_context().start_image(href);
|
||||
Context.get_slide_context().set_image(href);
|
||||
////////////////////////////////////в принципе достаточно общая часть ...
|
||||
Context.get_text_context().start_object();
|
||||
|
||||
@ -224,25 +230,23 @@ void draw_image::pptx_convert(oox::pptx_conversion_context & Context)
|
||||
|
||||
if (text_content_.length()>0)
|
||||
{
|
||||
Context.get_slide_context().set_property(_property(L"text-content",text_content_));
|
||||
Context.get_slide_context().set_property(_property(L"text-content", text_content_));
|
||||
}
|
||||
////////////////////////////////////////////////////////////////////////////3 раза уже повторилась Content -> Context
|
||||
Context.get_slide_context().end_image();
|
||||
}
|
||||
void draw_chart::pptx_convert(oox::pptx_conversion_context & Context)
|
||||
{
|
||||
const std::wstring href = common_xlink_attlist_.href_.get_value_or(L"");
|
||||
Context.get_slide_context().start_chart(href);
|
||||
Context.get_slide_context().set_chart(href);
|
||||
|
||||
for (int i = 0; i < content_.size(); i++)
|
||||
{
|
||||
content_[i]->pptx_convert(Context);
|
||||
}
|
||||
Context.get_slide_context().end_chart();
|
||||
}
|
||||
|
||||
void draw_text_box::pptx_convert(oox::pptx_conversion_context & Context)
|
||||
{
|
||||
Context.get_slide_context().start_shape(2);//rect с наваротами
|
||||
Context.get_slide_context().set_text_box(); //rect с наваротами
|
||||
Context.get_text_context().start_object();
|
||||
|
||||
for (int i = 0; i < content_.size(); i++)
|
||||
@ -256,75 +260,56 @@ void draw_text_box::pptx_convert(oox::pptx_conversion_context & Context)
|
||||
{
|
||||
Context.get_slide_context().set_property(_property(L"text-content",text_content_));
|
||||
}
|
||||
Context.get_slide_context().end_shape();
|
||||
}
|
||||
void draw_object::pptx_convert(oox::pptx_conversion_context & Context)
|
||||
{
|
||||
try {
|
||||
const std::wstring href = common_xlink_attlist_.href_.get_value_or(L"");
|
||||
|
||||
odf_reader::odf_document * odf_reader = Context.root();
|
||||
std::wstring folderPath = odf_reader->get_folder();
|
||||
|
||||
std::wstring href = common_xlink_attlist_.href_.get_value_or(L"");
|
||||
|
||||
std::wstring folderPath = Context.root()->get_folder();
|
||||
std::wstring objectPath = folderPath + FILE_SEPARATOR_STR + href;
|
||||
|
||||
//normalize path ??? todooo
|
||||
boost::algorithm::replace_all(objectPath, FILE_SEPARATOR_STR + std::wstring(L"./"), FILE_SEPARATOR_STR);
|
||||
|
||||
cpdoccore::odf_reader::odf_document objectSubDoc(objectPath, NULL);
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
//в отдельных embd объектах чаще всего диаграммы, уравнения... но МОГУТ быть и обычные объекты подтипа frame!!!
|
||||
//пример RemanejamentoOrcamentario.ods
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
//функциональная часть
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
office_element *contentSubDoc = objectSubDoc.get_impl()->get_content();
|
||||
if (!contentSubDoc)
|
||||
{
|
||||
//здесь другой формат xml (не Open Office)
|
||||
//временно - замещающая картинка(если она конечно присутствует)
|
||||
Context.get_slide_context().start_object_ole();
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
object_odf_context objectBuild(href);
|
||||
|
||||
process_build_object process_build_object_(objectBuild, objectSubDoc.odf_context());
|
||||
contentSubDoc->accept(process_build_object_);
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
//отображательная часть
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
if (objectBuild.object_type_ == 1)//диаграмма
|
||||
{
|
||||
const std::wstring href_draw = common_xlink_attlist_.href_.get_value_or(L"");
|
||||
objectBuild.pptx_convert(Context);
|
||||
|
||||
Context.get_slide_context().start_chart(href_draw); // в рисовательной части только место объекта, рамочки ... и релсы
|
||||
Context.get_slide_context().end_chart();
|
||||
Context.get_slide_context().set_chart(href_draw); // в рисовательной части только место объекта, рамочки ... и релсы
|
||||
}
|
||||
else if (objectBuild.object_type_ == 2)//odt текст
|
||||
else if (objectBuild.object_type_ == 2)//odt text
|
||||
{
|
||||
Context.get_slide_context().start_shape(2);
|
||||
Context.get_text_context().start_object();
|
||||
Context.get_slide_context().set_use_image_replacement();
|
||||
|
||||
//сменить контекст с главного на другой ... проблема со стилями!!
|
||||
Context.get_text_context().set_local_styles_container(&objectSubDoc.odf_context().styleContainer());
|
||||
|
||||
objectBuild.pptx_convert(Context);
|
||||
std::wstring href_new = office_convert( &objectSubDoc, 1);
|
||||
|
||||
std::wstring text_content_ = Context.get_text_context().end_object();
|
||||
Context.get_text_context().set_local_styles_container(NULL);//вытираем вручную ...
|
||||
|
||||
if (!text_content_.empty())
|
||||
if (!href_new.empty())
|
||||
{
|
||||
Context.get_slide_context().set_property(_property(L"text-content",text_content_));
|
||||
bool isMediaInternal = true;
|
||||
href += FILE_SEPARATOR_STR + href_new;
|
||||
Context.get_slide_context().set_ms_object(href, L"Word.Document");
|
||||
}
|
||||
Context.get_slide_context().end_shape();
|
||||
}
|
||||
else if (objectBuild.object_type_ == 3) //мат формулы
|
||||
else if (objectBuild.object_type_ == 3) //math
|
||||
{
|
||||
Context.get_slide_context().start_shape(2);
|
||||
Context.get_slide_context().set_text_box();
|
||||
|
||||
objectBuild.pptx_convert(Context);
|
||||
|
||||
@ -342,11 +327,23 @@ void draw_object::pptx_convert(oox::pptx_conversion_context & Context)
|
||||
Context.get_slide_context().set_property(_property(L"fit-to-size", true));
|
||||
Context.get_slide_context().set_property(_property(L"text-content", text_content));
|
||||
}
|
||||
Context.get_slide_context().end_shape();
|
||||
}
|
||||
else if (objectBuild.object_type_ == 4) //ods sheet
|
||||
{
|
||||
Context.get_slide_context().set_use_image_replacement();
|
||||
|
||||
std::wstring href_new = office_convert( &objectSubDoc, 2);
|
||||
|
||||
if (!href_new.empty())
|
||||
{
|
||||
bool isMediaInternal = true;
|
||||
href += FILE_SEPARATOR_STR + href_new;
|
||||
Context.get_slide_context().set_ms_object(href, L"Excel.Sheet");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
//временно - замещающая картинка(если она конечно присутствует)
|
||||
//замещающая картинка(если она конечно присутствует)
|
||||
Context.get_slide_context().set_use_image_replacement();
|
||||
}
|
||||
|
||||
@ -359,14 +356,14 @@ void draw_object::pptx_convert(oox::pptx_conversion_context & Context)
|
||||
|
||||
void draw_object_ole::pptx_convert(oox::pptx_conversion_context & Context)
|
||||
{
|
||||
//объект бин в embeddings
|
||||
//Context.get_slide_context().start_object_ole();
|
||||
//распознать тип по guid???
|
||||
|
||||
//временно - замещающая картинка(если она конечно присутствует)
|
||||
Context.get_slide_context().set_use_image_replacement();
|
||||
|
||||
std::wstring href = common_xlink_attlist_.href_.get_value_or(L"");
|
||||
std::wstring folderPath = Context.root()->get_folder();
|
||||
std::wstring objectPath = folderPath + FILE_SEPARATOR_STR + href;
|
||||
|
||||
//Context.get_slide_context().end_object_ole();
|
||||
if (!href.empty())
|
||||
Context.get_slide_context().set_ole_object(href, detectObject(objectPath));
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@ -128,6 +128,7 @@ void draw_frame::xlsx_convert(oox::xlsx_conversion_context & Context)
|
||||
|
||||
//////////////////////////////////////////////////////////////////////////
|
||||
Context.get_drawing_context().start_drawing( name);
|
||||
Context.get_drawing_context().start_frame();
|
||||
|
||||
const _CP_OPT(length) svg_widthVal = common_draw_attlists_.rel_size_.common_draw_size_attlist_.svg_width_;
|
||||
const _CP_OPT(length) svg_heightVal = common_draw_attlists_.rel_size_.common_draw_size_attlist_.svg_height_;
|
||||
@ -199,6 +200,7 @@ void draw_frame::xlsx_convert(oox::xlsx_conversion_context & Context)
|
||||
office_element_ptr const & elm = content_[i];
|
||||
elm->xlsx_convert(Context);
|
||||
}
|
||||
Context.get_drawing_context().end_frame();
|
||||
Context.get_drawing_context().end_drawing();
|
||||
|
||||
Context.get_drawing_context().clear();
|
||||
@ -207,7 +209,8 @@ void draw_frame::xlsx_convert(oox::xlsx_conversion_context & Context)
|
||||
void draw_image::xlsx_convert(oox::xlsx_conversion_context & Context)
|
||||
{
|
||||
const std::wstring href = common_xlink_attlist_.href_.get_value_or(L"");
|
||||
Context.get_drawing_context().start_image(href);
|
||||
Context.get_drawing_context().set_image(href);
|
||||
|
||||
////////////////////////////////////в принципе достаточно общая часть ...
|
||||
Context.get_text_context().start_drawing_content();//... если в объекте есть текст он привяжется к объекту - иначе к ячейке
|
||||
|
||||
@ -219,25 +222,24 @@ void draw_image::xlsx_convert(oox::xlsx_conversion_context & Context)
|
||||
|
||||
if (text_content_.length()>0)
|
||||
{
|
||||
Context.get_drawing_context().set_property(_property(L"text-content",text_content_));
|
||||
Context.get_drawing_context().set_property(_property(L"text-content", text_content_));
|
||||
}
|
||||
////////////////////////////////////////////////////////////////////////////3 раза уже повторилась Content -> Context
|
||||
Context.get_drawing_context().end_image();
|
||||
}
|
||||
|
||||
void draw_chart::xlsx_convert(oox::xlsx_conversion_context & Context)
|
||||
{
|
||||
const std::wstring href = common_xlink_attlist_.href_.get_value_or(L"");
|
||||
Context.get_drawing_context().start_chart(href);
|
||||
Context.get_drawing_context().set_chart(href);
|
||||
|
||||
for (int i = 0 ; i < content_.size(); i++)
|
||||
{
|
||||
content_[i]->xlsx_convert(Context);
|
||||
}
|
||||
Context.get_drawing_context().end_chart();
|
||||
}
|
||||
void draw_text_box::xlsx_convert(oox::xlsx_conversion_context & Context)
|
||||
{
|
||||
Context.get_drawing_context().start_shape(2);//rect с наваротами
|
||||
Context.get_drawing_context().set_text_box();
|
||||
|
||||
Context.get_text_context().start_drawing_content();
|
||||
|
||||
for (int i = 0 ; i < content_.size(); i++)
|
||||
@ -251,26 +253,20 @@ void draw_text_box::xlsx_convert(oox::xlsx_conversion_context & Context)
|
||||
{
|
||||
Context.get_drawing_context().set_property(_property(L"text-content",text_content_));
|
||||
}
|
||||
Context.get_drawing_context().end_shape();
|
||||
}
|
||||
void draw_object::xlsx_convert(oox::xlsx_conversion_context & Context)
|
||||
{
|
||||
try {
|
||||
const std::wstring href = common_xlink_attlist_.href_.get_value_or(L"");
|
||||
std::wstring href = common_xlink_attlist_.href_.get_value_or(L"");
|
||||
|
||||
odf_reader::odf_document * odf_reader = Context.root();
|
||||
|
||||
std::wstring folderPath = odf_reader->get_folder();
|
||||
std::wstring folderPath = Context.root()->get_folder();
|
||||
std::wstring objectPath = folderPath + FILE_SEPARATOR_STR + href;
|
||||
|
||||
// normalize path ???? todooo
|
||||
boost::algorithm::replace_all(objectPath, FILE_SEPARATOR_STR + std::wstring(L"./"), FILE_SEPARATOR_STR);
|
||||
|
||||
cpdoccore::odf_reader::odf_document objectSubDoc(objectPath,NULL);
|
||||
////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
//в отдельных embd объектах чаще всего диаграммы... но МОГУТ быть и обычные объекты подтипа frame!!! пример RemanejamentoOrcamentario.ods
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
//функциональная часть
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
office_element *contentSubDoc = objectSubDoc.get_impl()->get_content();
|
||||
object_odf_context objectBuild(href);
|
||||
|
||||
@ -279,39 +275,30 @@ void draw_object::xlsx_convert(oox::xlsx_conversion_context & Context)
|
||||
process_build_object process_build_object_(objectBuild, objectSubDoc.odf_context());
|
||||
contentSubDoc->accept(process_build_object_);
|
||||
}
|
||||
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
|
||||
//отображательная часть
|
||||
|
||||
//---------------------------------------------------------------------------------------------------------------------
|
||||
if (objectBuild.object_type_ == 1) //диаграмма
|
||||
{
|
||||
const std::wstring href_draw = common_xlink_attlist_.href_.get_value_or(L"");
|
||||
objectBuild.xlsx_convert(Context);
|
||||
|
||||
Context.get_drawing_context().start_chart(href_draw); // в рисовательной части только место объекта, рамочки ... и релсы
|
||||
Context.get_drawing_context().end_chart();
|
||||
Context.get_drawing_context().set_chart(href_draw); // в рисовательной части только место объекта, рамочки ... и релсы
|
||||
}
|
||||
else if (objectBuild.object_type_ == 2) //текст (odt text)
|
||||
{
|
||||
Context.get_drawing_context().start_shape(2);
|
||||
Context.get_text_context().start_drawing_content();
|
||||
Context.get_drawing_context().set_use_image_replacement();
|
||||
|
||||
//сменить контекст с главного на другой ... проблема со стилями!!
|
||||
Context.get_text_context().set_local_styles_container(&objectSubDoc.odf_context().styleContainer());
|
||||
|
||||
objectBuild.xlsx_convert(Context);
|
||||
std::wstring href_new = office_convert( &objectSubDoc, 1);
|
||||
|
||||
std::wstring text_content = Context.get_text_context().end_drawing_content();
|
||||
Context.get_text_context().set_local_styles_container(NULL);//вытираем вручную ...
|
||||
|
||||
if (!text_content.empty())
|
||||
if (!href_new.empty())
|
||||
{
|
||||
Context.get_drawing_context().set_property(_property(L"text-content", text_content));
|
||||
bool isMediaInternal = true;
|
||||
href += FILE_SEPARATOR_STR + href_new;
|
||||
Context.get_drawing_context().set_ms_object(href, L"Word.Document");
|
||||
}
|
||||
Context.get_drawing_context().end_shape();
|
||||
}
|
||||
else if (objectBuild.object_type_ == 3) //мат формулы
|
||||
{
|
||||
Context.get_drawing_context().start_shape(2);
|
||||
Context.get_drawing_context().set_text_box();
|
||||
|
||||
objectBuild.xlsx_convert(Context);
|
||||
|
||||
@ -329,11 +316,15 @@ void draw_object::xlsx_convert(oox::xlsx_conversion_context & Context)
|
||||
Context.get_drawing_context().set_property(_property(L"fit-to-size", true));
|
||||
Context.get_drawing_context().set_property(_property(L"text-content", text_content));
|
||||
}
|
||||
Context.get_drawing_context().end_shape();
|
||||
}
|
||||
else if (objectBuild.object_type_ == 4) // embedded sheet
|
||||
{
|
||||
Context.get_drawing_context().set_use_image_replacement();
|
||||
//???
|
||||
}
|
||||
else
|
||||
{
|
||||
//временно - замещающая картинка(если она конечно присутствует)
|
||||
//замещающая картинка(если она конечно присутствует)
|
||||
Context.get_drawing_context().set_use_image_replacement();
|
||||
}
|
||||
|
||||
@ -343,15 +334,20 @@ void draw_object::xlsx_convert(oox::xlsx_conversion_context & Context)
|
||||
_CP_LOG << "[error] : convert draw::object error" << std::endl;
|
||||
}
|
||||
}
|
||||
void draw_object_ole::xlsx_convert(oox::xlsx_conversion_context & Context)
|
||||
{
|
||||
//временно - замещающая картинка(если она конечно присутствует)
|
||||
//Context.get_drawing_context().start_object_ole();
|
||||
|
||||
void draw_object_ole::xlsx_convert(oox::xlsx_conversion_context & Context)
|
||||
{
|
||||
Context.get_drawing_context().set_use_image_replacement();
|
||||
|
||||
//Context.get_drawing_context().end_object_ole();
|
||||
std::wstring href = common_xlink_attlist_.href_.get_value_or(L"");
|
||||
std::wstring folderPath = Context.root()->get_folder();
|
||||
std::wstring objectPath = folderPath + FILE_SEPARATOR_STR + href;
|
||||
|
||||
if (!href.empty())
|
||||
Context.get_drawing_context().set_ole_object(href, detectObject(objectPath));
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user