Commit 5f9581fc authored by Elen.Subbotina's avatar Elen.Subbotina Committed by Alexander Trofimov

linux build

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@59069 954022d7-b5bf-4e40-9824-e11837661b57
parent 7f7f8578
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 3.0.1, 2014-10-21T12:22:06. -->
<!-- Written by QtCreator 3.0.1, 2014-10-21T15:31:53. -->
<qtcreator>
<data>
<variable>ProjectExplorer.Project.ActiveTarget</variable>
......
......@@ -639,15 +639,20 @@ namespace NSPresentationEditor
if (!bulletChar.is_init())
{
strXml += (_T("<bulletchar></bulletchar>"));
CString temp = _T("<bulletchar>");
temp += _T('\x2022');
temp += _T("</bulletchar>");
strXml += temp;
}
}
if (bulletChar.is_init())
{
strXml += (_T("<bulletchar></bulletchar>"));
{
CString temp = _T("<bulletchar>");
temp += _T('\x2022');
temp += _T("</bulletchar>");
strXml += temp;
}
strXml += ToNode(bulletFontRef, _T("bulletfontref"));
strXml += ToNode(bulletSize, _T("bulletsize"));
strXml += ToNode(bulletColor, _T("bulletcolor"));
......
......@@ -4336,24 +4336,24 @@ struct StdStringEqualsNoCaseA
#ifndef _WIN32
typedef CStdStringW CStringW;
typedef CStdStringA CStringA;
#ifdef UNICODE
typedef CStringW CString;
typedef CStringW BSTR;
#define __T(x) L ## x
#else // UNICODE
typedef CStringA CString;
#define __T(x) x
#endif // UNICODE
#define _T(x) __T(x)
#define _TEXT(x) __T(x)
typedef char* LPSTR;
typedef const char* LPCSTR;
typedef wchar_t* LPWSTR;
typedef const wchar_t* LPCWSTR;
typedef CStdStringW CStringW;
typedef CStdStringA CStringA;
#ifdef UNICODE
typedef CStringW CString;
typedef CStringW BSTR;
#define __T(x) L##x
#else // UNICODE
typedef CStringA CString;
#define __T(x) x
#endif // UNICODE
#define _T(x) __T(x)
#define _TEXT(x) __T(x)
typedef char* LPSTR;
typedef const char* LPCSTR;
typedef wchar_t* LPWSTR;
typedef const wchar_t* LPCWSTR;
#endif // _WIN32
......
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