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

linux пути к pole

Browse Source 
git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@62408 954022d7-b5bf-4e40-9824-e11837661b57
This commit is contained in:
Elen.Subbotina
2015-05-06 15:44:54 +00:00
committed by Alexander Trofimov
parent eae3cfc8d1
commit 0c289e39c9
6 changed files with 16 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ASCOfficeDocFile/DocDocxConverter/FormattedDiskPage.h
View File

@ -1,7 +1,6 @@
#pragma once
#include "../pole/pole.h"
//#include "../../Common/DocxFormat/Source/CompoundDocument/pole.h"
#include "../../Common/3dParty/pole/pole.h"
#include "../../DesktopEditor/common/Types.h"
namespace DocFileFormat

4
ASCOfficeDocFile/DocFormatLib/Linux/DocFormatLib.pro
View File

@ -79,7 +79,7 @@ SOURCES += \
../../DocDocxConverter/OfficeDrawing/Record.cpp \
../../DocDocxConverter/OfficeDrawing/RecordFactory.cpp \
../../DocDocxConverter/OfficeDrawing/ShapeTypeFactory.cpp \
../../pole/pole.cpp
../../../Common/3dParty/pole/pole.cpp
@ -265,7 +265,7 @@ HEADERS += \
../../DocDocxConverter/OfficeDrawing/Shapetypes/SunType.h \
../../DocDocxConverter/OfficeDrawing/Shapetypes/TextboxType.h \
../../DocDocxConverter/OfficeDrawing/Shapetypes/TrapezoidType.h \
../../pole/pole.h
../../../Common/3dParty/pole/pole.h

2
ASCOfficePDFWriter/PdfWriterLib/Linux/PdfWriterLib.pro
View File

@ -64,7 +64,7 @@ SOURCES += \
../OnlineOfficeBinToPdf.cpp \
../../../Common/DocxFormat/Source/XML/stringcommon.cpp \
../../../Common/DocxFormat/Source/SystemUtility/FileSystem/DirectoryPosix.cpp \
../../../ASCOfficeDocFile/pole/pole.cpp \
../../../Common/3dParty/pole/pole.cpp \
../../../Common/DocxFormat/Source/XML/libxml2/libxml2.cpp \
../../../Common/DocxFormat/Source/Base/unicode_util.cpp \
../../../ASCOfficePPTXFile/Editor/FontPicker.cpp \

13
ASCOfficeRtfFile/RtfFormatLib/source/Utils.h
View File

@ -198,9 +198,16 @@ public:
}
static void Decode( CString& sText, NFileWriter::CBufferedFileWriter& oFileWriter ) //сразу записывает в файл
{
#if defined(_WIN32) || defined(_WIN64)
CStringA sAnsiText; sAnsiText = sText;
int nStart = 0;
int nLenth = sAnsiText.GetLength();
BYTE* BufferString = (BYTE*)sAnsiText.GetBuffer() ;
#else
std::string sAnsiText(sText.begin(),sText.end());
int nLenth = sAnsiText.length();
BYTE* BufferString = (BYTE*)sAnsiText.c_str() ;
#endif
int nStart = 0;
int nFindRes = -1;
CString sFindString = _T("{\\*filename ");
int nFindStringLen = sFindString.GetLength();
@ -208,7 +215,7 @@ public:
int nFindEndLen = sFindEnd.GetLength();
while( -1 != (nFindRes = sText.Find( sFindString, nStart )) )
{
oFileWriter.Write( (BYTE*)sAnsiText.GetBuffer() + nStart, nFindRes - nStart );
oFileWriter.Write( BufferString + nStart, nFindRes - nStart );
sText.ReleaseBuffer();
int nRightBound = 0;
@ -220,7 +227,7 @@ public:
nStart = nRightBound + nFindEndLen;
}
oFileWriter.Write( (BYTE*)sAnsiText.GetBuffer() + nStart, nLenth - nStart );
oFileWriter.Write( BufferString + nStart, nLenth - nStart );
sText.ReleaseBuffer();
}
private:

2
Common/3dParty/pole/pole.cpp
View File

@ -54,7 +54,7 @@
#include <cstring>
#include "pole.h"
#include "../../Common/DocxFormat/Source/Base/unicode_util.h"
#include "../../DocxFormat/Source/Base/unicode_util.h"
// enable to activate debugging output

2
Common/DocxFormat/DocxFormatLib/DocxFormatLib.pro
View File

@ -64,7 +64,7 @@ SOURCES += docxformatlib.cpp \
../Source/XML/stringcommon.cpp \
../Source/MathEquation/MathEquation.cpp \
../Source/Base/unicode_util.cpp \
../../../ASCOfficeDocFile/pole/pole.cpp
../Common/3dParty/pole/pole.cpp
HEADERS += docxformatlib.h \
../Source/Base/Base.h \