Skip to content

O
onlyoffice_core
Commit 81baa625 authored by Elen.Subbotina's avatar Elen.Subbotina Committed by Alexander Trofimov
Browse files
Options

x2t linux build (Xls File fix) 

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@64197 954022d7-b5bf-4e40-9824-e11837661b57
parent f801178d
Show whitespace changes
Inline Side-by-side
Showing with 96 additions and 65 deletions
ASCOfficeXlsFile2/source/Common/utils.h
View file @ 81baa625
......@@ -3,35 +3,6 @@
#include <string>
#include <string.h>
#include "../../../Common/DocxFormat/Source/Base/unicode_util.h"
static std::wstring convertUtf16ToWString(const UTF16 * Data, int nLength)
{
UTF32 *pStrUtf32 = new UTF32 [nLength + 1];
memset ((void *) pStrUtf32, 0, sizeof (UTF32) * (nLength + 1));
// this values will be modificated
const UTF16 *pStrUtf16_Conv = Data;
UTF32 *pStrUtf32_Conv = pStrUtf32;
ConversionResult eUnicodeConversionResult =
ConvertUTF16toUTF32 (&pStrUtf16_Conv,
&Data[nLength]
, &pStrUtf32_Conv
, &pStrUtf32 [nLength]
, strictConversion);
if (conversionOK != eUnicodeConversionResult)
{
delete [] pStrUtf32;
return std::wstring();
}
std::wstring wstr ((wchar_t *) pStrUtf32);
delete [] pStrUtf32;
return wstr;
}
namespace xml {
......
ASCOfficeXlsFile2/source/XlsFormat/Binary/CFRecord.cpp
View file @ 81baa625
......@@ -160,6 +160,19 @@ void CFRecord::appendRawData(const char* raw_data, const size_t size)
}
void CFRecord::loadAnyData(wchar_t & val)
{
checkFitRead(2);
#if defined(_WIN32) || defined(_WIN64)
val = * getCurData<wchar_t>();
#else
unsigned short val_utf16 = * getCurData<unsigned short>();
val = val_utf16;
#endif
rdPtr += 2;
}
void CFRecord::insertDataFromRecordToBeginning(CFRecordPtr where_from)
{
const char* src_data = where_from->getData();
......@@ -341,8 +354,35 @@ void CFRecord::storeLongData(const char* buf, const size_t size)
size_ += size;
}
}
#if !defined(_WIN32) && !defined(_WIN64)
CFRecord& operator>>(CFRecord & record, std::string & str)
{
str.clear();
char symbol;
do
{
record.loadAnyData(symbol);
str += symbol;
} while (symbol);
return record;
}
CFRecord& operator>>(CFRecord & record, std::wstring & str)
{
std::vector<unsigned short> utf16;
str.clear();
unsigned short symbol;
do
{
record.loadAnyData(symbol);
utf16.push_back(symbol);
} while (symbol);
str = convertUtf16ToWString(utf16.data(),utf16.size());
utf16.clear();
return record;
}
#endif
} // namespace XLS
ASCOfficeXlsFile2/source/XlsFormat/Binary/CFRecord.h
View file @ 81baa625
......@@ -8,10 +8,39 @@
#include <common.h>
#include <Auxiliary/HelpFunc.h>
#include "../../../Common/DocxFormat/Source/Base/unicode_util.h"
namespace XLS
{
static std::wstring convertUtf16ToWString(const UTF16 * Data, int nLength)
{
UTF32 *pStrUtf32 = new UTF32 [nLength + 1];
memset ((void *) pStrUtf32, 0, sizeof (UTF32) * (nLength + 1));
// this values will be modificated
const UTF16 *pStrUtf16_Conv = Data;
UTF32 *pStrUtf32_Conv = pStrUtf32;
ConversionResult eUnicodeConversionResult =
ConvertUTF16toUTF32 (&pStrUtf16_Conv,
&Data[nLength]
, &pStrUtf32_Conv
, &pStrUtf32 [nLength]
, strictConversion);
if (conversionOK != eUnicodeConversionResult)
{
delete [] pStrUtf32;
return std::wstring();
}
std::wstring wstr ((wchar_t *) pStrUtf32);
delete [] pStrUtf32;
return wstr;
}
// Binary representation of a record in BIFF8
class CFRecord
{
......@@ -100,6 +129,8 @@ public:
rdPtr += sizeof(T);
}
void loadAnyData(wchar_t & val);
template<class T>
void storeAnyData(const T& val)
{
......@@ -174,9 +205,12 @@ CFRecord& operator<<(CFRecord& record, std::vector<T>& vec)
}
template<class T>
CFRecord& operator>>(CFRecord & record, std::basic_string<T, std::char_traits<T>, std::allocator<T> >& str)
{
#if defined(_WIN32) || defined(_WIN64)
template<class T>
CFRecord& operator>>(CFRecord & record, std::basic_string<T, std::char_traits<T>, std::allocator<T> >& str)
{
str.clear();
T symbol;
do
......@@ -185,8 +219,12 @@ CFRecord& operator>>(CFRecord & record, std::basic_string<T, std::char_traits<T>
str += symbol;
} while (symbol);
return record;
}
}
#else
CFRecord& operator>>(CFRecord & record, std::string & str);
CFRecord& operator>>(CFRecord & record, std::wstring & str);
#endif
template<class T>
CFRecord& operator<<(CFRecord & record, std::basic_string<T, std::char_traits<T>, std::allocator<T> >& str)
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/FileMoniker.cpp
View file @ 81baa625
#include "FileMoniker.h"
#include <Binary/CFRecord.h>
#include <utils.h>
namespace OSHARED
{
......@@ -46,7 +45,7 @@ void FileMoniker::load(XLS::CFRecord& record)
#if defined(_WIN32) || defined(_WIN64)
unicodePath = std::wstring(record.getCurData<wchar_t>(), cbUnicodePathBytes / 2);
#else
unicodePath = convertUtf16ToWString(record.getCurData<UTF16>(), cbUnicodePathBytes / 2);
unicodePath = XLS::convertUtf16ToWString(record.getCurData<UTF16>(), cbUnicodePathBytes / 2);
#endif
record.skipNunBytes(cbUnicodePathBytes);
}
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/HyperlinkMoniker.cpp
View file @ 81baa625
......@@ -35,21 +35,6 @@ XLS::BiffStructurePtr HyperlinkMoniker::clone()
return XLS::BiffStructurePtr(new HyperlinkMoniker(*this));
}
//void HyperlinkMoniker::toXML(BiffStructurePtr & parent)
//{
// data->toXML(parent);
//}
//const bool HyperlinkMoniker::fromXML(BiffStructurePtr & parent)
//{
// data.reset(new URLMoniker);
// data->fromXML(parent, 1, true);
// return true;
//}
void HyperlinkMoniker::store(XLS::CFRecord& record)
{
_GUID_ clsid = URLMoniker_CLSID;
......@@ -60,9 +45,8 @@ void HyperlinkMoniker::store(XLS::CFRecord& record)
void HyperlinkMoniker::load(XLS::CFRecord& record)
{
_GUID_ clsid;
_GUID_ clsid={};
record >> clsid;
monikerClsid = STR::guid2bstr(clsid);
if(URLMoniker_CLSID == clsid)
{
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ItemMoniker.cpp
View file @ 81baa625
#include "ItemMoniker.h"
#include <Binary/CFRecord.h>
#include <utils.h>
namespace OSHARED
{
......@@ -59,7 +58,7 @@ void ItemMoniker::load(XLS::CFRecord& record)
#if defined(_WIN32) || defined(_WIN64)
delimiterUnicode = std::wstring(record.getCurData<wchar_t>(), sizeof_delimiterUnicode / 2);
#else
delimiterUnicode = convertUtf16ToWString(record.getCurData<UTF16>(), sizeof_delimiterUnicode / 2);
delimiterUnicode = XLS::convertUtf16ToWString(record.getCurData<UTF16>(), sizeof_delimiterUnicode / 2);
#endif
record.skipNunBytes(sizeof_delimiterUnicode);
}
......@@ -73,7 +72,7 @@ void ItemMoniker::load(XLS::CFRecord& record)
#if defined(_WIN32) || defined(_WIN64)
itemUnicode = std::wstring(record.getCurData<wchar_t>(), sizeof_itemUnicode / 2);
#else
itemUnicode = convertUtf16ToWString(record.getCurData<UTF16>(), sizeof_itemUnicode / 2);
itemUnicode = XLS::convertUtf16ToWString(record.getCurData<UTF16>(), sizeof_itemUnicode / 2);
#endif
record.skipNunBytes(sizeof_itemUnicode);
}
......
ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_structures/ODRAW/OfficeArtFOPTE.cpp
View file @ 81baa625
......@@ -393,7 +393,7 @@ void anyString::ReadComplexData(XLS::CFRecord& record)
#if defined(_WIN32) || defined(_WIN64)
string_ = std::wstring(record.getCurData<wchar_t>(), op);
#else
string_ = convertUtf16ToWString(record.getCurData<UTF16>(), op);
string_ = XLS::convertUtf16ToWString(record.getCurData<UTF16>(), op);
#endif
record.skipNunBytes(op);
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7