diff --git a/OOXML/Projects/Linux/BinDocument/BinDocument.pro b/OOXML/Projects/Linux/BinDocument/BinDocument.pro index 5f7d9c6838..a448adcaae 100644 --- a/OOXML/Projects/Linux/BinDocument/BinDocument.pro +++ b/OOXML/Projects/Linux/BinDocument/BinDocument.pro @@ -25,12 +25,15 @@ DEFINES += UNICODE \ DONT_WRITE_EMBEDDED_FONTS \ AVS_USE_CONVERT_PPTX_TOCUSTOM_VML +CONFIG += precompile_header +PRECOMPILED_HEADER = precompiled.h +HEADERS += precompiled.h SOURCES += \ ../../../Binary/Document/DocWrapper/DocxSerializer.cpp \ ../../../Binary/Document/DocWrapper/FontProcessor.cpp \ ../../../Binary/Document/DocWrapper/XlsxSerializer.cpp \ - ../../../Binary/Document/DocWrapper/ChartSerializer.cpp \ + ../../../Binary/Document/DocWrapper/ChartSerializer.cpp \ ../../../Binary/Document/BinWriter/BinWriters.cpp \ ../../../Binary/Sheets/Common/Common.cpp \ ../../../Binary/Sheets/Reader/ChartFromToBinary.cpp \ diff --git a/OOXML/Projects/Linux/BinDocument/precompiled.h b/OOXML/Projects/Linux/BinDocument/precompiled.h new file mode 100644 index 0000000000..d5a90bd57e --- /dev/null +++ b/OOXML/Projects/Linux/BinDocument/precompiled.h @@ -0,0 +1,19 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "../../../Binary/Document/BinWriter/BinReaderWriterDefines.h" +#include "../../../Binary/Sheets/Common/BinReaderWriterDefines.h" +#include "../../../Binary/Sheets/Common/Common.h" diff --git a/OOXML/Projects/Linux/DocxFormatLib/DocxFormatLib.pro b/OOXML/Projects/Linux/DocxFormatLib/DocxFormatLib.pro index 03ffd66156..787e7c0dc0 100644 --- a/OOXML/Projects/Linux/DocxFormatLib/DocxFormatLib.pro +++ b/OOXML/Projects/Linux/DocxFormatLib/DocxFormatLib.pro @@ -22,6 +22,10 @@ DEFINES += UNICODE _UNICODE \ #BOOST include($$PWD/../../../../Common/3dParty/boost/boost.pri) +CONFIG += precompile_header +PRECOMPILED_HEADER = precompiled.h +HEADERS += precompiled.h + core_release { SOURCES += \ docx_format_logic.cpp diff --git a/OOXML/Projects/Linux/DocxFormatLib/precompiled.h b/OOXML/Projects/Linux/DocxFormatLib/precompiled.h new file mode 100644 index 0000000000..770201a9de --- /dev/null +++ b/OOXML/Projects/Linux/DocxFormatLib/precompiled.h @@ -0,0 +1,71 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "../../../Base/Base.h" +#include "../../../Base/Nullable.h" +#include "../../../Common/ComplexTypes.h" +#include "../../../Common/SimpleTypes_Shared.h" +#include "../../../Common/SimpleTypes_Word.h" +#include "../../../Common/Unit.h" +#include "../../../DocxFormat/Drawing/Drawing.h" +#include "../../../DocxFormat/External/HyperLink.h" +#include "../../../DocxFormat/Logic/Annotations.h" +#include "../../../DocxFormat/Logic/Hyperlink.h" +#include "../../../DocxFormat/Logic/Paragraph.h" +#include "../../../DocxFormat/Logic/ParagraphProperty.h" +#include "../../../DocxFormat/Logic/Run.h" +#include "../../../DocxFormat/Logic/RunProperty.h" +#include "../../../DocxFormat/Logic/Sdt.h" +#include "../../../DocxFormat/Logic/Shape.h" +#include "../../../DocxFormat/Logic/Table.h" +#include "../../../DocxFormat/Math/OMath.h" +#include "../../../DocxFormat/Math/oMathPara.h" +#include "../../../DocxFormat/Media/Image.h" +#include "../../../DocxFormat/Media/Media.h" +#include "../../../DocxFormat/Media/OleObject.h" +#include "../../../DocxFormat/App.h" +#include "../../../DocxFormat/Comments.h" +#include "../../../DocxFormat/Core.h" +#include "../../../DocxFormat/CustomXml.h" +#include "../../../DocxFormat/Document.h" +#include "../../../DocxFormat/Docx.h" +#include "../../../DocxFormat/DocxFlat.h" +#include "../../../DocxFormat/File.h" +#include "../../../DocxFormat/FileTypes.h" +#include "../../../DocxFormat/IFileContainer.h" +#include "../../../DocxFormat/RId.h" +#include "../../../DocxFormat/Styles.h" +#include "../../../DocxFormat/Unit.h" +#include "../../../DocxFormat/WritingElement.h" +#include "../../../SystemUtility/SystemUtility.h" +#include "../../../Base/Unit.h" +#include "../../../XlsxFormat/Comments/Comments.h" +#include "../../../XlsxFormat/Drawing/Drawing.h" +#include "../../../XlsxFormat/SharedStrings/Run.h" +#include "../../../XlsxFormat/SharedStrings/SharedStrings.h" +#include "../../../XlsxFormat/Styles/rPr.h" +#include "../../../XlsxFormat/Styles/Styles.h" +#include "../../../XlsxFormat/Styles/TableStyles.h" +#include "../../../XlsxFormat/Table/Table.h" +#include "../../../XlsxFormat/Workbook/Workbook.h" +#include "../../../XlsxFormat/Worksheets/Worksheet.h" +#include "../../../XlsxFormat/Common.h" +#include "../../../XlsxFormat/CommonInclude.h" +#include "../../../XlsxFormat/FileTypes_Spreadsheet.h" +#include "../../../XlsxFormat/WritingElement.h" +#include "../../../XlsxFormat/Xlsx.h" +#include "../../../MathEquation/Types.h" +#include "../../../DocxFormat/Diagram/DiagramData.h" diff --git a/OOXML/Projects/Linux/PPTXFormatLib/PPTXFormatLib.pro b/OOXML/Projects/Linux/PPTXFormatLib/PPTXFormatLib.pro index ac32291a88..f11f9a76de 100644 --- a/OOXML/Projects/Linux/PPTXFormatLib/PPTXFormatLib.pro +++ b/OOXML/Projects/Linux/PPTXFormatLib/PPTXFormatLib.pro @@ -42,6 +42,10 @@ SOURCES += \ pptx_format_logic.cpp } +CONFIG += precompile_header +PRECOMPILED_HEADER = precompiled.h +HEADERS += precompiled.h + core_debug { SOURCES += \ ../../../PPTXFormat/Logic/Media/WavAudioFile.cpp \ diff --git a/OOXML/Projects/Linux/PPTXFormatLib/precompiled.h b/OOXML/Projects/Linux/PPTXFormatLib/precompiled.h new file mode 100644 index 0000000000..eaf0a89519 --- /dev/null +++ b/OOXML/Projects/Linux/PPTXFormatLib/precompiled.h @@ -0,0 +1,42 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "../../../PPTXFormat/FileTypes.h" +#include "../../../PPTXFormat/Limit/BaseLimit.h" +#include "../../../PPTXFormat/Logic/Runs/Run.h" +#include "../../../PPTXFormat/Logic/Table/Table.h" +#include "../../../PPTXFormat/Logic/ClrMap.h" +#include "../../../PPTXFormat/Logic/ExtP.h" +#include "../../../PPTXFormat/Logic/Hyperlink.h" +#include "../../../PPTXFormat/Logic/Paragraph.h" +#include "../../../PPTXFormat/Logic/Shape.h" +#include "../../../PPTXFormat/Logic/SpTree.h" +#include "../../../PPTXFormat/Logic/UniColor.h" +#include "../../../PPTXFormat/Logic/UniFill.h" +#include "../../../PPTXFormat/App.h" +#include "../../../PPTXFormat/Comments.h" +#include "../../../PPTXFormat/Core.h" +#include "../../../PPTXFormat/FileContainer.h" +#include "../../../PPTXFormat/Slide.h" +#include "../../../PPTXFormat/SlideLayout.h" +#include "../../../PPTXFormat/SlideMaster.h" +#include "../../../PPTXFormat/TableStyles.h" +#include "../../../PPTXFormat/Theme.h" +#include "../../../PPTXFormat/WrapperFile.h" +#include "../../../PPTXFormat/WrapperWritingElement.h" +#include "../../../Binary/Presentation/BinaryFileReaderWriter.h" +#include "../../../Binary/Presentation/BinReaderWriterDefines.h" +#include "../../../Base/Nullable.h" diff --git a/OOXML/Projects/Linux/XlsbFormatLib/XlsbFormatLib.pro b/OOXML/Projects/Linux/XlsbFormatLib/XlsbFormatLib.pro index 31c86c0d32..ce14bcea2b 100644 --- a/OOXML/Projects/Linux/XlsbFormatLib/XlsbFormatLib.pro +++ b/OOXML/Projects/Linux/XlsbFormatLib/XlsbFormatLib.pro @@ -22,6 +22,10 @@ DEFINES += DONT_WRITE_EMBEDDED_FONTS #BOOST include($$PWD/../../../../Common/3dParty/boost/boost.pri) +CONFIG += precompile_header +PRECOMPILED_HEADER = precompiled.h +HEADERS += precompiled.h + core_release { SOURCES += \ xlsb_format_logic.cpp diff --git a/OOXML/Projects/Linux/XlsbFormatLib/precompiled.h b/OOXML/Projects/Linux/XlsbFormatLib/precompiled.h new file mode 100644 index 0000000000..64efeaddf1 --- /dev/null +++ b/OOXML/Projects/Linux/XlsbFormatLib/precompiled.h @@ -0,0 +1,34 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "../../../XlsbFormat/Xlsb.h" +#include "../../../XlsbFormat/Biff12_records/ACBegin.h" +#include "../../../XlsbFormat/Biff12_records/ACEnd.h" +#include "../../../XlsbFormat/Biff12_records/Color.h" +#include "../../../XlsbFormat/Biff12_records/CommonRecords.h" +#include "../../../XlsbFormat/Biff12_records/Drawing.h" +#include "../../../XlsbFormat/Biff12_records/FRTBegin.h" +#include "../../../XlsbFormat/Biff12_records/FRTEnd.h" +#include "../../../XlsbFormat/Biff12_records/OleObject.h" +#include "../../../XlsbFormat/Biff12_records/ActiveX.h" +#include "../../../XlsbFormat/Biff12_structures/CellRangeRef.h" +#include "../../../XlsbFormat/Biff12_structures/FRTBlank.h" +#include "../../../XlsbFormat/Biff12_structures/FRTHeader.h" +#include "../../../XlsbFormat/Biff12_structures/RelID.h" +#include "../../../XlsbFormat/Biff12_structures/XLWideString.h" +#include "../../../XlsbFormat/Biff12_structures/PCDISrvFmt.h" +#include "../../../XlsbFormat/Biff12_unions/ACUID.h" +#include "../../../XlsbFormat/Biff12_unions/FRT.h" diff --git a/OdfFile/Projects/Linux/OdfFormatLib.pro b/OdfFile/Projects/Linux/OdfFormatLib.pro index 13e305a43d..23c6dbb7a0 100644 --- a/OdfFile/Projects/Linux/OdfFormatLib.pro +++ b/OdfFile/Projects/Linux/OdfFormatLib.pro @@ -29,6 +29,10 @@ CONFIG(debug, debug|release){ DEFINES += _DEBUG } +CONFIG += precompile_header +PRECOMPILED_HEADER = precompiled.h +HEADERS += precompiled.h + core_release { SOURCES += \ odf_converter.cpp \ diff --git a/OdfFile/Projects/Linux/precompiled.h b/OdfFile/Projects/Linux/precompiled.h new file mode 100644 index 0000000000..15e35ff4ce --- /dev/null +++ b/OdfFile/Projects/Linux/precompiled.h @@ -0,0 +1,49 @@ +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include "../../Common/errors.h" +#include "../../Common/logging.h" +#include "../../Common/CPNoncopyable.h" +#include "../../Common/CPOptional.h" +#include "../../Common/CPScopedPtr.h" +#include "../../Common/CPSharedPtr.h" +#include "../../Common/xml/attributes.h" +#include "../../Common/xml/nodetype.h" +#include "../../Common/xml/simple_xml_writer.h" +#include "../../Common/xml/utils.h" +#include "../../Common/xml/xmlchar.h" +#include "../../Common/xml/xmlelement.h" + +#include "../../DataTypes/bool.h" +#include "../../DataTypes/borderstyle.h" +#include "../../DataTypes/common_attlists.h" +#include "../../DataTypes/length.h" +#include "../../DataTypes/lengthorpercent.h" +#include "../../DataTypes/odfattributes.h" +#include "../../DataTypes/percent.h" +#include "../../DataTypes/verticalalign.h" diff --git a/TxtFile/Source/TxtFormat/File.cpp b/TxtFile/Source/TxtFormat/File.cpp index 1f859b5145..9afbfca07e 100644 --- a/TxtFile/Source/TxtFormat/File.cpp +++ b/TxtFile/Source/TxtFormat/File.cpp @@ -106,30 +106,13 @@ namespace NSEncoding } else { - static const std::map::const_iterator pFind = NSUnicodeConverter::mapEncodingsICU.find(code_page); + const NSUnicodeConverter::EncodindId& oEncodindId = NSUnicodeConverter::Encodings[code_page]; + NSUnicodeConverter::CUnicodeConverter oUnicodeConverter; - if (pFind != NSUnicodeConverter::mapEncodingsICU.end()) + for (std::vector::const_iterator iter = lines.begin(); iter != lines.end(); iter++) { - const NSUnicodeConverter::EncodindId& oEncodindId = NSUnicodeConverter::Encodings[code_page]; - NSUnicodeConverter::CUnicodeConverter oUnicodeConverter; - - for (std::vector::const_iterator iter = lines.begin(); iter != lines.end(); iter++) - { - result.push_back(oUnicodeConverter.fromUnicode(*iter, pFind->second.c_str())); - } + result.push_back(oUnicodeConverter.fromUnicode(*iter, oEncodindId.Name)); } - else - { - //by index ??? - const NSUnicodeConverter::EncodindId& oEncodindId = NSUnicodeConverter::Encodings[code_page]; - NSUnicodeConverter::CUnicodeConverter oUnicodeConverter; - - for (std::vector::const_iterator iter = lines.begin(); iter != lines.end(); iter++) - { - result.push_back(oUnicodeConverter.fromUnicode(*iter, oEncodindId.Name)); - } - } - } return result; } @@ -179,7 +162,7 @@ namespace Txt if (file.isUtf8()) { - m_listContent = NSEncoding::transformToUnicode(file.readUtf8(), 65001); + m_listContent = NSEncoding::transformToUnicode(file.readUtf8(), 46); //65001 Unicode (UTF-8) } else if (file.isUnicode()) { @@ -197,7 +180,7 @@ namespace Txt else { int nCodePage = m_nEncoding; - if (-1 == nCodePage) nCodePage = 65001; + if (-1 == nCodePage) nCodePage = 46; else if (1000 == nCodePage) nCodePage = -1; m_listContent = NSEncoding::transformToUnicode(file.readAnsiOrCodePage(), nCodePage); @@ -209,7 +192,7 @@ namespace Txt void File::write(const std::wstring& filename) const { TxtFile file(filename); - file.writeUtf8(NSEncoding::transformFromUnicode(m_listContent, 65001)); + file.writeUtf8(NSEncoding::transformFromUnicode(m_listContent, 46)); } void File::writeCodePage(const std::wstring& filename, int code_page) const @@ -221,7 +204,7 @@ namespace Txt void File::writeUtf8(const std::wstring& filename) const { TxtFile file(filename); - file.writeUtf8(NSEncoding::transformFromUnicode(m_listContent, 65001)); + file.writeUtf8(NSEncoding::transformFromUnicode(m_listContent, 46)); } void File::writeUnicode(const std::wstring& filename) const