From e5773581b2b99cfefb8bc3918ba1039d27f8a347 Mon Sep 17 00:00:00 2001 From: "Ivan.Shulga" Date: Fri, 24 Oct 2014 13:29:53 +0000 Subject: [PATCH] fixed paths git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59185 954022d7-b5bf-4e40-9824-e11837661b57 --- .../Linux/ASCHTMLRendererLib.pro.user | 4 ++-- ASCOfficeDocxFile2/BinReader/FileWriter.h | 4 ++-- .../Linux/ASCOfficeDocxFile2Lib.pro.user | 22 +++++++---------- .../PPTXFormatLib/PPTXFormatLib.pro.user | 2 +- .../Linux/ASCOfficeUtilsLib.pro.user | 24 ++++++++----------- .../DocxFormatLib/DocxFormatLib.pro.user | 2 +- XlsxSerializerCom/Common/Common.cpp | 4 ++-- XlsxSerializerCom/Reader/ChartFromToBinary.h | 6 ++--- 8 files changed, 30 insertions(+), 38 deletions(-) diff --git a/ASCHTMLRenderer/Linux/ASCHTMLRendererLib.pro.user b/ASCHTMLRenderer/Linux/ASCHTMLRendererLib.pro.user index 5cafab933c..96beb9dc9c 100644 --- a/ASCHTMLRenderer/Linux/ASCHTMLRendererLib.pro.user +++ b/ASCHTMLRenderer/Linux/ASCHTMLRendererLib.pro.user @@ -1,6 +1,6 @@ - + ProjectExplorer.Project.ActiveTarget @@ -57,7 +57,7 @@ Desktop Qt 5.3.0 GCC 32bit Desktop Qt 5.3.0 GCC 32bit qt.53.gcc_kit - 0 + 1 0 0 diff --git a/ASCOfficeDocxFile2/BinReader/FileWriter.h b/ASCOfficeDocxFile2/BinReader/FileWriter.h index ee501a9b0f..0d77d77c22 100644 --- a/ASCOfficeDocxFile2/BinReader/FileWriter.h +++ b/ASCOfficeDocxFile2/BinReader/FileWriter.h @@ -2,7 +2,7 @@ #define FILE_WRITER #include "NumberingWriter.h" -#include "FontTableWriter.h" +#include "fontTableWriter.h" #include "HeaderFooterWriter.h" #include "DocumentWriter.h" #include "MediaWriter.h" @@ -52,4 +52,4 @@ namespace Writers } }; } -#endif // #ifndef FILE_WRITER \ No newline at end of file +#endif // #ifndef FILE_WRITER diff --git a/ASCOfficeDocxFile2/Linux/ASCOfficeDocxFile2Lib.pro.user b/ASCOfficeDocxFile2/Linux/ASCOfficeDocxFile2Lib.pro.user index b93a01c6ed..1b4e2ef271 100644 --- a/ASCOfficeDocxFile2/Linux/ASCOfficeDocxFile2Lib.pro.user +++ b/ASCOfficeDocxFile2/Linux/ASCOfficeDocxFile2Lib.pro.user @@ -1,11 +1,7 @@ - + - - EnvironmentId - {74081711-99cf-4519-b633-b3b4f90c599c} - ProjectExplorer.Project.ActiveTarget 0 @@ -58,14 +54,14 @@ ProjectExplorer.Project.Target.0 - Desktop Qt 5.3 GCC 32bit - Desktop Qt 5.3 GCC 32bit + Desktop Qt 5.3.0 GCC 32bit + Desktop Qt 5.3.0 GCC 32bit qt.53.gcc_kit 0 0 0 - /media/ServerComponents/ASCOfficeDocxFile2/build-ASCOfficeDocxFile2Lib-Desktop_Qt_5_3_GCC_32bit-Debug + /home/iekmuf/Documents/ServerComponents/ServerComponents/ASCOfficeDocxFile2/build-ASCOfficeDocxFile2Lib-Desktop_Qt_5_3_0_GCC_32bit-Debug true @@ -124,7 +120,7 @@ true - /media/ServerComponents/ASCOfficeDocxFile2/build-ASCOfficeDocxFile2Lib-Desktop_Qt_5_3_GCC_32bit-Release + /home/iekmuf/Documents/ServerComponents/ServerComponents/ASCOfficeDocxFile2/build-ASCOfficeDocxFile2Lib-Desktop_Qt_5_3_0_GCC_32bit-Release true @@ -256,11 +252,11 @@ 1 - ProjectExplorer.Project.Updater.FileVersion - 16 + ProjectExplorer.Project.Updater.EnvironmentId + {447f9351-df37-4906-bbf3-398f0ab65aa9} - Version - 16 + ProjectExplorer.Project.Updater.FileVersion + 15 diff --git a/ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro.user b/ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro.user index d71384242f..529aab76ee 100644 --- a/ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro.user +++ b/ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro.user @@ -1,6 +1,6 @@ - + ProjectExplorer.Project.ActiveTarget diff --git a/ASCOfficeUtils/ASCOfficeUtilsLib/Linux/ASCOfficeUtilsLib.pro.user b/ASCOfficeUtils/ASCOfficeUtilsLib/Linux/ASCOfficeUtilsLib.pro.user index e878ee6c64..4680f7784b 100644 --- a/ASCOfficeUtils/ASCOfficeUtilsLib/Linux/ASCOfficeUtilsLib.pro.user +++ b/ASCOfficeUtils/ASCOfficeUtilsLib/Linux/ASCOfficeUtilsLib.pro.user @@ -1,11 +1,7 @@ - + - - EnvironmentId - {74081711-99cf-4519-b633-b3b4f90c599c} - ProjectExplorer.Project.ActiveTarget 0 @@ -58,14 +54,14 @@ ProjectExplorer.Project.Target.0 - Desktop Qt 5.3 GCC 32bit - Desktop Qt 5.3 GCC 32bit + Desktop Qt 5.3.0 GCC 32bit + Desktop Qt 5.3.0 GCC 32bit qt.53.gcc_kit - 0 + 1 0 0 - /home/iekmuf/Documents/ServerComponents/ServerComponents/ASCOfficePPTXFile/PPTXLib/Linux/build-PPTXFormatLib-Desktop_Qt_5_3_0_GCC_32bit-Debug + /home/iekmuf/Documents/ServerComponents/ServerComponents/ASCOfficeUtils/ASCOfficeUtilsLib/build-ASCOfficeUtilsLib-Desktop_Qt_5_3_0_GCC_32bit-Debug true @@ -124,7 +120,7 @@ true - /home/iekmuf/Documents/ServerComponents/ServerComponents/ASCOfficePPTXFile/PPTXLib/Linux/build-PPTXFormatLib-Desktop_Qt_5_3_0_GCC_32bit-Release + /home/iekmuf/Documents/ServerComponents/ServerComponents/ASCOfficeUtils/ASCOfficeUtilsLib/build-ASCOfficeUtilsLib-Desktop_Qt_5_3_0_GCC_32bit-Release true @@ -256,11 +252,11 @@ 1 - ProjectExplorer.Project.Updater.FileVersion - 16 + ProjectExplorer.Project.Updater.EnvironmentId + {447f9351-df37-4906-bbf3-398f0ab65aa9} - Version - 16 + ProjectExplorer.Project.Updater.FileVersion + 15 diff --git a/Common/DocxFormat/DocxFormatLib/DocxFormatLib.pro.user b/Common/DocxFormat/DocxFormatLib/DocxFormatLib.pro.user index 5b38e56d17..f5e3fbca66 100644 --- a/Common/DocxFormat/DocxFormatLib/DocxFormatLib.pro.user +++ b/Common/DocxFormat/DocxFormatLib/DocxFormatLib.pro.user @@ -1,6 +1,6 @@ - + ProjectExplorer.Project.ActiveTarget diff --git a/XlsxSerializerCom/Common/Common.cpp b/XlsxSerializerCom/Common/Common.cpp index 6d82b5a39f..1fe70557bb 100644 --- a/XlsxSerializerCom/Common/Common.cpp +++ b/XlsxSerializerCom/Common/Common.cpp @@ -7,7 +7,7 @@ #ifndef DISABLE_FILE_DOWNLOADER #include "../../ASCOfficeDocxFile2/BinReader/FileDownloader.h" #endif -#include "../../DesktopEditor/common/file.h" +#include "../../DesktopEditor/common/File.h" #ifndef CP_UTF8 #define CP_UTF8 65001 @@ -114,4 +114,4 @@ namespace SerializeCommon return; } -} \ No newline at end of file +} diff --git a/XlsxSerializerCom/Reader/ChartFromToBinary.h b/XlsxSerializerCom/Reader/ChartFromToBinary.h index c39540cfbb..a4bdc9b4b0 100644 --- a/XlsxSerializerCom/Reader/ChartFromToBinary.h +++ b/XlsxSerializerCom/Reader/ChartFromToBinary.h @@ -3,8 +3,8 @@ #define CHART_FROM_TO_BINARY #include "CommonWriter.h" -#include "..\..\Common\DocxFormat\Source\XlsxFormat\Chart\ChartSerialize.h" -#include "..\Writer\BinaryCommonReader.h" +#include "../../Common/DocxFormat/Source/XlsxFormat/Chart/ChartSerialize.h" +#include "../Writer/BinaryCommonReader.h" #include "../../ASCOfficePPTXFile/ASCOfficeDrawingConverter.h" using namespace OOX::Spreadsheet; @@ -322,4 +322,4 @@ namespace BinXlsxRW { public: void WriteAlternateContentFallback(AlternateContentFallback& oVal); }; } -#endif // #ifndef CHART_FROM_TO_BINARY \ No newline at end of file +#endif // #ifndef CHART_FROM_TO_BINARY