From 8013237e1129e723e426e95bb919909edb14fdca Mon Sep 17 00:00:00 2001 From: "Elen.Subbotina" Date: Thu, 12 Nov 2015 10:54:54 +0000 Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=B0=D0=B2=D0=BA=D0=B0=20=D0=BF?= =?UTF-8?q?=D1=83=D1=82=D0=B5=D0=B9=20=D0=B2=20=D0=BB=D0=B8=D0=BD=D1=83?= =?UTF-8?q?=D1=85=D0=BE=D0=B2=D0=BE=D0=B9=20=D0=B2=D0=B5=D1=82=D0=BA=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@65763 954022d7-b5bf-4e40-9824-e11837661b57 --- ASCOfficePPTXFile/Editor/Drawing/Attributes.h | 12 ++++---- ASCOfficePPTXFile/Editor/Drawing/Effects.h | 2 +- ASCOfficePPTXFile/Editor/Drawing/Elements.h | 2 +- .../Editor/Drawing/Interactive.h | 2 +- ASCOfficePPTXFile/Editor/Drawing/Metric.h | 4 +-- .../Shapes/BaseShape/PPTShape/Formula.cpp | 3 +- .../PPTShape/ppt2pptxshapeconverter.h | 2 +- .../Shapes/BaseShape/PPTXShape/Formula.h | 2 +- .../Editor/Drawing/TextAttributesEx.h | 2 +- .../Editor/Drawing/TextStructures.h | 2 +- .../Editor/Drawing/XmlStringWriter.h | 2 +- .../PPTXFormat/Logic/Geometry.cpp | 5 ++-- .../Linux/PPTXFormatLib/PPTXFormatLib.pro | 2 +- ASCOfficeXlsFile2/linux/XlsFileConverter.pro | 30 ++++++++++++++++++- 14 files changed, 50 insertions(+), 22 deletions(-) diff --git a/ASCOfficePPTXFile/Editor/Drawing/Attributes.h b/ASCOfficePPTXFile/Editor/Drawing/Attributes.h index b7989598ef..ace3d0a748 100644 --- a/ASCOfficePPTXFile/Editor/Drawing/Attributes.h +++ b/ASCOfficePPTXFile/Editor/Drawing/Attributes.h @@ -4,17 +4,17 @@ #include #include #else - #include "../../ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/linux_gdiplus.h" + #include "../../PPTXLib/Linux/PPTXFormatLib/linux_gdiplus.h" #endif #include "Metric.h" #include "Effects.h" -//#include "../../Common/DocxFormat/Source/XML/xmlutils.h" -#include "../../Common/ASCUtils.h" -#include "./XmlWriter.h" -#include "../../DesktopEditor/graphics/IRenderer.h" -#include "../../DesktopEditor/graphics/structures.h" +#include "../../../Common/ASCUtils.h" +#include "./XmlStringWriter.h" + +#include "../../../DesktopEditor/graphics/IRenderer.h" +#include "../../../DesktopEditor/graphics/structures.h" namespace NSPresentationEditor diff --git a/ASCOfficePPTXFile/Editor/Drawing/Effects.h b/ASCOfficePPTXFile/Editor/Drawing/Effects.h index dfa2cba397..43d5e53f0b 100644 --- a/ASCOfficePPTXFile/Editor/Drawing/Effects.h +++ b/ASCOfficePPTXFile/Editor/Drawing/Effects.h @@ -6,7 +6,7 @@ #include #include #else - #include "../../Common/DocxFormat/Source/Base/ASCString.h" + #include "../../../Common/DocxFormat/Source/Base/ASCString.h" #endif diff --git a/ASCOfficePPTXFile/Editor/Drawing/Elements.h b/ASCOfficePPTXFile/Editor/Drawing/Elements.h index eed6afd0ef..917e269ce3 100644 --- a/ASCOfficePPTXFile/Editor/Drawing/Elements.h +++ b/ASCOfficePPTXFile/Editor/Drawing/Elements.h @@ -3,7 +3,7 @@ #include "Shapes/Shape.h" #ifndef DISABLE_FILE_DOWNLOADER - #include "../../Common/FileDownloader.h" + #include "../../../Common/FileDownloader.h" #endif diff --git a/ASCOfficePPTXFile/Editor/Drawing/Interactive.h b/ASCOfficePPTXFile/Editor/Drawing/Interactive.h index 1725a0c4c1..c5bfe39799 100644 --- a/ASCOfficePPTXFile/Editor/Drawing/Interactive.h +++ b/ASCOfficePPTXFile/Editor/Drawing/Interactive.h @@ -2,7 +2,7 @@ #include "Attributes.h" #if !defined(_WIN32) && !defined(_WIN64) - #include "../../DesktopEditor/common/ASCVariant.h" + #include "../../../DesktopEditor/common/ASCVariant.h" #endif namespace NSPresentationEditor diff --git a/ASCOfficePPTXFile/Editor/Drawing/Metric.h b/ASCOfficePPTXFile/Editor/Drawing/Metric.h index 30e6f51df2..5d19bb3a90 100644 --- a/ASCOfficePPTXFile/Editor/Drawing/Metric.h +++ b/ASCOfficePPTXFile/Editor/Drawing/Metric.h @@ -2,8 +2,8 @@ #include #if !defined(_WIN32) && !defined(_WIN64) - #include "./../../DesktopEditor/common/ASCVariant.h" - #include "../../Common/DocxFormat/Source/Base/ASCString.h" + #include "../../../DesktopEditor/common/ASCVariant.h" + #include "../../../Common/DocxFormat/Source/Base/ASCString.h" #endif namespace NSPresentationEditor diff --git a/ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/PPTShape/Formula.cpp b/ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/PPTShape/Formula.cpp index 2e260b32a0..a103b23b1d 100644 --- a/ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/PPTShape/Formula.cpp +++ b/ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/PPTShape/Formula.cpp @@ -1,6 +1,7 @@ #pragma once -//#include "stdafx.h" + #include "Formula.h" + LONG NSGuidesVML::CFormula::Calculate(NSGuidesVML::CFormulasManager* pManager) { if ((0 > m_lIndex) || (m_lIndex >= pManager->m_arResults.size())) diff --git a/ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/PPTShape/ppt2pptxshapeconverter.h b/ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/PPTShape/ppt2pptxshapeconverter.h index cc01320ba7..2cd7fee1b9 100644 --- a/ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/PPTShape/ppt2pptxshapeconverter.h +++ b/ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/PPTShape/ppt2pptxshapeconverter.h @@ -1718,7 +1718,7 @@ namespace NSGuidesVML #else -#include "../../../XmlWriter.h" +#include "../../../../XmlWriter.h" namespace NSGuidesVML { diff --git a/ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/PPTXShape/Formula.h b/ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/PPTXShape/Formula.h index 46b58d63a9..46027f6a77 100644 --- a/ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/PPTXShape/Formula.h +++ b/ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/PPTXShape/Formula.h @@ -6,7 +6,7 @@ #include #include "./../Common.h" -#include "../../../../../Common/DocxFormat/Source/XML/xmlutils.h" +#include "../../../../../../Common/DocxFormat/Source/XML/xmlutils.h" namespace NSGuidesOOXML { diff --git a/ASCOfficePPTXFile/Editor/Drawing/TextAttributesEx.h b/ASCOfficePPTXFile/Editor/Drawing/TextAttributesEx.h index b7e6f2efd9..c3812d4938 100644 --- a/ASCOfficePPTXFile/Editor/Drawing/TextAttributesEx.h +++ b/ASCOfficePPTXFile/Editor/Drawing/TextAttributesEx.h @@ -3,7 +3,7 @@ #include "TextStructures.h" #if !defined(_WIN32) && !defined (_WIN64) - #include "../../DesktopEditor/graphics/aggplustypes.h" + #include "../../../DesktopEditor/graphics/aggplustypes.h" #endif namespace NSPresentationEditor diff --git a/ASCOfficePPTXFile/Editor/Drawing/TextStructures.h b/ASCOfficePPTXFile/Editor/Drawing/TextStructures.h index 0bcabf77d4..5beb8b724a 100644 --- a/ASCOfficePPTXFile/Editor/Drawing/TextStructures.h +++ b/ASCOfficePPTXFile/Editor/Drawing/TextStructures.h @@ -1,6 +1,6 @@ #pragma once #include "Structures.h" -#include "../../Common/DocxFormat/Source/Base/Nullable.h" +#include "../../../Common/DocxFormat/Source/Base/Nullable.h" namespace NSPresentationEditor { diff --git a/ASCOfficePPTXFile/Editor/Drawing/XmlStringWriter.h b/ASCOfficePPTXFile/Editor/Drawing/XmlStringWriter.h index 3cdfbbf21a..53ed1e6de9 100644 --- a/ASCOfficePPTXFile/Editor/Drawing/XmlStringWriter.h +++ b/ASCOfficePPTXFile/Editor/Drawing/XmlStringWriter.h @@ -1,5 +1,5 @@ #pragma once -#include "../../Common/DocxFormat/Source/SystemUtility/File.h" +#include "../../../Common/DocxFormat/Source/SystemUtility/File.h" namespace NSPresentationEditor { diff --git a/ASCOfficePPTXFile/PPTXFormat/Logic/Geometry.cpp b/ASCOfficePPTXFile/PPTXFormat/Logic/Geometry.cpp index 42133f35ed..e8ca959d3e 100644 --- a/ASCOfficePPTXFile/PPTXFormat/Logic/Geometry.cpp +++ b/ASCOfficePPTXFile/PPTXFormat/Logic/Geometry.cpp @@ -1,8 +1,7 @@ -//#include "stdafx.h" #include "Geometry.h" -#include "../Editor/Drawing/Elements.h" -#include "../Editor/Drawing/Shapes/BaseShape/Common.h" +#include "../../Editor/Drawing/Elements.h" +#include "../../Editor/Drawing/Shapes/BaseShape/Common.h" namespace PPTX { diff --git a/ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro b/ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro index a999fafb96..61e7d7d773 100644 --- a/ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro +++ b/ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro @@ -553,7 +553,7 @@ HEADERS += pptxformatlib.h \ ../../../Editor/imagemanager.h \ ../../../Editor/PPTXWriter.h \ ../../../Editor/WMFToImageConverter.h \ - ../../../Editor/XmlWriter.h \ + ../../../Editor/XmlStringWriter.h \ ../../../Editor/PresentationDrawingsDef.h \ ../../../Editor/DefaultNotesMaster.h \ ../../../Editor/DefaultNotesTheme.h \ diff --git a/ASCOfficeXlsFile2/linux/XlsFileConverter.pro b/ASCOfficeXlsFile2/linux/XlsFileConverter.pro index 2a1f4b18fc..961d45e541 100644 --- a/ASCOfficeXlsFile2/linux/XlsFileConverter.pro +++ b/ASCOfficeXlsFile2/linux/XlsFileConverter.pro @@ -39,7 +39,35 @@ SOURCES += \ ../../Common/DocxFormat/Source/XML/stringcommon.cpp -linux-g++{ +############### destination path ############### +DESTINATION_SDK_PATH = $$PWD/../../SDK/lib + +# WINDOWS +win32:contains(QMAKE_TARGET.arch, x86_64):{ +CONFIG(debug, debug|release) { + DESTDIR = $$DESTINATION_SDK_PATH/win_64/DEBUG +} else { + DESTDIR = $$DESTINATION_SDK_PATH/win_64 +} +} +win32:!contains(QMAKE_TARGET.arch, x86_64):{ +CONFIG(debug, debug|release) { + DESTDIR = $$DESTINATION_SDK_PATH/win_32/DEBUG +} else { + DESTDIR = $$DESTINATION_SDK_PATH/win_32 +} +} + +linux-g++ | linux-g++-64 | linux-g++-32:contains(QMAKE_HOST.arch, x86_64):{ + DESTDIR = $$DESTINATION_SDK_PATH/linux_64 +} +linux-g++ | linux-g++-64 | linux-g++-32:!contains(QMAKE_HOST.arch, x86_64):{ + DESTDIR = $$DESTINATION_SDK_PATH/linux_32 +} + +############### destination path ############### + +linux-g++ | linux-g++-64 | linux-g++-32:contains(QMAKE_HOST.arch, x86_64):{ message(64 bit)