pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-04-07 13:55:33 +08:00
Code Issues Packages Projects Releases Wiki Activity

правка путей в линуховой ветке

Browse Source 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@65763 954022d7-b5bf-4e40-9824-e11837661b57
This commit is contained in:
Elen.Subbotina
2015-11-12 10:54:54 +00:00
committed by Alexander Trofimov
parent 5471eeef35
commit 8013237e11
14 changed files with 50 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
ASCOfficePPTXFile/Editor/Drawing/Attributes.h
View File

@ -4,17 +4,17 @@
#include <atlcoll.h>
#include <gdiplus.h>
#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

2
ASCOfficePPTXFile/Editor/Drawing/Effects.h
View File

@ -6,7 +6,7 @@
#include <atlbase.h>
#include <atlstr.h>
#else
#include "../../Common/DocxFormat/Source/Base/ASCString.h"
#include "../../../Common/DocxFormat/Source/Base/ASCString.h"
#endif

2
ASCOfficePPTXFile/Editor/Drawing/Elements.h
View File

@ -3,7 +3,7 @@
#include "Shapes/Shape.h"
#ifndef DISABLE_FILE_DOWNLOADER
#include "../../Common/FileDownloader.h"
#include "../../../Common/FileDownloader.h"
#endif

2
ASCOfficePPTXFile/Editor/Drawing/Interactive.h
View File

@ -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

4
ASCOfficePPTXFile/Editor/Drawing/Metric.h
View File

@ -2,8 +2,8 @@
#include <math.h>
#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

3
ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/PPTShape/Formula.cpp
View File

@ -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()))

2
ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/PPTShape/ppt2pptxshapeconverter.h
View File

@ -1718,7 +1718,7 @@ namespace NSGuidesVML
#else
#include "../../../XmlWriter.h"
#include "../../../../XmlWriter.h"
namespace NSGuidesVML
{

2
ASCOfficePPTXFile/Editor/Drawing/Shapes/BaseShape/PPTXShape/Formula.h
View File

@ -6,7 +6,7 @@
#include <math.h>
#include "./../Common.h"
#include "../../../../../Common/DocxFormat/Source/XML/xmlutils.h"
#include "../../../../../../Common/DocxFormat/Source/XML/xmlutils.h"
namespace NSGuidesOOXML
{

2
ASCOfficePPTXFile/Editor/Drawing/TextAttributesEx.h
View File

@ -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

2
ASCOfficePPTXFile/Editor/Drawing/TextStructures.h
View File

@ -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
{

2
ASCOfficePPTXFile/Editor/Drawing/XmlStringWriter.h
View File

@ -1,5 +1,5 @@
#pragma once
#include "../../Common/DocxFormat/Source/SystemUtility/File.h"
#include "../../../Common/DocxFormat/Source/SystemUtility/File.h"
namespace NSPresentationEditor
{

5
ASCOfficePPTXFile/PPTXFormat/Logic/Geometry.cpp
View File

@ -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
{

2
ASCOfficePPTXFile/PPTXLib/Linux/PPTXFormatLib/PPTXFormatLib.pro
View File

@ -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 \

30
ASCOfficeXlsFile2/linux/XlsFileConverter.pro
View File

@ -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)