From a5f70c97409e89d33dabda3943482ecba3223538 Mon Sep 17 00:00:00 2001 From: ElenaSubbotina Date: Fri, 31 Mar 2017 16:29:15 +0300 Subject: [PATCH] x2t - change projects --- .../Linux/ASCOfficeDocxFile2Lib.pro | 8 +- ASCOfficeOdfFileW/linux/OdfFileWriterLib.pro | 26 +- .../linux/odffilewriterlib_odf.cpp | 8 + .../Linux/PPTXFormatLib/PPTXFormatLib.pro | 1 - .../DocxFormatLib/DocxFormatLib.pro | 35 +- .../DocxFormatLib/docxformatlib_logic.cpp | 3 - .../DocxFormat/Drawing/DrawingCoreInfo.cpp | 312 ------------------ X2tConverter/build/Qt/X2tConverter.pri | 2 +- 8 files changed, 37 insertions(+), 358 deletions(-) delete mode 100644 Common/DocxFormat/Source/DocxFormat/Drawing/DrawingCoreInfo.cpp diff --git a/ASCOfficeDocxFile2/Linux/ASCOfficeDocxFile2Lib.pro b/ASCOfficeDocxFile2/Linux/ASCOfficeDocxFile2Lib.pro index 9298ce5fe0..eb938a5bb4 100644 --- a/ASCOfficeDocxFile2/Linux/ASCOfficeDocxFile2Lib.pro +++ b/ASCOfficeDocxFile2/Linux/ASCOfficeDocxFile2Lib.pro @@ -42,15 +42,15 @@ SOURCES += \ ../../XlsxSerializerCom/Reader/CommonWriter.cpp \ ../../XlsxSerializerCom/Reader/CSVReader.cpp \ ../../XlsxSerializerCom/Writer/CSVWriter.cpp \ - ../../OfficeCryptReader/source/ECMACryptReader.cpp \ - ../../OfficeCryptReader/source/CryptTransform.cpp + ../../OfficeCryptReader/source/ECMACryptFile.cpp \ + ../../OfficeCryptReader/source/CryptTransform.cpp \ + ../BinReader/Readers.cpp HEADERS += ../DocWrapper/DocxSerializer.h \ ../DocWrapper/FontProcessor.h \ ../DocWrapper/XlsxSerializer.h \ ../BinReader/ChartWriter.h \ ../BinReader/CommentsWriter.h \ - ../BinReader/ContentTypesWriter.h \ ../BinReader/DocumentRelsWriter.h \ ../BinReader/DocumentWriter.h \ ../BinReader/FileWriter.h \ @@ -78,5 +78,5 @@ HEADERS += ../DocWrapper/DocxSerializer.h \ ../../Common/FileDownloader/FileDownloader.h \ ../BinReader/DefaultThemeWriter.h \ ../DocWrapper/ChartWriter.h \ - ../../OfficeCryptReader/source/ECMACryptReader.h \ + ../../OfficeCryptReader/source/ECMACryptFile.h \ ../../OfficeCryptReader/source/CryptTransform.h diff --git a/ASCOfficeOdfFileW/linux/OdfFileWriterLib.pro b/ASCOfficeOdfFileW/linux/OdfFileWriterLib.pro index 114e3d2344..3e29dbae21 100644 --- a/ASCOfficeOdfFileW/linux/OdfFileWriterLib.pro +++ b/ASCOfficeOdfFileW/linux/OdfFileWriterLib.pro @@ -98,16 +98,25 @@ SOURCES += \ ../source/OdfFormat/text_elements.cpp \ ../source/OdfFormat/odf_settings_context.cpp \ ../source/OdfFormat/office_settings.cpp \ - ../source/OdfFormat/mediaitems_utils.cpp + ../source/OdfFormat/mediaitems_utils.cpp \ + ../source/OdfFormat/anim_elements.cpp \ + ../source/OdfFormat/draw_page.cpp \ + ../source/OdfFormat/logging.cpp \ + ../source/OdfFormat/odp_conversion_context.cpp \ + ../source/OdfFormat/odp_page_state.cpp \ + ../source/OdfFormat/odp_slide_context.cpp \ + ../source/OdfFormat/office_presentation.cpp \ + ../source/OdfFormat/style_presentation.cpp \ } SOURCES += \ - ../source/Oox2OdfConverter/ConvertDiagram.cpp \ ../source/Oox2OdfConverter/Converter.cpp \ ../source/Oox2OdfConverter/ConverterChart.cpp \ ../source/Oox2OdfConverter/ConvertVml.cpp \ ../source/Oox2OdfConverter/DocxConverter.cpp \ - ../source/Oox2OdfConverter/XlsxConverter.cpp + ../source/Oox2OdfConverter/XlsxConverter.cpp \ + ../source/Oox2OdfConverter/ConvertDrawing.cpp \ + ../source/Oox2OdfConverter/PptxConverter.cpp HEADERS += \ ../source/OdfFormat/abstract_xml.h \ @@ -189,4 +198,13 @@ HEADERS += \ ../source/OdfFormat/Shapes/oox_shapeStars.h \ ../source/OdfFormat/Shapes/oox_shapeWordArt.h \ ../source/OdfFormat/odf_settings_context.h \ - ../source/OdfFormat/office_settings.h + ../source/OdfFormat/office_settings.h \ + ../source/OdfFormat/anim_elements.h \ + ../source/OdfFormat/draw_page.h \ + ../source/OdfFormat/mediaitems_utils.h \ + ../source/OdfFormat/odp_conversion_context.h \ + ../source/OdfFormat/odp_page_state.h \ + ../source/OdfFormat/odp_slide_context.h \ + ../source/OdfFormat/office_presentation.h \ + ../source/OdfFormat/style_presentation.h \ + ../source/Oox2OdfConverter/PptxConverter.h diff --git a/ASCOfficeOdfFileW/linux/odffilewriterlib_odf.cpp b/ASCOfficeOdfFileW/linux/odffilewriterlib_odf.cpp index b2f5c2e211..c0da3461b8 100644 --- a/ASCOfficeOdfFileW/linux/odffilewriterlib_odf.cpp +++ b/ASCOfficeOdfFileW/linux/odffilewriterlib_odf.cpp @@ -84,3 +84,11 @@ #include "../source/OdfFormat/odf_settings_context.cpp" #include "../source/OdfFormat/office_settings.cpp" #include "../source/OdfFormat/mediaitems_utils.cpp" +#include "../source/OdfFormat/anim_elements.cpp" +#include "../source/OdfFormat/draw_page.cpp" +#include "../source/OdfFormat/logging.cpp" +#include "../source/OdfFormat/odp_conversion_context.cpp" +#include "../source/OdfFormat/odp_page_state.cpp" +#include "../source/OdfFormat/odp_slide_context.cpp" +#include "../source/OdfFormat/office_presentation.cpp" +#include "../source/OdfFormat/style_presentation.cpp" diff --git a/ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro b/ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro index 0e6cf44e44..81202f6c4a 100644 --- a/ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro +++ b/ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro @@ -497,7 +497,6 @@ HEADERS += pptxformatlib.h \ ../../../Editor/DefaultNotesMaster.h \ ../../../Editor/DefaultNotesTheme.h \ ../../../../Common/DocxFormat/Source/Base/Nullable.h \ - ../../../../Common/DocxFormat/Source/XML/xmlutils.h \ ../../../../HtmlRenderer/include/ASCSVGWriter.h \ ../../../../Common/FileDownloader/FileDownloader.h \ ../../../PPTXFormat/ShowPr/Browse.h \ diff --git a/Common/DocxFormat/DocxFormatLib/DocxFormatLib.pro b/Common/DocxFormat/DocxFormatLib/DocxFormatLib.pro index e05fe738b1..75d2523f86 100644 --- a/Common/DocxFormat/DocxFormatLib/DocxFormatLib.pro +++ b/Common/DocxFormat/DocxFormatLib/DocxFormatLib.pro @@ -37,8 +37,6 @@ SOURCES += \ core_debug { SOURCES += \ - ../Source/DocxFormat/Drawing/DrawingCoreInfo.cpp \ - ../Source/DocxFormat/Drawing/DrawingEffects.cpp \ ../Source/DocxFormat/Logic/AlternateContent.cpp \ ../Source/DocxFormat/Logic/Annotations.cpp \ ../Source/DocxFormat/Logic/Bdo.cpp \ @@ -64,7 +62,6 @@ SOURCES += \ ../Source/DocxFormat/FileFactory.cpp \ ../Source/DocxFormat/IFileContainer.cpp \ ../Source/XlsxFormat/FileFactory_Spreadsheet.cpp \ - ../Source/XlsxFormat/IFileContainer_Spreadsheet.cpp \ ../Source/DocxFormat/Drawing/DrawingExt.cpp \ ../Source/Common/Align.cpp \ ../Source/Common/Color.cpp \ @@ -111,23 +108,8 @@ HEADERS += docxformatlib.h \ ../Source/Common/Wrap.h \ ../Source/Common/ZIndex.h \ ../Source/DocxFormat/Drawing/Drawing.h \ - ../Source/DocxFormat/Drawing/Drawing3D.h \ ../Source/DocxFormat/Drawing/DrawingBody.h \ - ../Source/DocxFormat/Drawing/DrawingColors.h \ - ../Source/DocxFormat/Drawing/DrawingCoreInfo.h \ - ../Source/DocxFormat/Drawing/DrawingEffects.h \ ../Source/DocxFormat/Drawing/DrawingExt.h \ - ../Source/DocxFormat/Drawing/DrawingGraphic.h \ - ../Source/DocxFormat/Drawing/DrawingParagraph.h \ - ../Source/DocxFormat/Drawing/DrawingParagraphElements.h \ - ../Source/DocxFormat/Drawing/DrawingPicture.h \ - ../Source/DocxFormat/Drawing/DrawingRun.h \ - ../Source/DocxFormat/Drawing/DrawingShape.h \ - ../Source/DocxFormat/Drawing/DrawingShared.h \ - ../Source/DocxFormat/Drawing/DrawingStyles.h \ - ../Source/DocxFormat/Drawing/DrawingStyles2.h \ - ../Source/DocxFormat/Drawing/DrawingTables.h \ - ../Source/DocxFormat/Drawing/DrawingTransform.h \ ../Source/DocxFormat/External/External.h \ ../Source/DocxFormat/External/ExternalAudio.h \ ../Source/DocxFormat/External/ExternalImage.h \ @@ -167,8 +149,6 @@ HEADERS += docxformatlib.h \ ../Source/DocxFormat/Media/Video.h \ ../Source/DocxFormat/Settings/Settings.h \ ../Source/DocxFormat/Settings/WebSettings.h \ - ../Source/DocxFormat/Theme/Theme.h \ - ../Source/DocxFormat/Theme/ThemeOverride.h \ ../Source/DocxFormat/App.h \ ../Source/DocxFormat/Bibliography.h \ ../Source/DocxFormat/Comments.h \ @@ -198,11 +178,6 @@ HEADERS += docxformatlib.h \ ../Source/DocxFormat/Unit.h \ ../Source/DocxFormat/UnknowTypeFile.h \ ../Source/DocxFormat/WritingElement.h \ - ../Source/DocxFormat/WritingVector.h \ - ../Source/SystemUtility/FileSystem/Directory.h \ - ../Source/SystemUtility/FileSystem/File.h \ - ../Source/SystemUtility/FileSystem/FileSystem.h \ - ../Source/SystemUtility/FileSystem/Settings.h \ ../Source/SystemUtility/SystemUtility.h \ ../Source/Utility/codecvt.h \ ../Source/Utility/DateTime.h \ @@ -216,10 +191,7 @@ HEADERS += docxformatlib.h \ ../Source/XlsxFormat/Drawing/CellAnchor.h \ ../Source/XlsxFormat/Drawing/Drawing.h \ ../Source/XlsxFormat/Drawing/FromTo.h \ - ../Source/XlsxFormat/Drawing/Image.h \ - ../Source/XlsxFormat/Drawing/Pic.h \ ../Source/XlsxFormat/Drawing/Pos.h \ - ../Source/XlsxFormat/Drawing/Shape.h \ ../Source/XlsxFormat/SharedStrings/PhoneticPr.h \ ../Source/XlsxFormat/SharedStrings/rPr.h \ ../Source/XlsxFormat/SharedStrings/Run.h \ @@ -256,16 +228,12 @@ HEADERS += docxformatlib.h \ ../Source/XlsxFormat/ComplexTypes_Spreadsheet.h \ ../Source/XlsxFormat/FileFactory_Spreadsheet.h \ ../Source/XlsxFormat/FileTypes_Spreadsheet.h \ - ../Source/XlsxFormat/IFileContainer_Spreadsheet.h \ ../Source/XlsxFormat/SimpleTypes_Spreadsheet.h \ ../Source/XlsxFormat/Workbook.h \ ../Source/XlsxFormat/WritingElement.h \ ../Source/XlsxFormat/Xlsx.h \ ../Source/XML/Utils.h \ ../Source/XML/XmlSimple.h \ - ../Source/DocxFormat/Drawing/DrawingShapeElements.h \ - ../Source/DocxFormat/Drawing/DrawingText.h \ - ../Source/DocxFormat/Drawing/DrawingTextProperties.h \ ../Source/MathEquation/LEStream.h \ ../Source/MathEquation/MathEquation.h \ ../Source/MathEquation/OutputDev.h \ @@ -277,4 +245,5 @@ HEADERS += docxformatlib.h \ ../Source/XlsxFormat/ExternalLinks/ExternalLinks.h \ ../Source/XlsxFormat/Worksheets/Sparkline.h \ ../Source/XlsxFormat/Ole/OleObjects.h \ - ../Source/DocxFormat/Diagram/DiagramData.h + ../Source/DocxFormat/Diagram/DiagramData.h \ + ../Source/DocxFormat/Diagram/DiagramDrawing.h diff --git a/Common/DocxFormat/DocxFormatLib/docxformatlib_logic.cpp b/Common/DocxFormat/DocxFormatLib/docxformatlib_logic.cpp index 3d5776e52e..02459833b7 100644 --- a/Common/DocxFormat/DocxFormatLib/docxformatlib_logic.cpp +++ b/Common/DocxFormat/DocxFormatLib/docxformatlib_logic.cpp @@ -30,8 +30,6 @@ * */ -#include "../Source/DocxFormat/Drawing/DrawingCoreInfo.cpp" -#include "../Source/DocxFormat/Drawing/DrawingEffects.cpp" #include "../Source/DocxFormat/Logic/AlternateContent.cpp" #include "../Source/DocxFormat/Logic/Annotations.cpp" #include "../Source/DocxFormat/Logic/Bdo.cpp" @@ -57,7 +55,6 @@ #include "../Source/DocxFormat/FileFactory.cpp" #include "../Source/DocxFormat/IFileContainer.cpp" #include "../Source/XlsxFormat/FileFactory_Spreadsheet.cpp" -#include "../Source/XlsxFormat/IFileContainer_Spreadsheet.cpp" #include "../Source/DocxFormat/Drawing/DrawingExt.cpp" #include "../Source/Common/Align.cpp" #include "../Source/Common/Color.cpp" diff --git a/Common/DocxFormat/Source/DocxFormat/Drawing/DrawingCoreInfo.cpp b/Common/DocxFormat/Source/DocxFormat/Drawing/DrawingCoreInfo.cpp deleted file mode 100644 index 7335d99a2a..0000000000 --- a/Common/DocxFormat/Source/DocxFormat/Drawing/DrawingCoreInfo.cpp +++ /dev/null @@ -1,312 +0,0 @@ -/* - * (c) Copyright Ascensio System SIA 2010-2017 - * - * This program is a free software product. You can redistribute it and/or - * modify it under the terms of the GNU Affero General Public License (AGPL) - * version 3 as published by the Free Software Foundation. In accordance with - * Section 7(a) of the GNU AGPL its Section 15 shall be amended to the effect - * that Ascensio System SIA expressly excludes the warranty of non-infringement - * of any third-party rights. - * - * This program is distributed WITHOUT ANY WARRANTY; without even the implied - * warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. For - * details, see the GNU AGPL at: http://www.gnu.org/licenses/agpl-3.0.html - * - * You can contact Ascensio System SIA at Lubanas st. 125a-25, Riga, Latvia, - * EU, LV-1021. - * - * The interactive user interfaces in modified source and object code versions - * of the Program must display Appropriate Legal Notices, as required under - * Section 5 of the GNU AGPL version 3. - * - * Pursuant to Section 7(b) of the License you must retain the original Product - * logo when distributing the program. Pursuant to Section 7(e) we decline to - * grant you any rights under trademark law for use of our trademarks. - * - * All the Product's GUI elements, including illustrations and icon sets, as - * well as technical writing content are licensed under the terms of the - * Creative Commons Attribution-ShareAlike 4.0 International. See the License - * terms at http://creativecommons.org/licenses/by-sa/4.0/legalcode - * - */ -#include "DrawingCoreInfo.h" - -namespace OOX -{ - namespace Drawing - { - //-------------------------------------------------------------------------------- - // CNonVisualPictureProperties 20.1.2.2.7;20.2.2.2 (Part 1) - //-------------------------------------------------------------------------------- - void CNonVisualPictureProperties::fromXML(XmlUtils::CXmlNode& oNode) - { - m_eType = et_Unknown; - - // TO DO : Реализовать - } - void CNonVisualPictureProperties::fromXML(XmlUtils::CXmlLiteReader& oReader) - { - m_eType = et_Unknown; - - std::wstring sName = oReader.GetName(); - if ( _T("a:cNvPicPr") == sName ) - m_eType = et_a_cNvPicPr; - else if ( _T("p:cNvPicPr") == sName ) - m_eType = et_p_cNvPicPr; - else if ( _T("pic:cNvPicPr") == sName ) - m_eType = et_pic_cNvPicPr; - else - return; - - ReadAttributes( oReader ); - - if ( oReader.IsEmptyNode() ) - return; - - int nCurDepth = oReader.GetDepth(); - while ( oReader.ReadNextSiblingNode( nCurDepth ) ) - { - sName = oReader.GetName(); - if ( _T("a:picLocks") == sName ) - m_oPicLocks = oReader; - else if ( _T("a:extLst") == sName ) - m_oExtLst = oReader; - } - } - std::wstring CNonVisualPictureProperties::toXML() const - { - std::wstring sResult; - - if ( et_a_cNvPicPr == m_eType ) - sResult = _T(""); - - if ( m_oPicLocks.IsInit() ) - sResult += m_oPicLocks->toXML(); - - if ( m_oExtLst.IsInit() ) - sResult += m_oExtLst->toXML(); - - if ( et_a_cNvPicPr == m_eType ) - sResult += _T(""); - else if ( et_p_cNvPicPr == m_eType ) - sResult += _T(""); - else if ( et_pic_cNvPicPr == m_eType ) - sResult += _T(""); - - return sResult; - } - //-------------------------------------------------------------------------------- - // CNonVisualDrawingProps 20.1.2.2.8;20.2.2.3;20.4.2.5 (Part 1) - //-------------------------------------------------------------------------------- - void CNonVisualDrawingProps::fromXML(XmlUtils::CXmlNode& oNode) - { - m_eType = et_Unknown; - - // TO DO: Реализовать - } - void CNonVisualDrawingProps::fromXML(XmlUtils::CXmlLiteReader& oReader) - { - ReadAttributes( oReader ); - - m_eType = et_Unknown; - std::wstring sName = oReader.GetName(); - - if ( _T("wp:docPr") == sName ) - m_eType = et_wp_docPr; - else if ( _T("p:cNvPr") == sName ) - m_eType = et_p_cNvPr; - else if ( _T("pic:cNvPr") == sName ) - m_eType = et_pic_cNvPr; - else if ( _T("xdr:cNvPr") == sName ) - m_eType = et_xdr_cNvPr; - else if ( _T("wps:cNvPr") == sName ) - m_eType = et_w_cNvPr; - else if ( _T("dsp:cNvPr") == sName ) - m_eType = et_dsp_cNvPr; - else - return; - - if ( oReader.IsEmptyNode() ) - return; - - int nCurDepth = oReader.GetDepth(); - while( oReader.ReadNextSiblingNode( nCurDepth ) ) - { - sName = oReader.GetName(); - if ( _T("a:extLst") == sName ) - m_oExtLst = oReader; - else if ( _T("a:hlinkClick") == sName ) - m_oHlinkClick = oReader; - else if ( _T("a:hlinkHover") == sName ) - m_oHlinkHover = oReader; - } - } - void CNonVisualDrawingProps::toXML(XmlUtils::CStringWriter& writer) const - { - std::wstring sResult = toXML(); - writer.WriteString(sResult); - } - std::wstring CNonVisualDrawingProps::toXML() const - { - std::wstring sResult = _T("ToString() + _T("\" "); - if ( m_oId.IsInit() ) sResult += _T("id=\"") + m_oId->ToString() + _T("\" "); - if ( m_sName.IsInit() ) - { - sResult += _T("name=\""); - sResult += m_sName.get2(); - sResult += _T("\" "); - } - if ( m_sTitle.IsInit() ) - { - sResult += _T("title=\""); - sResult += m_sTitle.get2(); - sResult += _T("\" "); - } - - sResult += _T(">"); - - if ( m_oExtLst.IsInit() ) - sResult += m_oExtLst->toXML(); - if ( m_oHlinkClick.IsInit() ) - sResult += m_oHlinkClick->toXML(); - if ( m_oHlinkHover.IsInit() ) - sResult += m_oHlinkHover->toXML(); - - if ( et_wp_docPr == m_eType ) - sResult += _T(""); - else if ( et_p_cNvPr == m_eType ) - sResult += _T(""); - else if ( et_pic_cNvPr == m_eType ) - sResult += _T(""); - else if ( et_w_cNvPr == m_eType ) - sResult += _T(""); - else if ( et_xdr_cNvPr == m_eType ) - sResult += _T(""); - else if ( et_dsp_cNvPr == m_eType ) - sResult += _T(""); - return sResult; - } - //-------------------------------------------------------------------------------- - // CHyperlink 20.1.2.2.23;21.1.2.3.5 (Part 1) - //-------------------------------------------------------------------------------- - void CHyperlink::fromXML(XmlUtils::CXmlNode& oNode) - { - // TO DO: Реализовать - } - void CHyperlink::fromXML(XmlUtils::CXmlLiteReader& oReader) - { - // Определим тип текущей ноды - std::wstring sName = oReader.GetName(); - if ( _T("a:hlinkClick") == sName ) - m_eType = et_a_hlinkClick; - else if ( _T("a:hlinkHover") == sName ) - m_eType = et_a_hlinkHover; - - - ReadAttributes( oReader ); - - if ( oReader.IsEmptyNode() ) - return; - - int nCurDepth = oReader.GetDepth(); - while( oReader.ReadNextSiblingNode( nCurDepth ) ) - { - std::wstring sName = oReader.GetName(); - if ( _T("a:extLst") == sName ) - m_oExtLst = oReader; - else if ( _T("a:snd") == sName ) - m_oSnd = oReader; - } - } - std::wstring CHyperlink::toXML() const - { - std::wstring sResult; - - if ( et_a_hlinkClick == m_eType ) - sResult = _T("ToString() + _T("\" "); - if ( m_oHighlightClick.IsInit() ) sResult += _T("highlightClick=\"") + m_oHighlightClick->ToString() + _T("\" "); - if ( m_oHistory.IsInit() ) sResult += _T("history=\"") + m_oHistory->ToString() + _T("\" "); - if ( m_oId.IsInit() ) sResult += _T("r:id=\"") + m_oId->ToString() + _T("\" "); - - if ( m_sInvalidUrl.IsInit() ) - { - sResult += _T("invalidUrl=\""); - sResult += m_sInvalidUrl.get2(); - sResult += _T("\" "); - } - if ( m_sTgtFrame.IsInit() ) - { - sResult += _T("tgtFrame=\""); - sResult += m_sTgtFrame.get2(); - sResult += _T("\" "); - } - if ( m_sTooltip.IsInit() ) - { - sResult += _T("tooltip=\""); - sResult += m_sTooltip.get2(); - sResult += _T("\" "); - } - - sResult += _T(">"); - - if ( m_oExtLst.IsInit() ) - sResult += m_oExtLst->toXML(); - - if ( m_oSnd.IsInit() ) - sResult += m_oSnd->toXML(); - - if ( et_a_hlinkClick == m_eType ) - sResult = _T(""); - else if ( et_a_hlinkHover == m_eType ) - sResult = _T(""); - - return sResult; - } - } // Drawing -} // OOX diff --git a/X2tConverter/build/Qt/X2tConverter.pri b/X2tConverter/build/Qt/X2tConverter.pri index 56e2dc9672..86082fc4b6 100644 --- a/X2tConverter/build/Qt/X2tConverter.pri +++ b/X2tConverter/build/Qt/X2tConverter.pri @@ -7,7 +7,7 @@ QT -= core QT -= gui -VERSION = 2.0.3.448 +VERSION = 2.0.4.448 DEFINES += INTVER=$$VERSION TARGET = x2t