Skip to content

O
onlyoffice_core
Commit 78b051c9 authored by ElenaSubbotina's avatar ElenaSubbotina
Browse files
Options

...

parent 6e409d2f
Expand all Show whitespace changes
Inline Side-by-side
Showing with 4094 additions and 11945 deletions
ASCOfficeDocFile/Common/XmlTools.h
View file @ 78b051c9
...@@ -406,34 +406,12 @@ namespace XMLTools ...@@ -406,34 +406,12 @@ namespace XMLTools
void WriteInteger(int Value, int Base = 10) void WriteInteger(int Value, int Base = 10)
{ {
#if defined(_WIN32) || defined (_WIN64)
wchar_t buff[33] ={};
_itow(Value, buff, Base);
m_str += std::wstring(buff);
#else
m_str += std::to_wstring(Value); m_str += std::to_wstring(Value);
#endif
} }
void WriteDouble(double Value) void WriteDouble(double Value)
{ {
#if defined(_WIN32) || defined (_WIN64)
int *dec = NULL, *sign = NULL;
char *str = _fcvt( Value , 4, dec, sign);
if (str)
{
std::string sA(str);
delete []str;
m_str += std::wstring(sA.begin(), sA.end());
}
else
{
m_str += L"0";
}
#else
m_str += std::to_wstring(Value); m_str += std::to_wstring(Value);
#endif
} }
void WriteBoolean(bool Value) void WriteBoolean(bool Value)
{ {
......
ASCOfficeDocFile/DocDocxConverter/CommentsMapping.h
View file @ 78b051c9
...@@ -54,16 +54,16 @@ namespace DocFileFormat ...@@ -54,16 +54,16 @@ namespace DocFileFormat
int index = 0; int index = 0;
m_pXmlWriter->WriteNodeBegin( _T( "?xml version=\"1.0\" encoding=\"UTF-8\"?" ) ); m_pXmlWriter->WriteNodeBegin( L"?xml version=\"1.0\" encoding=\"UTF-8\"?");
m_pXmlWriter->WriteNodeBegin( _T( "w:comments" ), TRUE ); m_pXmlWriter->WriteNodeBegin( L"w:comments", TRUE );
//write namespaces //write namespaces
m_pXmlWriter->WriteAttribute( _T( "xmlns:w" ), OpenXmlNamespaces::WordprocessingML ); m_pXmlWriter->WriteAttribute( L"xmlns:w", OpenXmlNamespaces::WordprocessingML );
m_pXmlWriter->WriteAttribute( _T( "xmlns:v" ), OpenXmlNamespaces::VectorML ); m_pXmlWriter->WriteAttribute( L"xmlns:v", OpenXmlNamespaces::VectorML );
m_pXmlWriter->WriteAttribute( _T( "xmlns:o" ), OpenXmlNamespaces::Office ); m_pXmlWriter->WriteAttribute( L"xmlns:o", OpenXmlNamespaces::Office );
m_pXmlWriter->WriteAttribute( _T( "xmlns:w10" ), OpenXmlNamespaces::OfficeWord ); m_pXmlWriter->WriteAttribute( L"xmlns:w10", OpenXmlNamespaces::OfficeWord );
m_pXmlWriter->WriteAttribute( _T( "xmlns:r" ), OpenXmlNamespaces::Relationships ); m_pXmlWriter->WriteAttribute( L"xmlns:r", OpenXmlNamespaces::Relationships );
m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE ); m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
int cp = m_document->FIB->m_RgLw97.ccpText + m_document->FIB->m_RgLw97.ccpFtn + m_document->FIB->m_RgLw97.ccpHdr; int cp = m_document->FIB->m_RgLw97.ccpText + m_document->FIB->m_RgLw97.ccpFtn + m_document->FIB->m_RgLw97.ccpHdr;
...@@ -72,11 +72,11 @@ namespace DocFileFormat ...@@ -72,11 +72,11 @@ namespace DocFileFormat
{ {
AnnotationReferenceDescriptor* atrdPre10 = static_cast<AnnotationReferenceDescriptor*>(m_document->AnnotationsReferencePlex->Elements[index]); AnnotationReferenceDescriptor* atrdPre10 = static_cast<AnnotationReferenceDescriptor*>(m_document->AnnotationsReferencePlex->Elements[index]);
m_pXmlWriter->WriteNodeBegin( _T( "w:comment" ), TRUE ); m_pXmlWriter->WriteNodeBegin( L"w:comment", TRUE );
m_pXmlWriter->WriteAttribute( _T( "w:id" ), FormatUtils::IntToWideString( index )); m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::IntToWideString( index ));
m_pXmlWriter->WriteAttribute( _T( "w:author" ), m_pXmlWriter->WriteAttribute( L"w:author",
FormatUtils::XmlEncode(m_document->AnnotationOwners->at( atrdPre10->GetAuthorIndex() ) )); FormatUtils::XmlEncode(m_document->AnnotationOwners->at( atrdPre10->GetAuthorIndex() ) ));
m_pXmlWriter->WriteAttribute( _T( "w:initials" ), atrdPre10->GetUserInitials()); m_pXmlWriter->WriteAttribute( L"w:initials", atrdPre10->GetUserInitials());
//!!!TODO!!! //!!!TODO!!!
/*//ATRDpost10 is optional and not saved in all files /*//ATRDpost10 is optional and not saved in all files
...@@ -87,7 +87,7 @@ namespace DocFileFormat ...@@ -87,7 +87,7 @@ namespace DocFileFormat
atrdPost10.Date.Convert(new DateMapping(_writer)); atrdPost10.Date.Convert(new DateMapping(_writer));
}*/ }*/
m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE ); m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
while ( ( cp - m_document->FIB->m_RgLw97.ccpText - m_document->FIB->m_RgLw97.ccpFtn - m_document->FIB->m_RgLw97.ccpHdr ) < (*m_document->IndividualCommentsPlex)[index + 1] ) while ( ( cp - m_document->FIB->m_RgLw97.ccpText - m_document->FIB->m_RgLw97.ccpFtn - m_document->FIB->m_RgLw97.ccpHdr ) < (*m_document->IndividualCommentsPlex)[index + 1] )
{ {
...@@ -111,12 +111,12 @@ namespace DocFileFormat ...@@ -111,12 +111,12 @@ namespace DocFileFormat
} }
} }
m_pXmlWriter->WriteNodeEnd(_T( "w:comment" )); m_pXmlWriter->WriteNodeEnd(L"w:comment" );
++index; ++index;
} }
m_pXmlWriter->WriteNodeEnd( _T( "w:comments" ) ); m_pXmlWriter->WriteNodeEnd( L"w:comments" );
m_context->_docx->CommentsXML = std::wstring(m_pXmlWriter->GetXmlString()); m_context->_docx->CommentsXML = std::wstring(m_pXmlWriter->GetXmlString());
} }
} }
......
ASCOfficeDocFile/DocDocxConverter/EndnotesMapping.h
View file @ 78b051c9
...@@ -54,24 +54,24 @@ namespace DocFileFormat ...@@ -54,24 +54,24 @@ namespace DocFileFormat
int id = 0; int id = 0;
m_pXmlWriter->WriteNodeBegin( _T( "?xml version=\"1.0\" encoding=\"UTF-8\"?" ) ); m_pXmlWriter->WriteNodeBegin( L"?xml version=\"1.0\" encoding=\"UTF-8\"?");
m_pXmlWriter->WriteNodeBegin( _T( "w:endnotes" ), TRUE ); m_pXmlWriter->WriteNodeBegin( L"w:endnotes", TRUE );
//write namespaces //write namespaces
m_pXmlWriter->WriteAttribute( _T( "xmlns:w" ), OpenXmlNamespaces::WordprocessingML ); m_pXmlWriter->WriteAttribute( L"xmlns:w", OpenXmlNamespaces::WordprocessingML );
m_pXmlWriter->WriteAttribute( _T( "xmlns:v" ), OpenXmlNamespaces::VectorML ); m_pXmlWriter->WriteAttribute( L"xmlns:v", OpenXmlNamespaces::VectorML );
m_pXmlWriter->WriteAttribute( _T( "xmlns:o" ), OpenXmlNamespaces::Office ); m_pXmlWriter->WriteAttribute( L"xmlns:o", OpenXmlNamespaces::Office );
m_pXmlWriter->WriteAttribute( _T( "xmlns:w10" ), OpenXmlNamespaces::OfficeWord ); m_pXmlWriter->WriteAttribute( L"xmlns:w10", OpenXmlNamespaces::OfficeWord );
m_pXmlWriter->WriteAttribute( _T( "xmlns:r" ), OpenXmlNamespaces::Relationships ); m_pXmlWriter->WriteAttribute( L"xmlns:r", OpenXmlNamespaces::Relationships );
m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE ); m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
int cp = ( m_document->FIB->m_RgLw97.ccpText + m_document->FIB->m_RgLw97.ccpFtn + m_document->FIB->m_RgLw97.ccpHdr + m_document->FIB->m_RgLw97.ccpAtn ); int cp = ( m_document->FIB->m_RgLw97.ccpText + m_document->FIB->m_RgLw97.ccpFtn + m_document->FIB->m_RgLw97.ccpHdr + m_document->FIB->m_RgLw97.ccpAtn );
while ( cp <= ( m_document->FIB->m_RgLw97.ccpText + m_document->FIB->m_RgLw97.ccpFtn + m_document->FIB->m_RgLw97.ccpHdr + m_document->FIB->m_RgLw97.ccpAtn + m_document->FIB->m_RgLw97.ccpEdn - 2 ) ) while ( cp <= ( m_document->FIB->m_RgLw97.ccpText + m_document->FIB->m_RgLw97.ccpFtn + m_document->FIB->m_RgLw97.ccpHdr + m_document->FIB->m_RgLw97.ccpAtn + m_document->FIB->m_RgLw97.ccpEdn - 2 ) )
{ {
m_pXmlWriter->WriteNodeBegin( _T( "w:endnote" ), TRUE ); m_pXmlWriter->WriteNodeBegin( L"w:endnote", TRUE );
m_pXmlWriter->WriteAttribute( _T( "w:id" ), FormatUtils::IntToWideString( id )); m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::IntToWideString( id ));
m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE ); m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
while ( ( cp - m_document->FIB->m_RgLw97.ccpText - m_document->FIB->m_RgLw97.ccpFtn - m_document->FIB->m_RgLw97.ccpHdr - m_document->FIB->m_RgLw97.ccpAtn ) < (*m_document->IndividualEndnotesPlex)[id + 1] ) while ( ( cp - m_document->FIB->m_RgLw97.ccpText - m_document->FIB->m_RgLw97.ccpFtn - m_document->FIB->m_RgLw97.ccpHdr - m_document->FIB->m_RgLw97.ccpAtn ) < (*m_document->IndividualEndnotesPlex)[id + 1] )
{ {
...@@ -95,11 +95,11 @@ namespace DocFileFormat ...@@ -95,11 +95,11 @@ namespace DocFileFormat
} }
} }
m_pXmlWriter->WriteNodeEnd( _T( "w:endnote" ) ); m_pXmlWriter->WriteNodeEnd( L"w:endnote");
id++; id++;
} }
m_pXmlWriter->WriteNodeEnd( _T( "w:endnotes" ) ); m_pXmlWriter->WriteNodeEnd( L"w:endnotes");
m_context->_docx->EndnotesXML = std::wstring( m_pXmlWriter->GetXmlString() ); m_context->_docx->EndnotesXML = std::wstring( m_pXmlWriter->GetXmlString() );
} }
......
ASCOfficeDocFile/DocDocxConverter/FontTableMapping.cpp
View file @ 78b051c9
...@@ -54,10 +54,10 @@ namespace DocFileFormat ...@@ -54,10 +54,10 @@ namespace DocFileFormat
this->_ctx->_docx->RegisterFontTable(); this->_ctx->_docx->RegisterFontTable();
m_pXmlWriter->WriteNodeBegin( _T( "?xml version=\"1.0\" encoding=\"UTF-8\"?" ) ); m_pXmlWriter->WriteNodeBegin( L"?xml version=\"1.0\" encoding=\"UTF-8\"?" );
m_pXmlWriter->WriteNodeBegin( _T( "w:fonts" ), TRUE ); m_pXmlWriter->WriteNodeBegin( L"w:fonts", TRUE );
m_pXmlWriter->WriteAttribute( _T( "xmlns:w" ), OpenXmlNamespaces::WordprocessingML ); m_pXmlWriter->WriteAttribute( L"xmlns:w", OpenXmlNamespaces::WordprocessingML );
m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE ); m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
int sz_fonts = table->Data.size(); int sz_fonts = table->Data.size();
int users_fonts = 0; int users_fonts = 0;
...@@ -66,79 +66,79 @@ namespace DocFileFormat ...@@ -66,79 +66,79 @@ namespace DocFileFormat
{ {
FontFamilyName* font = dynamic_cast<FontFamilyName*>( *iter ); FontFamilyName* font = dynamic_cast<FontFamilyName*>( *iter );
m_pXmlWriter->WriteNodeBegin( _T( "w:font" ), TRUE ); m_pXmlWriter->WriteNodeBegin( L"w:font", TRUE );
std::wstring name_ = FormatUtils::XmlEncode(font->xszFtn, true); std::wstring name_ = FormatUtils::XmlEncode(font->xszFtn, true);
if (name_.empty()) if (name_.empty())
name_ = L"UserFont_" + std::to_wstring(++users_fonts); name_ = L"UserFont_" + std::to_wstring(++users_fonts);
m_pXmlWriter->WriteAttribute( _T( "w:name" ), name_); m_pXmlWriter->WriteAttribute( L"w:name", name_);
m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE ); m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
//alternative name //alternative name
if ( ( font->xszAlt != std::wstring( _T( "" ) ) ) && ( font->xszAlt.length() > 0 ) ) if ( ( font->xszAlt != std::wstring( L"" ) ) && ( font->xszAlt.length() > 0 ) )
{ {
m_pXmlWriter->WriteNodeBegin( _T( "w:altName" ), TRUE ); m_pXmlWriter->WriteNodeBegin( L"w:altName", TRUE );
m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::XmlEncode(font->xszAlt, true)); m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::XmlEncode(font->xszAlt, true));
m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE ); m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
m_pXmlWriter->WriteNodeEnd( _T( "w:altName" ) ); m_pXmlWriter->WriteNodeEnd( L"w:altName" );
} }
//charset //charset
m_pXmlWriter->WriteNodeBegin( _T("w:charset" ), TRUE ); m_pXmlWriter->WriteNodeBegin( L"w:charset", TRUE );
m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::IntToFormattedWideString( font->chs, _T( "%02x" ) )); m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::IntToFormattedWideString( font->chs, L"%02x" ));
m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE ); m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
m_pXmlWriter->WriteNodeEnd( _T( "w:charset" ) ); m_pXmlWriter->WriteNodeEnd( L"w:charset" );
//font family //font family
m_pXmlWriter->WriteNodeBegin( _T("w:family"), TRUE ); m_pXmlWriter->WriteNodeBegin( L"w:family", TRUE );
m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::MapValueToWideString( font->ff, &FontFamily[0][0], 6, 11 )); m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::MapValueToWideString( font->ff, &FontFamily[0][0], 6, 11 ));
m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE ); m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
m_pXmlWriter->WriteNodeEnd( _T( "w:family" ) ); m_pXmlWriter->WriteNodeEnd( L"w:family" );
//panose //panose
m_pXmlWriter->WriteNodeBegin( _T("w:panose1"), TRUE ); m_pXmlWriter->WriteNodeBegin( L"w:panose1", TRUE );
std::wstring wstr( _T( "" ) ); std::wstring wstr( L"" );
for ( unsigned int i = 0; i < font->panoseSize; i++ ) for ( unsigned int i = 0; i < font->panoseSize; i++ )
{ {
wstr += FormatUtils::IntToFormattedWideString( font->panose[i], _T( "%02x" ) ); wstr += FormatUtils::IntToFormattedWideString( font->panose[i], L"%02x" );
} }
m_pXmlWriter->WriteAttribute( _T( "w:val" ), wstr); m_pXmlWriter->WriteAttribute( L"w:val", wstr);
m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE ); m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
m_pXmlWriter->WriteNodeEnd( _T( "w:panose1" ) ); m_pXmlWriter->WriteNodeEnd( L"w:panose1" );
//pitch //pitch
m_pXmlWriter->WriteNodeBegin( _T("w:pitch"), TRUE ); m_pXmlWriter->WriteNodeBegin( L"w:pitch", TRUE );
m_pXmlWriter->WriteAttribute( _T( "w:val" ), FormatUtils::MapValueToWideString( font->prq, &FontPitch[0][0], 3, 9 )); m_pXmlWriter->WriteAttribute( L"w:val", FormatUtils::MapValueToWideString( font->prq, &FontPitch[0][0], 3, 9 ));
m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE ); m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
m_pXmlWriter->WriteNodeEnd( _T( "w:pitch" ) ); m_pXmlWriter->WriteNodeEnd( L"w:pitch" );
//truetype //truetype
if ( !font->fTrueType ) if ( !font->fTrueType )
{ {
m_pXmlWriter->WriteNodeBegin( _T("w:notTrueType"), TRUE ); m_pXmlWriter->WriteNodeBegin( L"w:notTrueType", TRUE );
m_pXmlWriter->WriteAttribute( _T( "w:val" ), _T( "true" ) ); m_pXmlWriter->WriteAttribute( L"w:val", L"true" );
m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE ); m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
m_pXmlWriter->WriteNodeEnd( _T( "w:notTrueType" ) ); m_pXmlWriter->WriteNodeEnd( L"w:notTrueType" );
} }
//font signature //font signature
m_pXmlWriter->WriteNodeBegin( _T("w:sig"), TRUE ); m_pXmlWriter->WriteNodeBegin( L"w:sig", TRUE );
m_pXmlWriter->WriteAttribute( _T( "w:usb0" ), FormatUtils::IntToFormattedWideString( font->fs.UnicodeSubsetBitfield0, _T( "%08x" ) )); m_pXmlWriter->WriteAttribute( L"w:usb0", FormatUtils::IntToFormattedWideString( font->fs.UnicodeSubsetBitfield0, L"%08x" ));
m_pXmlWriter->WriteAttribute( _T( "w:usb1" ), FormatUtils::IntToFormattedWideString( font->fs.UnicodeSubsetBitfield1, _T( "%08x" ) )); m_pXmlWriter->WriteAttribute( L"w:usb1", FormatUtils::IntToFormattedWideString( font->fs.UnicodeSubsetBitfield1, L"%08x" ));
m_pXmlWriter->WriteAttribute( _T( "w:usb2" ), FormatUtils::IntToFormattedWideString( font->fs.UnicodeSubsetBitfield2, _T( "%08x" ) )); m_pXmlWriter->WriteAttribute( L"w:usb2", FormatUtils::IntToFormattedWideString( font->fs.UnicodeSubsetBitfield2, L"%08x" ));
m_pXmlWriter->WriteAttribute( _T( "w:usb3" ), FormatUtils::IntToFormattedWideString( font->fs.UnicodeSubsetBitfield3, _T( "%08x" ) )); m_pXmlWriter->WriteAttribute( L"w:usb3", FormatUtils::IntToFormattedWideString( font->fs.UnicodeSubsetBitfield3, L"%08x" ));
m_pXmlWriter->WriteAttribute( _T( "w:csb0" ), FormatUtils::IntToFormattedWideString( font->fs.CodePageBitfield0, _T( "%08x" ) )); m_pXmlWriter->WriteAttribute( L"w:csb0", FormatUtils::IntToFormattedWideString( font->fs.CodePageBitfield0, L"%08x" ));
m_pXmlWriter->WriteAttribute( _T( "w:csb1" ), FormatUtils::IntToFormattedWideString( font->fs.CodePageBitfield1, _T( "%08x" ) )); m_pXmlWriter->WriteAttribute( L"w:csb1", FormatUtils::IntToFormattedWideString( font->fs.CodePageBitfield1, L"%08x" ));
m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE ); m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
m_pXmlWriter->WriteNodeEnd( _T( "w:sig" ) ); m_pXmlWriter->WriteNodeEnd( L"w:sig" );
m_pXmlWriter->WriteNodeEnd( _T( "w:font" ) ); m_pXmlWriter->WriteNodeEnd( L"w:font" );
} }
m_pXmlWriter->WriteNodeEnd( _T("w:fonts") ); m_pXmlWriter->WriteNodeEnd( L"w:fonts");
this->_ctx->_docx->FontTableXML = std::wstring( m_pXmlWriter->GetXmlString() ); this->_ctx->_docx->FontTableXML = std::wstring( m_pXmlWriter->GetXmlString() );
} }
......
ASCOfficeDocFile/DocDocxConverter/FontTableMapping.h
View file @ 78b051c9
...@@ -42,19 +42,19 @@ namespace DocFileFormat ...@@ -42,19 +42,19 @@ namespace DocFileFormat
{ {
static const wchar_t FontFamily[6][11] = static const wchar_t FontFamily[6][11] =
{ {
_T( "auto" ), L"auto",
_T( "roman" ), L"roman",
_T( "swiss" ), L"swiss",
_T( "modern" ), L"modern",
_T( "script" ), L"script",
_T( "decorative" ) L"decorative"
}; };
static const wchar_t FontPitch[3][9] = static const wchar_t FontPitch[3][9] =
{ {
_T( "default" ), L"default",
_T( "fixed" ), L"fixed",
_T( "variable" ) L"variable"
}; };
class FontTableMapping: public AbstractOpenXmlMapping, public IMapping class FontTableMapping: public AbstractOpenXmlMapping, public IMapping
......
ASCOfficeDocFile/DocDocxConverter/FooterMapping.cpp
View file @ 78b051c9
...@@ -45,16 +45,16 @@ namespace DocFileFormat ...@@ -45,16 +45,16 @@ namespace DocFileFormat
m_document = static_cast<WordDocument*>( visited ); m_document = static_cast<WordDocument*>( visited );
//start the document //start the document
m_pXmlWriter->WriteNodeBegin( _T( "?xml version=\"1.0\" encoding=\"UTF-8\"?" ) ); m_pXmlWriter->WriteNodeBegin( L"?xml version=\"1.0\" encoding=\"UTF-8\"?" );
m_pXmlWriter->WriteNodeBegin( _T( "w:ftr" ), TRUE ); m_pXmlWriter->WriteNodeBegin( L"w:ftr", TRUE );
//write namespaces //write namespaces
m_pXmlWriter->WriteAttribute( _T( "xmlns:w" ), OpenXmlNamespaces::WordprocessingML ); m_pXmlWriter->WriteAttribute( L"xmlns:w", OpenXmlNamespaces::WordprocessingML );
m_pXmlWriter->WriteAttribute( _T( "xmlns:v" ), OpenXmlNamespaces::VectorML ); m_pXmlWriter->WriteAttribute( L"xmlns:v", OpenXmlNamespaces::VectorML );
m_pXmlWriter->WriteAttribute( _T( "xmlns:o" ), OpenXmlNamespaces::Office ); m_pXmlWriter->WriteAttribute( L"xmlns:o", OpenXmlNamespaces::Office );
m_pXmlWriter->WriteAttribute( _T( "xmlns:w10" ), OpenXmlNamespaces::OfficeWord ); m_pXmlWriter->WriteAttribute( L"xmlns:w10", OpenXmlNamespaces::OfficeWord );
m_pXmlWriter->WriteAttribute( _T( "xmlns:r" ), OpenXmlNamespaces::Relationships ); m_pXmlWriter->WriteAttribute( L"xmlns:r", OpenXmlNamespaces::Relationships );
m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE ); m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
//convert the footer text //convert the footer text
_lastValidPapx = (*(m_document->AllPapxFkps->begin()))->grppapx[0]; _lastValidPapx = (*(m_document->AllPapxFkps->begin()))->grppapx[0];
...@@ -93,7 +93,7 @@ namespace DocFileFormat ...@@ -93,7 +93,7 @@ namespace DocFileFormat
} }
} }
m_pXmlWriter->WriteNodeEnd( _T( "w:ftr" ) ); m_pXmlWriter->WriteNodeEnd( L"w:ftr" );
m_context->_docx->FooterXMLList.push_back( std::wstring( m_pXmlWriter->GetXmlString() ) ); m_context->_docx->FooterXMLList.push_back( std::wstring( m_pXmlWriter->GetXmlString() ) );
} }
......
ASCOfficeDocFile/DocDocxConverter/FootnotesMapping.h
View file @ 78b051c9
...@@ -54,24 +54,24 @@ namespace DocFileFormat ...@@ -54,24 +54,24 @@ namespace DocFileFormat
int id = 0; int id = 0;
m_pXmlWriter->WriteNodeBegin( _T( "?xml version=\"1.0\" encoding=\"UTF-8\"?" ) ); m_pXmlWriter->WriteNodeBegin( L"?xml version=\"1.0\" encoding=\"UTF-8\"?" );
m_pXmlWriter->WriteNodeBegin( _T( "w:footnotes" ), TRUE ); m_pXmlWriter->WriteNodeBegin( L"w:footnotes", TRUE );
//write namespaces //write namespaces
m_pXmlWriter->WriteAttribute( _T( "xmlns:w" ), OpenXmlNamespaces::WordprocessingML ); m_pXmlWriter->WriteAttribute( L"xmlns:w", OpenXmlNamespaces::WordprocessingML );
m_pXmlWriter->WriteAttribute( _T( "xmlns:v" ), OpenXmlNamespaces::VectorML ); m_pXmlWriter->WriteAttribute( L"xmlns:v", OpenXmlNamespaces::VectorML );
m_pXmlWriter->WriteAttribute( _T( "xmlns:o" ), OpenXmlNamespaces::Office ); m_pXmlWriter->WriteAttribute( L"xmlns:o", OpenXmlNamespaces::Office );
m_pXmlWriter->WriteAttribute( _T( "xmlns:w10" ), OpenXmlNamespaces::OfficeWord ); m_pXmlWriter->WriteAttribute( L"xmlns:w10", OpenXmlNamespaces::OfficeWord );
m_pXmlWriter->WriteAttribute( _T( "xmlns:r" ), OpenXmlNamespaces::Relationships ); m_pXmlWriter->WriteAttribute( L"xmlns:r", OpenXmlNamespaces::Relationships );
m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE ); m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
int cp = m_document->FIB->m_RgLw97.ccpText; int cp = m_document->FIB->m_RgLw97.ccpText;
while ( cp <= ( m_document->FIB->m_RgLw97.ccpText + m_document->FIB->m_RgLw97.ccpFtn - 2 ) ) while ( cp <= ( m_document->FIB->m_RgLw97.ccpText + m_document->FIB->m_RgLw97.ccpFtn - 2 ) )
{ {
m_pXmlWriter->WriteNodeBegin( _T( "w:footnote" ), TRUE ); m_pXmlWriter->WriteNodeBegin( L"w:footnote", TRUE );
m_pXmlWriter->WriteAttribute( _T( "w:id" ), FormatUtils::IntToWideString( id )); m_pXmlWriter->WriteAttribute( L"w:id", FormatUtils::IntToWideString( id ));
m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE ); m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
while ( ( cp - m_document->FIB->m_RgLw97.ccpText ) < (*m_document->IndividualFootnotesPlex)[id + 1] ) while ( ( cp - m_document->FIB->m_RgLw97.ccpText ) < (*m_document->IndividualFootnotesPlex)[id + 1] )
{ {
...@@ -95,11 +95,11 @@ namespace DocFileFormat ...@@ -95,11 +95,11 @@ namespace DocFileFormat
} }
} }
m_pXmlWriter->WriteNodeEnd( _T( "w:footnote" ) ); m_pXmlWriter->WriteNodeEnd( L"w:footnote");
id++; id++;
} }
m_pXmlWriter->WriteNodeEnd( _T( "w:footnotes" ) ); m_pXmlWriter->WriteNodeEnd( L"w:footnotes");
m_context->_docx->FootnotesXML = std::wstring(m_pXmlWriter->GetXmlString()); m_context->_docx->FootnotesXML = std::wstring(m_pXmlWriter->GetXmlString());
} }
......
ASCOfficeDocFile/DocDocxConverter/HeaderMapping.cpp
View file @ 78b051c9
...@@ -45,16 +45,16 @@ namespace DocFileFormat ...@@ -45,16 +45,16 @@ namespace DocFileFormat
m_document = static_cast<WordDocument*>( visited ); m_document = static_cast<WordDocument*>( visited );
//start the document //start the document
m_pXmlWriter->WriteNodeBegin( _T( "?xml version=\"1.0\" encoding=\"UTF-8\"?" ) ); m_pXmlWriter->WriteNodeBegin( L"?xml version=\"1.0\" encoding=\"UTF-8\"?");
m_pXmlWriter->WriteNodeBegin( _T( "w:hdr" ), TRUE ); m_pXmlWriter->WriteNodeBegin( L"w:hdr", TRUE );
//write namespaces //write namespaces
m_pXmlWriter->WriteAttribute( _T( "xmlns:w" ), OpenXmlNamespaces::WordprocessingML ); m_pXmlWriter->WriteAttribute( L"xmlns:w", OpenXmlNamespaces::WordprocessingML );
m_pXmlWriter->WriteAttribute( _T( "xmlns:v" ), OpenXmlNamespaces::VectorML ); m_pXmlWriter->WriteAttribute( L"xmlns:v", OpenXmlNamespaces::VectorML );
m_pXmlWriter->WriteAttribute( _T( "xmlns:o" ), OpenXmlNamespaces::Office ); m_pXmlWriter->WriteAttribute( L"xmlns:o", OpenXmlNamespaces::Office );
m_pXmlWriter->WriteAttribute( _T( "xmlns:w10" ), OpenXmlNamespaces::OfficeWord ); m_pXmlWriter->WriteAttribute( L"xmlns:w10", OpenXmlNamespaces::OfficeWord );
m_pXmlWriter->WriteAttribute( _T( "xmlns:r" ), OpenXmlNamespaces::Relationships ); m_pXmlWriter->WriteAttribute( L"xmlns:r", OpenXmlNamespaces::Relationships );
m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE ); m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
//convert the header text //convert the header text
_lastValidPapx = (*(m_document->AllPapxFkps->begin()))->grppapx[0]; _lastValidPapx = (*(m_document->AllPapxFkps->begin()))->grppapx[0];
...@@ -88,7 +88,7 @@ namespace DocFileFormat ...@@ -88,7 +88,7 @@ namespace DocFileFormat
} }
} }
m_pXmlWriter->WriteNodeEnd( _T( "w:hdr" ) ); m_pXmlWriter->WriteNodeEnd( L"w:hdr");
m_context->_docx->HeaderXMLList.push_back( std::wstring( m_pXmlWriter->GetXmlString() ) ); m_context->_docx->HeaderXMLList.push_back( std::wstring( m_pXmlWriter->GetXmlString() ) );
} }
......
ASCOfficeDocFile/DocDocxConverter/NumberingMapping.h
View file @ 78b051c9
...@@ -52,9 +52,9 @@ namespace DocFileFormat ...@@ -52,9 +52,9 @@ namespace DocFileFormat
static const wchar_t LevelJustificationMap[3][7] = static const wchar_t LevelJustificationMap[3][7] =
{ {
_T("left"), L"left",
_T("center"), L"center",
_T("right") L"right"
}; };
class NumberingMapping: public AbstractOpenXmlMapping, public IMapping class NumberingMapping: public AbstractOpenXmlMapping, public IMapping
......
ASCOfficeDocFile/DocDocxConverter/OfficeDrawing/PathParser.h
View file @ 78b051c9
...@@ -146,15 +146,15 @@ namespace DocFileFormat ...@@ -146,15 +146,15 @@ namespace DocFileFormat
{ {
for (size_t i = 0; i < m_arPoints.size(); ++i) for (size_t i = 0; i < m_arPoints.size(); ++i)
{ {
strVmlPath += _T( "l" ); strVmlPath += L"l";
strVmlPath += FormatUtils::IntToWideString(m_arPoints[i].x); strVmlPath += FormatUtils::IntToWideString(m_arPoints[i].x);
strVmlPath += _T( "," ); strVmlPath += L",";
strVmlPath += FormatUtils::IntToWideString(m_arPoints[i].y); strVmlPath += FormatUtils::IntToWideString(m_arPoints[i].y);
++valuePointer; ++valuePointer;
} }
strVmlPath += _T( "xe" ); strVmlPath += L"xe";
return strVmlPath; return strVmlPath;
} }
...@@ -175,9 +175,9 @@ namespace DocFileFormat ...@@ -175,9 +175,9 @@ namespace DocFileFormat
{ {
break; break;
strVmlPath += _T( "l" ); strVmlPath += L"l";
strVmlPath += FormatUtils::IntToWideString(m_arPoints[0].x); strVmlPath += FormatUtils::IntToWideString(m_arPoints[0].x);
strVmlPath += _T( "," ); strVmlPath += L",";
strVmlPath += FormatUtils::IntToWideString(m_arPoints[0].y); strVmlPath += FormatUtils::IntToWideString(m_arPoints[0].y);
++valuePointer; ++valuePointer;
...@@ -186,9 +186,9 @@ namespace DocFileFormat ...@@ -186,9 +186,9 @@ namespace DocFileFormat
} }
else else
{ {
strVmlPath += _T( "l" ); strVmlPath += L"l";
strVmlPath += FormatUtils::IntToWideString(m_arPoints[valuePointer].x ); strVmlPath += FormatUtils::IntToWideString(m_arPoints[valuePointer].x );
strVmlPath += _T( "," ); strVmlPath += L",";
strVmlPath += FormatUtils::IntToWideString(m_arPoints[valuePointer].y ); strVmlPath += FormatUtils::IntToWideString(m_arPoints[valuePointer].y );
++valuePointer; ++valuePointer;
...@@ -201,17 +201,17 @@ namespace DocFileFormat ...@@ -201,17 +201,17 @@ namespace DocFileFormat
{ {
for (int i = 0; i < iter->Count; ++i) for (int i = 0; i < iter->Count; ++i)
{ {
strVmlPath += _T( "c" ); strVmlPath += L"c";
strVmlPath += FormatUtils::IntToWideString(m_arPoints[valuePointer].x ); strVmlPath += FormatUtils::IntToWideString(m_arPoints[valuePointer].x );
strVmlPath += _T( "," ); strVmlPath += L",";
strVmlPath += FormatUtils::IntToWideString(m_arPoints[valuePointer].y ); strVmlPath += FormatUtils::IntToWideString(m_arPoints[valuePointer].y );
strVmlPath += _T( "," ); strVmlPath += L",";
strVmlPath += FormatUtils::IntToWideString(m_arPoints[valuePointer + 1].x ); strVmlPath += FormatUtils::IntToWideString(m_arPoints[valuePointer + 1].x );
strVmlPath += _T( "," ); strVmlPath += L",";
strVmlPath += FormatUtils::IntToWideString(m_arPoints[valuePointer + 1].y ); strVmlPath += FormatUtils::IntToWideString(m_arPoints[valuePointer + 1].y );
strVmlPath += _T( "," ); strVmlPath += L",";
strVmlPath += FormatUtils::IntToWideString(m_arPoints[valuePointer + 2].x ); strVmlPath += FormatUtils::IntToWideString(m_arPoints[valuePointer + 2].x );
strVmlPath += _T( "," ); strVmlPath += L",";
strVmlPath += FormatUtils::IntToWideString(m_arPoints[valuePointer + 2].y ); strVmlPath += FormatUtils::IntToWideString(m_arPoints[valuePointer + 2].y );
valuePointer += 3; valuePointer += 3;
} }
...@@ -220,9 +220,9 @@ namespace DocFileFormat ...@@ -220,9 +220,9 @@ namespace DocFileFormat
case PathSegment::msopathMoveTo: case PathSegment::msopathMoveTo:
{ {
strVmlPath += _T( "m" ); strVmlPath += L"m";
strVmlPath += FormatUtils::IntToWideString(m_arPoints[valuePointer].x ); strVmlPath += FormatUtils::IntToWideString(m_arPoints[valuePointer].x );
strVmlPath += _T( "," ); strVmlPath += L",";
strVmlPath += FormatUtils::IntToWideString(m_arPoints[valuePointer].y ); strVmlPath += FormatUtils::IntToWideString(m_arPoints[valuePointer].y );
++valuePointer; ++valuePointer;
...@@ -231,23 +231,23 @@ namespace DocFileFormat ...@@ -231,23 +231,23 @@ namespace DocFileFormat
case PathSegment::msopathClose: case PathSegment::msopathClose:
{ {
strVmlPath += _T( "x" ); strVmlPath += L"x";
} }
break; break;
case PathSegment::msopathEnd: case PathSegment::msopathEnd:
{ {
strVmlPath += _T( "e" ); strVmlPath += L"e";
} }
break; break;
case PathSegment::msopathEscape: case PathSegment::msopathEscape:
{ {
if (PathSegment::msopathEscapeNoFill == iter->EscapeCode) if (PathSegment::msopathEscapeNoFill == iter->EscapeCode)
strVmlPath += _T( "nf" ); strVmlPath += L"nf";
if (PathSegment::msopathEscapeNoLine == iter->EscapeCode) if (PathSegment::msopathEscapeNoLine == iter->EscapeCode)
strVmlPath += _T( "ns" ); strVmlPath += L"ns";
} }
case PathSegment::msopathClientEscape: case PathSegment::msopathClientEscape:
case PathSegment::msopathInvalid: case PathSegment::msopathInvalid:
...@@ -266,8 +266,8 @@ namespace DocFileFormat ...@@ -266,8 +266,8 @@ namespace DocFileFormat
} }
// end the path // end the path
if ( !strVmlPath.empty() && ( strVmlPath[strVmlPath.size() - 1] != _T( 'e' ) ) ) if ( !strVmlPath.empty() && ( strVmlPath[strVmlPath.size() - 1] != L'e' ) )
strVmlPath += _T("e"); strVmlPath +=L"e";
return strVmlPath; return strVmlPath;
} }
......
ASCOfficeDocFile/DocDocxConverter/OleObjectMapping.h
View file @ 78b051c9
...@@ -65,15 +65,15 @@ namespace DocFileFormat ...@@ -65,15 +65,15 @@ namespace DocFileFormat
ole->Program = L"Word.Document"; ole->Program = L"Word.Document";
} }
m_pXmlWriter->WriteNodeBegin( _T( "o:OLEObject" ), TRUE ); m_pXmlWriter->WriteNodeBegin( L"o:OLEObject", TRUE );
if ( ole->bLinked ) if ( ole->bLinked )
{ {
int relID = m_context->_docx->RegisterExternalOLEObject(_caller, ole->ClipboardFormat, ole->Link); int relID = m_context->_docx->RegisterExternalOLEObject(_caller, ole->ClipboardFormat, ole->Link);
m_pXmlWriter->WriteAttribute( _T( "r:id" ), ( std::wstring( _T( "rId" ) ) + FormatUtils::IntToWideString( relID ) )); m_pXmlWriter->WriteAttribute( L"r:id", ( std::wstring( L"rId" ) + FormatUtils::IntToWideString( relID ) ));
m_pXmlWriter->WriteAttribute( _T( "Type" ), _T( "Link" ) ); m_pXmlWriter->WriteAttribute( L"Type", L"Link" );
m_pXmlWriter->WriteAttribute( _T( "UpdateMode" ), ole->UpdateMode); m_pXmlWriter->WriteAttribute( L"UpdateMode", ole->UpdateMode);
} }
else else
{ {
...@@ -84,45 +84,45 @@ namespace DocFileFormat ...@@ -84,45 +84,45 @@ namespace DocFileFormat
else else
relID = m_context->_docx->RegisterOLEObject(_caller, ole->ClipboardFormat); relID = m_context->_docx->RegisterOLEObject(_caller, ole->ClipboardFormat);
m_pXmlWriter->WriteAttribute( _T( "r:id" ), ( std::wstring( _T( "rId" ) ) + FormatUtils::IntToWideString( relID ) )); m_pXmlWriter->WriteAttribute( L"r:id", L"rId"+ FormatUtils::IntToWideString( relID ) );
m_pXmlWriter->WriteAttribute( _T( "Type" ), _T( "Embed" ) ); m_pXmlWriter->WriteAttribute( L"Type", L"Embed" );
copyEmbeddedObject( ole ); copyEmbeddedObject( ole );
} }
m_pXmlWriter->WriteAttribute( _T( "ProgID" ), ole->Program); m_pXmlWriter->WriteAttribute( L"ProgID", ole->Program);
m_pXmlWriter->WriteAttribute( _T( "ShapeID" ), _shapeId); m_pXmlWriter->WriteAttribute( L"ShapeID", _shapeId);
m_pXmlWriter->WriteAttribute( _T( "DrawAspect" ), _T( "Content" ) ); m_pXmlWriter->WriteAttribute( L"DrawAspect", L"Content" );
m_pXmlWriter->WriteAttribute( _T( "ObjectID" ), ole->ObjectId); m_pXmlWriter->WriteAttribute( L"ObjectID", ole->ObjectId);
m_pXmlWriter->WriteNodeEnd( _T( "" ), TRUE, FALSE ); m_pXmlWriter->WriteNodeEnd( L"", TRUE, FALSE );
m_pXmlWriter->WriteNodeEnd( _T( "o:OLEObject" ) ); m_pXmlWriter->WriteNodeEnd( L"o:OLEObject" );
} }
} }
static std::wstring GetTargetExt(const std::wstring& objectType) static std::wstring GetTargetExt(const std::wstring& objectType)
{ {
std::wstring objectExt = _T( ".bin" ); std::wstring objectExt = L".bin";
if ( objectType == _T( "Biff8" ) ) if ( objectType == L"Biff8" )
{ {
objectExt = _T( ".xls" ); objectExt = L".xls";
} }
else if ( objectType == _T( "MSWordDoc" ) ) else if ( objectType == L"MSWordDoc" )
{ {
objectExt = _T( ".doc" ); objectExt = L".doc";
} }
else if ( objectType == _T( "MSPresentation" ) ) else if ( objectType == L"MSPresentation" )
{ {
objectExt = _T( ".ppt" ); objectExt = L".ppt";
} }
else if ( objectType == _T( "MSWordDocx" ) ) else if ( objectType == L"MSWordDocx" )
{ {
objectExt = _T( ".docx" ); objectExt = L".docx";
} }
else if ( objectType == _T( "Equation" ) ) else if ( objectType == L"Equation" )
{ {
objectExt = _T( ".xml" ); objectExt = L".xml";
} }
return objectExt; return objectExt;
} }
...@@ -131,23 +131,23 @@ namespace DocFileFormat ...@@ -131,23 +131,23 @@ namespace DocFileFormat
{ {
std::wstring objectContentType = OpenXmlContentTypes::OleObject; std::wstring objectContentType = OpenXmlContentTypes::OleObject;
if ( objectType == _T( "Biff8" ) ) if ( objectType == L"Biff8" )
{ {
objectContentType = OpenXmlContentTypes::MSExcel; objectContentType = OpenXmlContentTypes::MSExcel;
} }
else if ( objectType == _T( "MSWordDoc" ) ) else if ( objectType == L"MSWordDoc" )
{ {
objectContentType = OpenXmlContentTypes::MSWord; objectContentType = OpenXmlContentTypes::MSWord;
} }
else if ( objectType == _T( "MSPresentation" ) ) else if ( objectType == L"MSPresentation" )
{ {
objectContentType = OpenXmlContentTypes::MSPowerpoint; objectContentType = OpenXmlContentTypes::MSPowerpoint;
} }
else if ( objectType == _T( "MSWordDocx" ) ) else if ( objectType == L"MSWordDocx" )
{ {
objectContentType = OpenXmlContentTypes::MSWordDocx; objectContentType = OpenXmlContentTypes::MSWordDocx;
} }
else if ( objectType == _T( "Equation" ) ) else if ( objectType == L"Equation" )
{ {
objectContentType = OpenXmlContentTypes::Xml; objectContentType = OpenXmlContentTypes::Xml;
} }
...@@ -160,7 +160,7 @@ namespace DocFileFormat ...@@ -160,7 +160,7 @@ namespace DocFileFormat
if ( ole != NULL ) if ( ole != NULL )
{ {
std::wstring clsid; std::wstring clsid;
std::wstring exelChart = _T( "Excel.Chart" ); std::wstring exelChart = L"Excel.Chart";
if ( std::search( ole->Program.begin(), ole->Program.end(), exelChart.begin(), exelChart.end() ) == ole->Program.end() ) if ( std::search( ole->Program.begin(), ole->Program.end(), exelChart.begin(), exelChart.end() ) == ole->Program.end() )
{ {
......
ASCOfficeDocFile/DocDocxConverter/OpenXmlPackage.h
View file @ 78b051c9
...@@ -49,7 +49,7 @@ namespace DocFileFormat ...@@ -49,7 +49,7 @@ namespace DocFileFormat
{ {
} }
Relationship( const std::wstring& id, const std::wstring& type, const std::wstring& target, const std::wstring& targetMode = _T( "" ) ): Relationship( const std::wstring& id, const std::wstring& type, const std::wstring& target, const std::wstring& targetMode = L""):
Id( id ), Type( type ), Target( target ), TargetMode( targetMode ) Id( id ), Type( type ), Target( target ), TargetMode( targetMode )
{ {
} }
...@@ -139,18 +139,18 @@ namespace DocFileFormat ...@@ -139,18 +139,18 @@ namespace DocFileFormat
const WordDocument* docFile; const WordDocument* docFile;
int AddHeaderPart( const std::wstring& fileName, const std::wstring& relationshipType = _T( "" ), const std::wstring& targetMode = _T( "" ) ); int AddHeaderPart( const std::wstring& fileName, const std::wstring& relationshipType = L"", const std::wstring& targetMode = L"" );
int AddFooterPart( const std::wstring& fileName, const std::wstring& relationshipType = _T( "" ), const std::wstring& targetMode = _T( "" ) ); int AddFooterPart( const std::wstring& fileName, const std::wstring& relationshipType = L"", const std::wstring& targetMode = L"" );
int AddFootnotesPart( const std::wstring& fileName, const std::wstring& relationshipType = _T( "" ), const std::wstring& targetMode = _T( "" ) ); int AddFootnotesPart( const std::wstring& fileName, const std::wstring& relationshipType = L"", const std::wstring& targetMode = L"" );
int AddEndnotesPart( const std::wstring& fileName, const std::wstring& relationshipType = _T( "" ), const std::wstring& targetMode = _T( "" ) ); int AddEndnotesPart( const std::wstring& fileName, const std::wstring& relationshipType = L"", const std::wstring& targetMode = L"" );
int AddCommentsPart( const std::wstring& fileName, const std::wstring& relationshipType = _T( "" ), const std::wstring& targetMode = _T( "" ) ); int AddCommentsPart( const std::wstring& fileName, const std::wstring& relationshipType = L"", const std::wstring& targetMode = L"" );
int AddNumberingPart( const std::wstring& fileName, const std::wstring& relationshipType = _T( "" ), const std::wstring& targetMode = _T( "" ) ); int AddNumberingPart( const std::wstring& fileName, const std::wstring& relationshipType = L"", const std::wstring& targetMode = L"" );
void WriteRelsFile( const RelationshipsFile& relationshipsFile ); void WriteRelsFile( const RelationshipsFile& relationshipsFile );
void WriteContentTypesFile( const ContentTypesFile& contentTypesFile ); void WriteContentTypesFile( const ContentTypesFile& contentTypesFile );
int AddPart( const std::wstring& packageDir, const std::wstring& fileName, const std::wstring& contentType = _T( "" ), const std::wstring& relationshipType = _T( "" ), const std::wstring& targetMode = _T( "" ) ); int AddPart( const std::wstring& packageDir, const std::wstring& fileName, const std::wstring& contentType = L"", const std::wstring& relationshipType = L"", const std::wstring& targetMode = L"" );
int AddPart( const IMapping* mapping, const std::wstring& packageDir, const std::wstring& fileName, const std::wstring& contentType = _T( "" ), const std::wstring& relationshipType = _T( "" ), const std::wstring& targetMode = _T( "" ) ); int AddPart( const IMapping* mapping, const std::wstring& packageDir, const std::wstring& fileName, const std::wstring& contentType = L"", const std::wstring& relationshipType = L"", const std::wstring& targetMode = L"" );
protected: protected:
......
ASCOfficeDocFile/DocDocxConverter/SectionPropertiesMapping.h
View file @ 78b051c9
...@@ -39,100 +39,98 @@ ...@@ -39,100 +39,98 @@
#include "IMapping.h" #include "IMapping.h"
#include "../Common/XmlTools.h" #include "../Common/XmlTools.h"
#define WSTD(V) std::wstring(_T(#V))
namespace DocFileFormat namespace DocFileFormat
{ {
static const wchar_t SectionTypeMap[5][11] = static const wchar_t SectionTypeMap[5][11] =
{ {
_T( "continuous" ), L"continuous",
_T( "nextColumn" ), L"nextColumn",
_T( "nextPage" ), L"nextPage",
_T( "evenPage" ), L"evenPage",
_T( "oddPage" ) L"oddPage"
}; };
static const wchar_t PageOrientationMap[3][10] = static const wchar_t PageOrientationMap[3][10] =
{ {
_T( "0" ), L"0",
_T( "portrait" ), L"portrait",
_T( "landscape" ) L"landscape"
}; };
static const wchar_t DocGridTypeMap[4][14] = static const wchar_t DocGridTypeMap[4][14] =
{ {
_T( "Default" ), L"Default",
_T( "linesAndChars" ), L"linesAndChars",
_T( "lines" ), L"lines",
_T( "snapToChars" ) L"snapToChars"
}; };
static const wchar_t FootnoteRestartCodeMap[3][11] = static const wchar_t FootnoteRestartCodeMap[3][11] =
{ {
_T( "continuous" ), L"continuous",
_T( "eachSect" ), L"eachSect",
_T( "eachPage" ) L"eachPage"
}; };
static const wchar_t EndnoteRestartCodeMap[3][11] = static const wchar_t EndnoteRestartCodeMap[3][11] =
{ {
_T( "continuous" ), L"continuous",
_T( "eachSect" ), L"eachSect",
_T( "eachPage" ) L"eachPage"
}; };
static const wchar_t PageNumberFormatCodeMap[42][29] = static const wchar_t PageNumberFormatCodeMap[42][29] =
{ {
_T( "Decimal" ), L"Decimal",
_T( "upperRoman" ), L"upperRoman",
_T( "lowerRoman" ), L"lowerRoman",
_T( "upperLetter" ), L"upperLetter",
_T( "lowerLetter" ), L"lowerLetter",
_T( "ordinal" ), L"ordinal",
_T( "cardinalText" ), L"cardinalText",
_T( "ordinalText" ), L"ordinalText",
_T( "hex" ), L"hex",
_T( "chicago" ), L"chicago",
_T( "ideographDigital" ), L"ideographDigital",
_T( "japaneseCounting" ), L"japaneseCounting",
_T( "Aiueo" ), L"Aiueo",
_T( "Iroha" ), L"Iroha",
_T( "decimalFullWidth" ), L"decimalFullWidth",
_T( "decimalHalfWidth" ), L"decimalHalfWidth",
_T( "japaneseLegal" ), L"japaneseLegal",
_T( "japaneseDigitalTenThousand" ), L"japaneseDigitalTenThousand",
_T( "decimalEnclosedCircle" ), L"decimalEnclosedCircle",
_T( "decimalFullWidth2" ), L"decimalFullWidth2",
_T( "aiueoFullWidth" ), L"aiueoFullWidth",
_T( "irohaFullWidth" ), L"irohaFullWidth",
_T( "decimalZero" ), L"decimalZero",
_T( "bullet" ), L"bullet",
_T( "ganada" ), L"ganada",
_T( "chosung" ), L"chosung",
_T( "decimalEnclosedFullstop" ), L"decimalEnclosedFullstop",
_T( "decimalEnclosedParen" ), L"decimalEnclosedParen",
_T( "decimalEnclosedCircleChinese" ), L"decimalEnclosedCircleChinese",
_T( "ideographEnclosedCircle" ), L"ideographEnclosedCircle",
_T( "ideographTraditional" ), L"ideographTraditional",
_T( "ideographZodiac" ), L"ideographZodiac",
_T( "ideographZodiacTraditional" ), L"ideographZodiacTraditional",
_T( "taiwaneseCounting" ), L"taiwaneseCounting",
_T( "ideographLegalTraditional" ), L"ideographLegalTraditional",
_T( "taiwaneseCountingThousand" ), L"taiwaneseCountingThousand",
_T( "taiwaneseDigital" ), L"taiwaneseDigital",
_T( "chineseCounting" ), L"chineseCounting",
_T( "chineseLegalSimplified" ), L"chineseLegalSimplified",
_T( "chineseCountingThousand" ), L"chineseCountingThousand",
_T( "Decimal2" ), L"Decimal2",
_T( "koreanDigital" ), L"koreanDigital",
}; };
static const wchar_t TextVerticalAlignment[4][7] = static const wchar_t TextVerticalAlignment[4][7] =
{ {
_T( "top" ), L"top",
_T( "center" ), L"center",
_T( "both" ), L"both",
_T( "bottom" ) L"bottom"
}; };
enum SLncOperand enum SLncOperand
...@@ -144,9 +142,9 @@ namespace DocFileFormat ...@@ -144,9 +142,9 @@ namespace DocFileFormat
static const std::wstring LineNumberRestart [] = // ST_LineNumberRestart static const std::wstring LineNumberRestart [] = // ST_LineNumberRestart
{ {
WSTD (newPage), L"newPage",
WSTD (newSection), L"newSection",
WSTD (continuous) L"continuous"
}; };
} }
......
ASCOfficeDocFile/DocDocxConverter/SettingsMapping.h
View file @ 78b051c9
...@@ -41,17 +41,17 @@ namespace DocFileFormat ...@@ -41,17 +41,17 @@ namespace DocFileFormat
{ {
static const wchar_t FootnotePositionMap[4][12] = static const wchar_t FootnotePositionMap[4][12] =
{ {
_T( "beneathText" ), L"beneathText",
_T( "docEnd" ), L"docEnd",
_T( "pageBottom" ), L"pageBottom",
_T( "sectEnd" ) L"sectEnd"
}; };
static const wchar_t ZoomTypeMap[3][9] = static const wchar_t ZoomTypeMap[3][9] =
{ {
_T( "none" ), L"none",
_T( "fullPage" ), L"fullPage",
_T( "bestFit" ) L"bestFit"
}; };
class SettingsMapping: public PropertiesMapping, public IMapping class SettingsMapping: public PropertiesMapping, public IMapping
......
ASCOfficeDocFile/DocDocxConverter/TableMapping.cpp
View file @ 78b051c9
...@@ -117,7 +117,7 @@ namespace DocFileFormat ...@@ -117,7 +117,7 @@ namespace DocFileFormat
SectionPropertyExceptions* sepxBackup = documentMapping->_lastValidSepx; SectionPropertyExceptions* sepxBackup = documentMapping->_lastValidSepx;
//start w:tc //start w:tc
documentMapping->GetXMLWriter()->WriteNodeBegin( _T( "w:tc" ) ); documentMapping->GetXMLWriter()->WriteNodeBegin( L"w:tc" );
//find cell end //find cell end
int cpCellEnd = documentMapping->findCellEndCp(cp, depth); int cpCellEnd = documentMapping->findCellEndCp(cp, depth);
...@@ -141,7 +141,7 @@ namespace DocFileFormat ...@@ -141,7 +141,7 @@ namespace DocFileFormat
} }
//end w:tc //end w:tc
documentMapping->GetXMLWriter()->WriteNodeEnd( _T( "w:tc" ) ); documentMapping->GetXMLWriter()->WriteNodeEnd( L"w:tc" );
} }
} }
...@@ -526,7 +526,7 @@ namespace DocFileFormat ...@@ -526,7 +526,7 @@ namespace DocFileFormat
documentMapping->m_document->FIB->m_bOlderVersion); documentMapping->m_document->FIB->m_bOlderVersion);
//start table //start table
documentMapping->GetXMLWriter()->WriteNodeBegin( _T( "w:tbl" ) ); documentMapping->GetXMLWriter()->WriteNodeBegin( L"w:tbl" );
//Convert it //Convert it
TablePropertiesMapping tpMapping( documentMapping->GetXMLWriter(), documentMapping->m_document->Styles, grid ); TablePropertiesMapping tpMapping( documentMapping->GetXMLWriter(), documentMapping->m_document->Styles, grid );
...@@ -542,7 +542,7 @@ namespace DocFileFormat ...@@ -542,7 +542,7 @@ namespace DocFileFormat
} }
//close w:tbl //close w:tbl
documentMapping->GetXMLWriter()->WriteNodeEnd( _T( "w:tbl" ) ); documentMapping->GetXMLWriter()->WriteNodeEnd( L"w:tbl" );
RELEASEOBJECT( grid ); RELEASEOBJECT( grid );
} }
......
ASCOfficeDocFile/DocDocxConverter/TextboxMapping.cpp
View file @ 78b051c9
...@@ -88,21 +88,21 @@ namespace DocFileFormat ...@@ -88,21 +88,21 @@ namespace DocFileFormat
//if (m_nTBIndex < m_document->TextboxBreakPlex->Elements.size()) //if (m_nTBIndex < m_document->TextboxBreakPlex->Elements.size())
// return; // return;
m_pXmlWriter->WriteNodeBegin(_T("v:textbox"), true); m_pXmlWriter->WriteNodeBegin(L"v:textbox", true);
if(m_dxTextLeft >= 0 && m_dyTextTop >= 0 && m_dxTextRight >= 0 && m_dyTextBottom >= 0) if(m_dxTextLeft >= 0 && m_dyTextTop >= 0 && m_dxTextRight >= 0 && m_dyTextBottom >= 0)
{ {
m_pXmlWriter->WriteAttribute( _T( "inset" ), FormatUtils::DoubleToWideString(m_dxTextLeft) + m_pXmlWriter->WriteAttribute( L"inset" , FormatUtils::DoubleToWideString(m_dxTextLeft) + L"pt," +
_T("pt,") + FormatUtils::DoubleToWideString(m_dyTextTop) + FormatUtils::DoubleToWideString(m_dyTextTop) + L"pt," +
_T("pt,") + FormatUtils::DoubleToWideString(m_dxTextRight) + FormatUtils::DoubleToWideString(m_dxTextRight) + L"pt," +
_T("pt,") + FormatUtils::DoubleToWideString(m_dyTextBottom) + _T("pt")); FormatUtils::DoubleToWideString(m_dyTextBottom) + L"pt");
} }
if (!m_sTextBoxStyle.empty()) if (!m_sTextBoxStyle.empty())
{ {
m_pXmlWriter->WriteAttribute( _T( "style" ), m_sTextBoxStyle); m_pXmlWriter->WriteAttribute( L"style", m_sTextBoxStyle);
} }
m_pXmlWriter->WriteNodeEnd( _T( "" ), true, false ); m_pXmlWriter->WriteNodeEnd( L"", true, false );
m_pXmlWriter->WriteNodeBegin( _T( "w:txbxContent" ) ); m_pXmlWriter->WriteNodeBegin( L"w:txbxContent" );
int cp = 0; int cp = 0;
int cpEnd = 0; int cpEnd = 0;
...@@ -178,8 +178,8 @@ namespace DocFileFormat ...@@ -178,8 +178,8 @@ namespace DocFileFormat
} }
_isTextBoxContent = false; _isTextBoxContent = false;
m_pXmlWriter->WriteNodeEnd( _T( "w:txbxContent" ) ); m_pXmlWriter->WriteNodeEnd( L"w:txbxContent" );
m_pXmlWriter->WriteNodeEnd( _T( "v:textbox" ) ); m_pXmlWriter->WriteNodeEnd( L"v:textbox" );
} }
} }
} }
ASCOfficeDocFile/DocDocxConverter/WordprocessingDocument.cpp
View file @ 78b051c9
...@@ -133,7 +133,7 @@ namespace ImageHelper ...@@ -133,7 +133,7 @@ namespace ImageHelper
{ {
oFrame.put_Data((unsigned char*)data + offset); oFrame.put_Data((unsigned char*)data + offset);
if (!oFrame.SaveFile(file_name + _T(".png"), 4/*CXIMAGE_FORMAT_PNG*/)) if (!oFrame.SaveFile(file_name + L".png", 4/*CXIMAGE_FORMAT_PNG*/))
result = Global::msoblipERROR; result = Global::msoblipERROR;
oFrame.put_Data(NULL); oFrame.put_Data(NULL);
...@@ -141,7 +141,7 @@ namespace ImageHelper ...@@ -141,7 +141,7 @@ namespace ImageHelper
else if (result == Global::msoblipWMF) else if (result == Global::msoblipWMF)
{ {
NSFile::CFileBinary file; NSFile::CFileBinary file;
if (file.CreateFileW(file_name + _T(".wmf"))) if (file.CreateFileW(file_name + L".wmf"))
{ {
file.WriteFile((BYTE*)data, size); file.WriteFile((BYTE*)data, size);
file.CloseFile(); file.CloseFile();
...@@ -150,7 +150,7 @@ namespace ImageHelper ...@@ -150,7 +150,7 @@ namespace ImageHelper
else if (biSizeImage > 0) else if (biSizeImage > 0)
{ {
NSFile::CFileBinary file; NSFile::CFileBinary file;
if (file.CreateFileW(file_name + _T(".bmp"))) if (file.CreateFileW(file_name + L".bmp"))
{ {
WORD vtType = 0x4D42; file.WriteFile((BYTE*)&vtType, 2); WORD vtType = 0x4D42; file.WriteFile((BYTE*)&vtType, 2);
DWORD dwLen = biSizeImage; file.WriteFile((BYTE*)&dwLen, 4); DWORD dwLen = biSizeImage; file.WriteFile((BYTE*)&dwLen, 4);
...@@ -169,9 +169,9 @@ namespace DocFileFormat ...@@ -169,9 +169,9 @@ namespace DocFileFormat
{ {
WordprocessingDocument::WordprocessingDocument(const std::wstring & _pathOutput, const WordDocument* _docFile) : WordprocessingDocument::WordprocessingDocument(const std::wstring & _pathOutput, const WordDocument* _docFile) :
OpenXmlPackage( _docFile ), OpenXmlPackage( _docFile ),
FontTableXML( _T( "" ) ), DocumentXML( _T( "" ) ), FontTableXML( L"" ), DocumentXML( L"" ),
StyleSheetXML( _T( "" ) ), FootnotesXML ( _T( "" ) ), NumberingXML( _T( "" ) ), StyleSheetXML( L"" ), FootnotesXML ( L"" ), NumberingXML( L"" ),
CommentsXML( _T( "" ) ), SettingsXML( _T( "" ) ), CommandTableXML ( _T( "" ) ) CommentsXML( L"" ), SettingsXML( L"" ), CommandTableXML ( L"" )
{ {
m_strOutputPath = _pathOutput; m_strOutputPath = _pathOutput;
} }
...@@ -182,8 +182,8 @@ namespace DocFileFormat ...@@ -182,8 +182,8 @@ namespace DocFileFormat
void WordprocessingDocument::SaveDocument() void WordprocessingDocument::SaveDocument()
{ {
std::wstring pathWord = m_strOutputPath + FILE_SEPARATOR_STR + _T( "word" ) ; std::wstring pathWord = m_strOutputPath + FILE_SEPARATOR_STR + L"word" ;
//OOX::CPath pathWord = CString(m_strOutputPath) + FILE_SEPARATOR_STR + _T( "word" ); //OOX::CPath pathWord = CString(m_strOutputPath) + FILE_SEPARATOR_STR + L"word" );
//FileSystem::Directory::CreateDirectory( pathWord.GetPath() ); //FileSystem::Directory::CreateDirectory( pathWord.GetPath() );
NSDirectory::CreateDirectory( pathWord ); NSDirectory::CreateDirectory( pathWord );
...@@ -191,20 +191,20 @@ namespace DocFileFormat ...@@ -191,20 +191,20 @@ namespace DocFileFormat
//Write main content. (word directory) //Write main content. (word directory)
SaveToFile(pathWord, std::wstring( _T("document.xml" ) ), DocumentXML ); SaveToFile(pathWord, std::wstring( L"document.xml" ), DocumentXML );
SaveToFile(pathWord, std::wstring( _T( "fontTable.xml" ) ), FontTableXML ); SaveToFile(pathWord, std::wstring( L"fontTable.xml" ), FontTableXML );
SaveToFile(pathWord, std::wstring( _T( "styles.xml" ) ), StyleSheetXML ); SaveToFile(pathWord, std::wstring( L"styles.xml" ), StyleSheetXML );
SaveToFile(pathWord, std::wstring( _T( "footnotes.xml" ) ), FootnotesXML ); SaveToFile(pathWord, std::wstring( L"footnotes.xml" ), FootnotesXML );
SaveToFile(pathWord, std::wstring( _T( "endnotes.xml" ) ), EndnotesXML ); SaveToFile(pathWord, std::wstring( L"endnotes.xml" ), EndnotesXML );
SaveToFile(pathWord, std::wstring( _T( "numbering.xml" ) ), NumberingXML ); SaveToFile(pathWord, std::wstring( L"numbering.xml" ), NumberingXML );
SaveToFile(pathWord, std::wstring( _T( "comments.xml" ) ), CommentsXML ); SaveToFile(pathWord, std::wstring( L"comments.xml" ), CommentsXML );
SaveToFile(pathWord, std::wstring( _T( "settings.xml" ) ), SettingsXML ); SaveToFile(pathWord, std::wstring( L"settings.xml" ), SettingsXML );
SaveToFile(pathWord, std::wstring( _T( "customizations.xml" ) ),CommandTableXML ); SaveToFile(pathWord, std::wstring( L"customizations.xml" ), CommandTableXML );
if (!ImagesList.empty()) if (!ImagesList.empty())
{ {
std::wstring pathMedia = pathWord + FILE_SEPARATOR_STR + _T( "media" ); std::wstring pathMedia = pathWord + FILE_SEPARATOR_STR + L"media";
//OOX::CPath pathMedia = pathWord + FILE_SEPARATOR_STR + _T( "media" ); //OOX::CPath pathMedia = pathWord + FILE_SEPARATOR_STR + L"media";
//FileSystem::Directory::CreateDirectory( pathMedia.GetPath() ); //FileSystem::Directory::CreateDirectory( pathMedia.GetPath() );
NSDirectory::CreateDirectory(pathMedia); NSDirectory::CreateDirectory(pathMedia);
...@@ -221,12 +221,12 @@ namespace DocFileFormat ...@@ -221,12 +221,12 @@ namespace DocFileFormat
if (Global::msoblipDIB == iter->blipType) if (Global::msoblipDIB == iter->blipType)
{//user_manual_v52.doc {//user_manual_v52.doc
std::wstring file_name = pathMedia + FILE_SEPARATOR_STR + _T("image") + FormatUtils::IntToWideString(i++); std::wstring file_name = pathMedia + FILE_SEPARATOR_STR + L"image" + FormatUtils::IntToWideString(i++);
iter->blipType = ImageHelper::SaveImageToFileFromDIB(bytes, iter->data.size(), file_name); iter->blipType = ImageHelper::SaveImageToFileFromDIB(bytes, iter->data.size(), file_name);
} }
else else
{ {
SaveToFile(pathMedia, std::wstring(_T("image" )) + FormatUtils::IntToWideString(i++) + iter->ext, (void*)bytes, (unsigned int)iter->data.size()); SaveToFile(pathMedia, std::wstring(L"image" ) + FormatUtils::IntToWideString(i++) + iter->ext, (void*)bytes, (unsigned int)iter->data.size());
} }
RELEASEARRAYOBJECTS(bytes); RELEASEARRAYOBJECTS(bytes);
...@@ -236,15 +236,15 @@ namespace DocFileFormat ...@@ -236,15 +236,15 @@ namespace DocFileFormat
if (!OleObjectsList.empty()) if (!OleObjectsList.empty())
{ {
std::wstring pathObjects = pathWord + FILE_SEPARATOR_STR + _T( "embeddings") ; std::wstring pathObjects = pathWord + FILE_SEPARATOR_STR + L"embeddings" ;
//OOX::CPath pathObjects = pathWord + FILE_SEPARATOR_STR + _T( "embeddings" ); //OOX::CPath pathObjects = pathWord + FILE_SEPARATOR_STR + L"embeddings" ;
//FileSystem::Directory::CreateDirectory( pathObjects.GetPath()); //FileSystem::Directory::CreateDirectory( pathObjects.GetPath());
NSDirectory::CreateDirectory( pathObjects ); NSDirectory::CreateDirectory( pathObjects );
int i = 1; int i = 1;
for (std::list<OleObjectFileStructure>::iterator iter = OleObjectsList.begin(); iter != OleObjectsList.end(); ++iter) for (std::list<OleObjectFileStructure>::iterator iter = OleObjectsList.begin(); iter != OleObjectsList.end(); ++iter)
{ {
std::wstring fileName = pathObjects + FILE_SEPARATOR_STR + _T( "oleObject" ) + FormatUtils::IntToWideString(i++) + iter->ext; std::wstring fileName = pathObjects + FILE_SEPARATOR_STR + L"oleObject" + FormatUtils::IntToWideString(i++) + iter->ext;
if (!iter->data.empty()) if (!iter->data.empty())
{ {
...@@ -262,12 +262,12 @@ namespace DocFileFormat ...@@ -262,12 +262,12 @@ namespace DocFileFormat
for (std::list<std::wstring>::iterator iter = HeaderXMLList.begin(); iter != HeaderXMLList.end(); ++iter) for (std::list<std::wstring>::iterator iter = HeaderXMLList.begin(); iter != HeaderXMLList.end(); ++iter)
{ {
SaveToFile(pathWord, ( std::wstring( _T( "header" ) ) + FormatUtils::IntToWideString(++headersCount) + std::wstring( _T( ".xml" ) ) ), *iter); SaveToFile(pathWord, ( std::wstring( L"header" ) + FormatUtils::IntToWideString(++headersCount) + std::wstring( L".xml" ) ), *iter);
} }
for (std::list<std::wstring>::iterator iter = FooterXMLList.begin(); iter != FooterXMLList.end(); ++iter) for (std::list<std::wstring>::iterator iter = FooterXMLList.begin(); iter != FooterXMLList.end(); ++iter)
{ {
SaveToFile(pathWord, ( std::wstring( _T( "footer" ) ) + FormatUtils::IntToWideString(++footersCount) + std::wstring( _T( ".xml" ) ) ), *iter); SaveToFile(pathWord, ( std::wstring( L"footer" ) + FormatUtils::IntToWideString(++footersCount) + std::wstring( L".xml" ) ), *iter);
} }
} }
} }
ASCOfficeDocxFile2/BinReader/ReaderClasses.h
View file @ 78b051c9
...@@ -1455,7 +1455,7 @@ public: ...@@ -1455,7 +1455,7 @@ public:
bool bDQuot = false; bool bDQuot = false;
for(int i = 0, length = fld.length(); i < length; ++i) for(int i = 0, length = fld.length(); i < length; ++i)
{ {
TCHAR sCurLetter = fld[i]; wchar_t sCurLetter = fld[i];
if('\"' == sCurLetter) if('\"' == sCurLetter)
bDQuot = !bDQuot; bDQuot = !bDQuot;
else if('\\' == sCurLetter && true == bDQuot && i + 1 < length && '\"' == fld[i + 1]) else if('\\' == sCurLetter && true == bDQuot && i + 1 < length && '\"' == fld[i + 1])
...@@ -1710,7 +1710,7 @@ public: ...@@ -1710,7 +1710,7 @@ public:
int nPrevIndex = 0; int nPrevIndex = 0;
for(int i = 0, length = sText.length(); i < length; i++) for(int i = 0, length = sText.length(); i < length; i++)
{ {
TCHAR cToken = sText[i]; wchar_t cToken = sText[i];
if('\n' == cToken) if('\n' == cToken)
{ {
bFirst = writeContentWritePart(pComment, sText, nPrevIndex, i, bFirst, sRes); bFirst = writeContentWritePart(pComment, sText, nPrevIndex, i, bFirst, sRes);
......
ASCOfficeDocxFile2/DocWrapper/DocxSerializer.cpp
View file @ 78b051c9
...@@ -261,7 +261,7 @@ bool BinDocxRW::CDocxSerializer::loadFromFile(const std::wstring& sSrcFileName, ...@@ -261,7 +261,7 @@ bool BinDocxRW::CDocxSerializer::loadFromFile(const std::wstring& sSrcFileName,
int nDataSize = atoi(dst_len.c_str()); int nDataSize = atoi(dst_len.c_str());
BYTE* pData = new BYTE[nDataSize]; BYTE* pData = new BYTE[nDataSize];
if(false != Base64::Base64Decode((LPCSTR)(pBase64Data + nIndex), nBase64DataSize - nIndex, pData, &nDataSize)) if(false != Base64::Base64Decode((const char*)(pBase64Data + nIndex), nBase64DataSize - nIndex, pData, &nDataSize))
{ {
NSBinPptxRW::CDrawingConverter oDrawingConverter; NSBinPptxRW::CDrawingConverter oDrawingConverter;
NSBinPptxRW::CBinaryFileReader& oBufferedStream = *oDrawingConverter.m_pReader; NSBinPptxRW::CBinaryFileReader& oBufferedStream = *oDrawingConverter.m_pReader;
......
ASCOfficeDocxFile2/DocWrapper/FontProcessor.cpp
View file @ 78b051c9
...@@ -29,16 +29,14 @@ ...@@ -29,16 +29,14 @@
* terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode
* *
*/ */
//#include "stdafx.h"
#include "FontProcessor.h"
#include "../../Common/DocxFormat/Source/XlsxFormat/Xlsx.h" #include "../../Common/DocxFormat/Source/XlsxFormat/Xlsx.h"
#include "../../Common/DocxFormat/Source/DocxFormat/Docx.h" #include "../../Common/DocxFormat/Source/DocxFormat/Docx.h"
#include "../../Common/ASCUtils.h" #include "../../Common/ASCUtils.h"
namespace DocWrapper { namespace DocWrapper {
TCHAR* gc_sNoNameFont = _T("NoNameFont"); wchar_t* gc_sNoNameFont = _T("NoNameFont");
TCHAR* gc_sDefaultFontName = _T("Arial"); wchar_t* gc_sDefaultFontName = _T("Arial");
FontProcessor::FontProcessor() : m_pFontManager(NULL) FontProcessor::FontProcessor() : m_pFontManager(NULL)
{ {
......
ASCOfficePPTFile/PPTFormatLib/PPTXWriter/ImageManager.h
View file @ 78b051c9
...@@ -75,7 +75,7 @@ namespace NSPresentationEditor ...@@ -75,7 +75,7 @@ namespace NSPresentationEditor
return DownloadImage(strInput); return DownloadImage(strInput);
std::wstring strExts = _T(".jpg"); std::wstring strExts = _T(".jpg");
int nIndexExt = strInput.rfind(TCHAR('.')); int nIndexExt = strInput.rfind(wchar_t('.'));
if (-1 != nIndexExt) if (-1 != nIndexExt)
strExts = strInput.substr(nIndexExt); strExts = strInput.substr(nIndexExt);
......
ASCOfficePPTFile/PPTFormatLib/PPTXWriter/ShapeWriter.cpp
View file @ 78b051c9
...@@ -953,8 +953,8 @@ void NSPresentationEditor::CShapeWriter::WriteTextInfo() ...@@ -953,8 +953,8 @@ void NSPresentationEditor::CShapeWriter::WriteTextInfo()
NSPresentationEditor::CTextCFRun* pCF = &pParagraph->m_arSpans[nSpan].m_oRun; NSPresentationEditor::CTextCFRun* pCF = &pParagraph->m_arSpans[nSpan].m_oRun;
int span_sz = pParagraph->m_arSpans[nSpan].m_strText.length() ; int span_sz = pParagraph->m_arSpans[nSpan].m_strText.length() ;
if ((span_sz==1 && ( pParagraph->m_arSpans[nSpan].m_strText[0] == (TCHAR)13 )) || if ((span_sz==1 && ( pParagraph->m_arSpans[nSpan].m_strText[0] == (wchar_t)13 )) ||
((span_sz==2 && ( pParagraph->m_arSpans[nSpan].m_strText[0] == (TCHAR)13 ) && ( pParagraph->m_arSpans[nSpan].m_strText[1] == (TCHAR)13 )))) ((span_sz==2 && ( pParagraph->m_arSpans[nSpan].m_strText[0] == (wchar_t)13 ) && ( pParagraph->m_arSpans[nSpan].m_strText[1] == (wchar_t)13 ))))
{ {
continue; continue;
} }
......
ASCOfficePPTFile/PPTFormatLib/Records/Drawing/ShapeContainer.h
View file @ 78b051c9
...@@ -1869,7 +1869,7 @@ public: ...@@ -1869,7 +1869,7 @@ public:
AVSINLINE std::wstring GetFileName(std::wstring strFilePath) AVSINLINE std::wstring GetFileName(std::wstring strFilePath)
{ {
int nIndex = strFilePath.rfind(TCHAR('\\')); int nIndex = strFilePath.rfind(wchar_t('\\'));
if (-1 != nIndex) if (-1 != nIndex)
{ {
return strFilePath.substr(nIndex + 1); return strFilePath.substr(nIndex + 1);
......
ASCOfficePPTXFile/ASCOfficeDrawingConverter.h
View file @ 78b051c9
...@@ -84,7 +84,7 @@ namespace PPTX ...@@ -84,7 +84,7 @@ namespace PPTX
{ {
public: public:
std::vector<std::wstring> m_arParams; std::vector<std::wstring> m_arParams;
TCHAR m_Separator; wchar_t m_Separator;
public: public:
CStringTrimmer(); CStringTrimmer();
......
ASCOfficePPTXFile/Editor/BinaryFileReaderWriter.cpp
View file @ 78b051c9
...@@ -164,7 +164,7 @@ namespace NSBinPptxRW ...@@ -164,7 +164,7 @@ namespace NSBinPptxRW
{ {
if(nIndex1 + sFind1.length() < strInput.length()) if(nIndex1 + sFind1.length() < strInput.length())
{ {
TCHAR cRes = strInput[nIndex1 + sFind1.length()]; wchar_t cRes = strInput[nIndex1 + sFind1.length()];
if('1' <= cRes && cRes <= '6') if('1' <= cRes && cRes <= '6')
{ {
int nImageIndex = nIndex1 + sFind1.length() + 1; int nImageIndex = nIndex1 + sFind1.length() + 1;
...@@ -187,7 +187,7 @@ namespace NSBinPptxRW ...@@ -187,7 +187,7 @@ namespace NSBinPptxRW
return pPair->second; return pPair->second;
std::wstring strExts = _T(".jpg"); std::wstring strExts = _T(".jpg");
int nIndexExt = strInput.rfind(TCHAR('.')); int nIndexExt = strInput.rfind(wchar_t('.'));
if (-1 != nIndexExt) if (-1 != nIndexExt)
strExts = strInput.substr(nIndexExt); strExts = strInput.substr(nIndexExt);
...@@ -356,7 +356,7 @@ namespace NSBinPptxRW ...@@ -356,7 +356,7 @@ namespace NSBinPptxRW
return pPair->second; return pPair->second;
std::wstring strExts = _T(".jpg"); std::wstring strExts = _T(".jpg");
int nIndexExt = strUrl.rfind(TCHAR('.')); int nIndexExt = strUrl.rfind(wchar_t('.'));
if (-1 != nIndexExt) if (-1 != nIndexExt)
strExts = strUrl.substr(nIndexExt); strExts = strUrl.substr(nIndexExt);
......
ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/Common.h
View file @ 78b051c9
...@@ -63,11 +63,11 @@ namespace NSStringUtils ...@@ -63,11 +63,11 @@ namespace NSStringUtils
#define IS_ALPHA(c) (((c >= 'a') && (c <= 'z')) || ((c >= 'A') && (c <= 'Z'))) #define IS_ALPHA(c) (((c >= 'a') && (c <= 'z')) || ((c >= 'A') && (c <= 'Z')))
#define IS_DIGIT(c) (((c >= '0') && (c <= '9')) || (c == '-')) #define IS_DIGIT(c) (((c >= '0') && (c <= '9')) || (c == '-'))
static bool IsDigit(const TCHAR& c) static bool IsDigit(const wchar_t& c)
{ {
return (((c >= '0') && (c <= '9')) || (c == '-')); return (((c >= '0') && (c <= '9')) || (c == '-'));
} }
static bool IsAlpha(const TCHAR& c) static bool IsAlpha(const wchar_t& c)
{ {
return (((c >= 'a') && (c <= 'z')) || ((c >= 'A') && (c <= 'Z'))); return (((c >= 'a') && (c <= 'z')) || ((c >= 'A') && (c <= 'Z')));
} }
...@@ -213,29 +213,29 @@ namespace NSStringUtils ...@@ -213,29 +213,29 @@ namespace NSStringUtils
std::wstring strPath = strSource; std::wstring strPath = strSource;
int nLength = strPath.length(); int nLength = strPath.length();
//strPath.Replace(_T(" "), _T(",")); //strPath.Replace(_T(" "), _T(","));
if (strPath.find(TCHAR('h')) != -1) if (strPath.find(wchar_t('h')) != -1)
{ {
TCHAR* pBuff = new TCHAR[nLength + 1]; wchar_t* pBuff = new wchar_t[nLength + 1];
int nCur = 0; int nCur = 0;
for (int i = 1; i < nLength; ++i) for (int i = 1; i < nLength; ++i)
{ {
TCHAR _c = strPath[i - 1]; wchar_t _c = strPath[i - 1];
if (_c != TCHAR('h')) if (_c != wchar_t('h'))
{ {
pBuff[nCur++] = _c; pBuff[nCur++] = _c;
} }
else else
{ {
TCHAR _c1 = strPath[i]; wchar_t _c1 = strPath[i];
if (_c1 == TCHAR('a') || if (_c1 == wchar_t('a') ||
_c1 == TCHAR('b') || _c1 == wchar_t('b') ||
_c1 == TCHAR('c') || _c1 == wchar_t('c') ||
_c1 == TCHAR('d') || _c1 == wchar_t('d') ||
_c1 == TCHAR('e') || _c1 == wchar_t('e') ||
_c1 == TCHAR('f') || _c1 == wchar_t('f') ||
_c1 == TCHAR('g') || _c1 == wchar_t('g') ||
_c1 == TCHAR('h') || _c1 == wchar_t('h') ||
_c1 == TCHAR('i')) _c1 == wchar_t('i'))
{ {
++i; ++i;
} }
...@@ -257,7 +257,7 @@ namespace NSStringUtils ...@@ -257,7 +257,7 @@ namespace NSStringUtils
} }
} }
if (nLength > 0 && strPath[nLength - 1] == TCHAR(',')) if (nLength > 0 && strPath[nLength - 1] == wchar_t(','))
{ {
strPath += _T("0"); strPath += _T("0");
++nLength; ++nLength;
...@@ -272,8 +272,8 @@ namespace NSStringUtils ...@@ -272,8 +272,8 @@ namespace NSStringUtils
//continue; //continue;
} }
TCHAR _c = strPath[nIndex]; wchar_t _c = strPath[nIndex];
TCHAR _c1 = strPath[nIndex + 1]; wchar_t _c1 = strPath[nIndex + 1];
if (_c1 == ',') if (_c1 == ',')
{ {
......
ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/PPTShape/Formula.h
View file @ 78b051c9
...@@ -67,7 +67,7 @@ namespace NSGuidesVML ...@@ -67,7 +67,7 @@ namespace NSGuidesVML
}; };
#define VML_GUIDE_COUNT 18 #define VML_GUIDE_COUNT 18
const LPWSTR VML_GUIDE_TYPE[VML_GUIDE_COUNT] = { static const wchar_t* VML_GUIDE_TYPE[VML_GUIDE_COUNT] = {
L"sum", L"sum",
L"prod", L"prod",
L"mid", L"mid",
......
ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/PPTShape/PPTShape.h
View file @ 78b051c9
...@@ -286,11 +286,11 @@ public: ...@@ -286,11 +286,11 @@ public:
virtual bool LoadAdjustValuesList(const std::wstring& xml) virtual bool LoadAdjustValuesList(const std::wstring& xml)
{ {
std::wstring strXml = xml; std::wstring strXml = xml;
if (0 == strXml.find((TCHAR)',')) if (0 == strXml.find((wchar_t)','))
strXml = (_T("defaultAdj") + strXml); strXml = (_T("defaultAdj") + strXml);
LONG lLastIndex = strXml.length() - 1; LONG lLastIndex = strXml.length() - 1;
if (lLastIndex >= 0 && lLastIndex == strXml.rfind((TCHAR)',')) if (lLastIndex >= 0 && lLastIndex == strXml.rfind((wchar_t)','))
{ {
strXml = strXml + _T("defaultAdj"); strXml = strXml + _T("defaultAdj");
} }
...@@ -596,7 +596,7 @@ protected: ...@@ -596,7 +596,7 @@ protected:
if (str.length() == 0) if (str.length() == 0)
return false; return false;
TCHAR mem = str[0]; wchar_t mem = str[0];
bool bFormula = false; bool bFormula = false;
if ('@' == mem) if ('@' == mem)
......
ASCOfficePPTXFile/Editor/Drawing/TextAttributesEx.cpp
View file @ 78b051c9
...@@ -45,7 +45,7 @@ namespace NSPresentationEditor ...@@ -45,7 +45,7 @@ namespace NSPresentationEditor
int lCountCFs = m_arParagraphs[i].m_arSpans.size(); int lCountCFs = m_arParagraphs[i].m_arSpans.size();
int s_size = m_arParagraphs[i].m_arSpans[j].m_strText.length(); int s_size = m_arParagraphs[i].m_arSpans[j].m_strText.length();
int lFoundEnter = m_arParagraphs[i].m_arSpans[j].m_strText.find((TCHAR)13); int lFoundEnter = m_arParagraphs[i].m_arSpans[j].m_strText.find((wchar_t)13);
if( !split_paragraph && lFoundEnter >= 0 && (s_size > 1 || (s_size == 1 && m_arParagraphs[i].m_arSpans.size() > 1))) if( !split_paragraph && lFoundEnter >= 0 && (s_size > 1 || (s_size == 1 && m_arParagraphs[i].m_arSpans.size() > 1)))
{ {
...@@ -73,7 +73,7 @@ namespace NSPresentationEditor ...@@ -73,7 +73,7 @@ namespace NSPresentationEditor
m_arParagraphs.insert(m_arParagraphs.begin() +i + 1, oNewPar); m_arParagraphs.insert(m_arParagraphs.begin() +i + 1, oNewPar);
} }
int lFoundBreak = m_arParagraphs[i].m_arSpans[j].m_strText.find((TCHAR)11); int lFoundBreak = m_arParagraphs[i].m_arSpans[j].m_strText.find((wchar_t)11);
if( lFoundBreak >= 0) if( lFoundBreak >= 0)
{ {
// разбиваем span // разбиваем span
......
ASCOfficePPTXFile/Editor/Drawing/TextStructures.h
View file @ 78b051c9
...@@ -848,7 +848,7 @@ namespace NSPresentationEditor ...@@ -848,7 +848,7 @@ namespace NSPresentationEditor
size_t nCountS = m_arSpans.size(); size_t nCountS = m_arSpans.size();
for (size_t i = 0; i < nCountS; ++i) for (size_t i = 0; i < nCountS; ++i)
{ {
std::replace( m_arSpans[i].m_strText.begin(), m_arSpans[i].m_strText.end(), (TCHAR)(11), (TCHAR)(13)); std::replace( m_arSpans[i].m_strText.begin(), m_arSpans[i].m_strText.end(), (wchar_t)(11), (wchar_t)(13));
} }
} }
AVSINLINE bool IsEmpty() AVSINLINE bool IsEmpty()
...@@ -861,7 +861,7 @@ namespace NSPresentationEditor ...@@ -861,7 +861,7 @@ namespace NSPresentationEditor
if (nLen > 1) if (nLen > 1)
return false; return false;
if ((nLen == 1) && ((TCHAR)(13) != m_arSpans[i].m_strText[0])) if ((nLen == 1) && ((wchar_t)(13) != m_arSpans[i].m_strText[0]))
return false; return false;
} }
return true; return true;
......
ASCOfficePPTXFile/PPTXFormat/DocxFormat/Namespaces.h
View file @ 78b051c9
...@@ -44,7 +44,7 @@ namespace PPTX ...@@ -44,7 +44,7 @@ namespace PPTX
std::wstring m_strLink; std::wstring m_strLink;
public: public:
Namespace(LPCWSTR sName, LPCWSTR sLink) : m_strName(sName), m_strLink(sLink) Namespace(const wchar_t* sName, const wchar_t* sLink) : m_strName(sName), m_strLink(sLink)
{ {
} }
}; };
......
ASCOfficePPTXFile/PPTXFormat/Logic/Colors/ColorModifier.h
View file @ 78b051c9
...@@ -54,7 +54,7 @@ namespace PPTX ...@@ -54,7 +54,7 @@ namespace PPTX
nullable_string sTmp; nullable_string sTmp;
node.ReadAttributeBase(L"val", sTmp); node.ReadAttributeBase(L"val", sTmp);
if (val.is_init() && sTmp.is_init() && sTmp->find(TCHAR('%')) != -1) if (val.is_init() && sTmp.is_init() && sTmp->find(wchar_t('%')) != -1)
*val = (*val) * 1000; *val = (*val) * 1000;
} }
} }
......
ASCOfficePPTXFile/PPTXFormat/Logic/Runs/Fld.h
View file @ 78b051c9
...@@ -36,7 +36,6 @@ ...@@ -36,7 +36,6 @@
#include "RunBase.h" #include "RunBase.h"
#include "./../RunProperties.h" #include "./../RunProperties.h"
#include "./../TextParagraphPr.h" #include "./../TextParagraphPr.h"
//#include "../../../../Common/DocxFormat/Source/Utility/Encoding.h"
namespace PPTX namespace PPTX
{ {
......
ASCOfficePPTXFile/PPTXFormat/Logic/Runs/Run.h
View file @ 78b051c9
...@@ -35,7 +35,6 @@ ...@@ -35,7 +35,6 @@
#include "RunBase.h" #include "RunBase.h"
#include "./../RunProperties.h" #include "./../RunProperties.h"
//#include "../../../../Common/DocxFormat/Source/Utility/Encoding.h"
namespace PPTX namespace PPTX
{ {
......
ASCOfficePPTXFile/PPTXFormat/Logic/Shape.h
View file @ 78b051c9
...@@ -43,7 +43,6 @@ ...@@ -43,7 +43,6 @@
#include "UniFill.h" #include "UniFill.h"
#include "Ln.h" #include "Ln.h"
//#include "../../../Common/DocxFormat/Source/Utility/Encoding.h"
#include "../../../ASCOfficeDocxFile2/DocWrapper/DocxSerializer.h" #include "../../../ASCOfficeDocxFile2/DocWrapper/DocxSerializer.h"
namespace PPTX namespace PPTX
......
ASCOfficePPTXFile/PPTXFormat/Logic/SmartArt.cpp
View file @ 78b051c9
...@@ -239,13 +239,13 @@ xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\" ...@@ -239,13 +239,13 @@ xmlns:r=\"http://schemas.openxmlformats.org/officeDocument/2006/relationships\"
oXlsxSerializer.setDrawingConverter(&oDrawingConverter); oXlsxSerializer.setDrawingConverter(&oDrawingConverter);
std::wstring strDstChart = pReader->m_pRels->m_pManager->GetDstMedia(); std::wstring strDstChart = pReader->m_pRels->m_pManager->GetDstMedia();
int nPos = strDstChart.rfind(TCHAR('m')); int nPos = strDstChart.rfind(wchar_t('m'));
if (-1 != nPos) if (-1 != nPos)
strDstChart = strDstChart.substr(0, nPos); strDstChart = strDstChart.substr(0, nPos);
strDstChart += L"charts"; strDstChart += L"charts";
//на всякий случай всегда создаем, нет уверенности что 1 == m_lChartNumber для первого chart //на всякий случай всегда создаем, нет уверенности что 1 == m_lChartNumber для первого chart
NSDirectory::CreateDirectoryW(strDstChart); NSDirectory::CreateDirectory(strDstChart);
std::wstring* sContentTypes = NULL; std::wstring* sContentTypes = NULL;
......
ASCOfficePPTXFile/PPTXFormat/Logic/TextFit.h
View file @ 78b051c9
...@@ -73,7 +73,7 @@ namespace PPTX ...@@ -73,7 +73,7 @@ namespace PPTX
if (sFontScale.is_init()) if (sFontScale.is_init())
{ {
int nFound = sFontScale->rfind(TCHAR('%')); int nFound = sFontScale->rfind(wchar_t('%'));
if (nFound < 0) if (nFound < 0)
fontScale = *sFontScale; fontScale = *sFontScale;
else else
...@@ -87,7 +87,7 @@ namespace PPTX ...@@ -87,7 +87,7 @@ namespace PPTX
if (sLnSpcRed.is_init()) if (sLnSpcRed.is_init())
{ {
int nFound = sLnSpcRed->rfind(TCHAR('%')); int nFound = sLnSpcRed->rfind(wchar_t('%'));
if (nFound < 0) if (nFound < 0)
lnSpcReduction = *sLnSpcRed; lnSpcReduction = *sLnSpcRed;
else else
...@@ -123,7 +123,7 @@ namespace PPTX ...@@ -123,7 +123,7 @@ namespace PPTX
if (sFontScale.is_init()) if (sFontScale.is_init())
{ {
int nFound = sFontScale->rfind(TCHAR('%')); int nFound = sFontScale->rfind(wchar_t('%'));
if (nFound < 0) if (nFound < 0)
fontScale = *sFontScale; fontScale = *sFontScale;
else else
...@@ -137,7 +137,7 @@ namespace PPTX ...@@ -137,7 +137,7 @@ namespace PPTX
if (sLnSpcRed.is_init()) if (sLnSpcRed.is_init())
{ {
int nFound = sLnSpcRed->rfind(TCHAR('%')); int nFound = sLnSpcRed->rfind(wchar_t('%'));
if (nFound < 0) if (nFound < 0)
lnSpcReduction = *sLnSpcRed; lnSpcReduction = *sLnSpcRed;
else else
......
ASCOfficeRtfFile/RtfFormatLib/source/Utils.h
View file @ 78b051c9
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
namespace Strings namespace Strings
{ {
static int ToDigit(TCHAR c) static int ToDigit(wchar_t c)
{ {
if (c >= '0' && c <= '9') if (c >= '0' && c <= '9')
return (int)(c - '0'); return (int)(c - '0');
...@@ -618,7 +618,7 @@ public: ...@@ -618,7 +618,7 @@ public:
if (file.CreateFile(sFilename) != S_OK) return; if (file.CreateFile(sFilename) != S_OK) return;
TCHAR * buf = (TCHAR *)sData.c_str(); wchar_t * buf = (wchar_t *)sData.c_str();
int nLengthText = sData.length(); int nLengthText = sData.length();
int nLengthData = nLengthText/2; int nLengthData = nLengthText/2;
BYTE * buf2 = new BYTE[ nLengthData]; BYTE * buf2 = new BYTE[ nLengthData];
...@@ -636,7 +636,7 @@ public: ...@@ -636,7 +636,7 @@ public:
} }
static void WriteDataToBinary( std::wstring sData, BYTE** ppData, long& nSize) static void WriteDataToBinary( std::wstring sData, BYTE** ppData, long& nSize)
{ {
TCHAR * buf = (TCHAR *)sData.c_str(); wchar_t * buf = (wchar_t *)sData.c_str();
int nLengthText = sData.length(); int nLengthText = sData.length();
nSize = nLengthText/2; nSize = nLengthText/2;
BYTE * buf2 = new BYTE[ nSize]; BYTE * buf2 = new BYTE[ nSize];
...@@ -672,7 +672,7 @@ public: ...@@ -672,7 +672,7 @@ public:
} }
return sText; return sText;
} }
static BYTE ToByte( TCHAR cChar ) static BYTE ToByte( wchar_t cChar )
{ {
return (BYTE)(cChar > 'F' ? cChar - 0x57 : cChar > '9' ? cChar - 0x37 : cChar - 0x30); return (BYTE)(cChar > 'F' ? cChar - 0x57 : cChar > '9' ? cChar - 0x37 : cChar - 0x30);
} }
...@@ -788,7 +788,7 @@ public: ...@@ -788,7 +788,7 @@ public:
size_t nconv = 0, avail = (insize) * sizeof(wchar_t); size_t nconv = 0, avail = (insize) * sizeof(wchar_t);
wchar_t *out = new wchar_t[insize]; wchar_t *out = new wchar_t[insize];
nconv = iconv (ic, &inptr, &insize, &out, &avail); nconv = iconv (ic, &inptr, &insize, (char**)&out, &avail);
if (nconv == 0) if (nconv == 0)
{ {
w_out = std::wstring(out); w_out = std::wstring(out);
......
Common/3dParty/curl/Makefile deleted 100644 → 0
View file @ 6e409d2f
This diff is collapsed.
Common/DocxFormat/DocxFormatLib/DocxFormatLib.pro
View file @ 78b051c9
...@@ -74,7 +74,6 @@ SOURCES += \ ...@@ -74,7 +74,6 @@ SOURCES += \
SOURCES += docxformatlib.cpp \ SOURCES += docxformatlib.cpp \
../Source/XML/libxml2/libxml2.cpp \
../Source/Utility/codecvt.cpp \ ../Source/Utility/codecvt.cpp \
../Source/Utility/DateTime.cpp \ ../Source/Utility/DateTime.cpp \
../Source/Utility/TxtFile.cpp \ ../Source/Utility/TxtFile.cpp \
...@@ -91,7 +90,6 @@ HEADERS += docxformatlib.h \ ...@@ -91,7 +90,6 @@ HEADERS += docxformatlib.h \
../Source/Common/Color.h \ ../Source/Common/Color.h \
../Source/Common/Common.h \ ../Source/Common/Common.h \
../Source/Common/ComplexTypes.h \ ../Source/Common/ComplexTypes.h \
../Source/Common/Encoding.h \
../Source/Common/Index.h \ ../Source/Common/Index.h \
../Source/Common/NumFormat.h \ ../Source/Common/NumFormat.h \
../Source/Common/Point.h \ ../Source/Common/Point.h \
...@@ -259,7 +257,6 @@ HEADERS += docxformatlib.h \ ...@@ -259,7 +257,6 @@ HEADERS += docxformatlib.h \
../Source/XlsxFormat/Workbook.h \ ../Source/XlsxFormat/Workbook.h \
../Source/XlsxFormat/WritingElement.h \ ../Source/XlsxFormat/WritingElement.h \
../Source/XlsxFormat/Xlsx.h \ ../Source/XlsxFormat/Xlsx.h \
../Source/XML/libxml2/libxml2.h \
../Source/XML/StringWriter.h \ ../Source/XML/StringWriter.h \
../Source/XML/Utils.h \ ../Source/XML/Utils.h \
../Source/XML/XmlSimple.h \ ../Source/XML/XmlSimple.h \
......
Common/DocxFormat/Source/Base/Base.h
View file @ 78b051c9
...@@ -32,15 +32,20 @@ ...@@ -32,15 +32,20 @@
#pragma once #pragma once
#include <string> #include <string>
#include <stdlib.h>
#include <string.h>
#include <TCHAR.H> #include "unicode_util.h"
#include <WTYPES.H>
#include "../../../DesktopEditor/common/File.h"
#define _T(x) __T(x) #define _T(x) __T(x)
#define __T(x) L##x #define __T(x) L##x
#if defined(_WIN32) || defined (_WIN64) #if defined(_WIN32) || defined (_WIN64)
#include <WTYPES.H>
// windows-stype separator for paths i.e. 'c:\home\documents\file.ext' // windows-stype separator for paths i.e. 'c:\home\documents\file.ext'
#ifndef FILE_SEPARATOR #ifndef FILE_SEPARATOR
#define FILE_SEPARATOR #define FILE_SEPARATOR
#define FILE_SEPARATOR_CHAR '\\' #define FILE_SEPARATOR_CHAR '\\'
...@@ -57,10 +62,8 @@ ...@@ -57,10 +62,8 @@
#define FILE_SEPARATOR_STR _T("/") #define FILE_SEPARATOR_STR _T("/")
#endif #endif
#ifndef _wtof #ifndef _wtof
#define _wtof std::stod #define _wtof std::stod
//#define _wtoi std::stoi
#define _wtoi64(p) std::wcstoll((p),NULL,10) #define _wtoi64(p) std::wcstoll((p),NULL,10)
static int _wtoi(std::wstring sVal) static int _wtoi(std::wstring sVal)
......
Common/DocxFormat/Source/Common/Encoding.h deleted 100644 → 0
View file @ 6e409d2f
This diff is collapsed.
Common/DocxFormat/Source/DocxFormat/Docx.h
View file @ 78b051c9
...@@ -115,7 +115,7 @@ namespace OOX ...@@ -115,7 +115,7 @@ namespace OOX
#if defined(_WIN32) || defined (_WIN64) #if defined(_WIN32) || defined (_WIN64)
CreateDirectoryW( oFilePath.GetPath().c_str(), NULL ); CreateDirectoryW( oFilePath.GetPath().c_str(), NULL );
#else #else
std::string sFileParthUtf8 = stringWstingToUtf8String (oFilePath.GetPath()); std::string sFileParthUtf8 = NSFile::CUtf8Converter::GetUtf8StringFromUnicode(oFilePath.GetPath());
mkdir (sFileParthUtf8.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH); mkdir (sFileParthUtf8.c_str(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH);
#endif #endif
......
Common/DocxFormat/Source/DocxFormat/Drawing/Drawing.h
View file @ 78b051c9
...@@ -36,7 +36,6 @@ ...@@ -36,7 +36,6 @@
#include "../../Base/Nullable.h" #include "../../Base/Nullable.h"
#include "../../Common/SimpleTypes_Drawing.h" #include "../../Common/SimpleTypes_Drawing.h"
#include "../../Common/SimpleTypes_Shared.h" #include "../../Common/SimpleTypes_Shared.h"
#include "../../Common/Encoding.h"
#include "../WritingElement.h" #include "../WritingElement.h"
#include "../RId.h" #include "../RId.h"
......
Common/DocxFormat/Source/Utility/Encoding.cpp deleted 100644 → 0
View file @ 6e409d2f
This diff is collapsed.
Common/DocxFormat/Source/Utility/Encoding.h deleted 100644 → 0
View file @ 6e409d2f
This diff is collapsed.
Common/DocxFormat/Source/Utility/Utility.h
View file @ 78b051c9
This diff is collapsed.
Common/DocxFormat/Source/XML/Utils.h
View file @ 78b051c9
This diff is collapsed.
DesktopEditor/agg-2.4/Makefile deleted 100644 → 0
View file @ 6e409d2f
This diff is collapsed.
DesktopEditor/agg-2.4/examples/BeOS/Makefile deleted 100644 → 0
View file @ 6e409d2f
This diff is collapsed.
DesktopEditor/agg-2.4/examples/X11/Makefile deleted 100644 → 0
View file @ 6e409d2f
This diff is collapsed.
DesktopEditor/agg-2.4/examples/macosx_carbon/Makefile deleted 100644 → 0
View file @ 6e409d2f
This diff is collapsed.
DesktopEditor/agg-2.4/examples/macosx_sdl/Makefile deleted 100644 → 0
View file @ 6e409d2f
This diff is collapsed.
DesktopEditor/agg-2.4/examples/win32_api/Makefile deleted 100644 → 0
View file @ 6e409d2f
This diff is collapsed.
DesktopEditor/agg-2.4/examples/win32_api_dmc/Makefile deleted 100644 → 0
View file @ 6e409d2f
This diff is collapsed.
DesktopEditor/agg-2.4/src/Makefile deleted 100644 → 0
View file @ 6e409d2f
This diff is collapsed.
DesktopEditor/common/StringBuilder.h
View file @ 78b051c9
This diff is collapsed.
DesktopEditor/common/Types.h
View file @ 78b051c9
This diff is collapsed.
DesktopEditor/cximage/jbig/Makefile deleted 100644 → 0
View file @ 6e409d2f
This diff is collapsed.
DesktopEditor/cximage/zlib/Makefile deleted 100644 → 0
View file @ 6e409d2f
This diff is collapsed.
DesktopEditor/freetype-2.5.2/Makefile deleted 100644 → 0
View file @ 6e409d2f
This diff is collapsed.
DesktopEditor/freetype-2.5.2/builds/amiga/makefile deleted 100644 → 0
View file @ 6e409d2f
This diff is collapsed.
DesktopEditor/freetype_names/freetype-2.5.3/Makefile deleted 100644 → 0
View file @ 6e409d2f
This diff is collapsed.
DesktopEditor/xml/include/xmlutils.h
View file @ 78b051c9
This diff is collapsed.
DesktopEditor/xml/libxml2/VxWorks/Makefile deleted 100644 → 0
View file @ 6e409d2f
This diff is collapsed.
Makefile deleted 100644 → 0
View file @ 6e409d2f
This diff is collapsed.
OfficeUtils/src/zlib-1.2.3/Makefile deleted 100644 → 0
View file @ 6e409d2f
This diff is collapsed.
X2tConverter/src/ASCConverters.cpp deleted 100644 → 0
View file @ 6e409d2f
This diff is collapsed.
X2tConverter/src/cextracttools.h
View file @ 78b051c9
This diff is collapsed.
XlsxSerializerCom/Common/Common.cpp
View file @ 78b051c9
This diff is collapsed.
XlsxSerializerCom/Reader/BinaryWriter.h
View file @ 78b051c9
This diff is collapsed.
XlsxSerializerCom/Writer/BinaryReader.h
View file @ 78b051c9
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7