Skip to content

O
onlyoffice_core
Commit d0f02341 authored by Ivan.Shulga's avatar Ivan.Shulga Committed by Alexander Trofimov
Browse files
Options

ubuntu build (not finished) 

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@57993 954022d7-b5bf-4e40-9824-e11837661b57
parent ad877165
Hide whitespace changes
Inline Side-by-side
Showing with 1327 additions and 1176 deletions
Common/DocxFormat/DocxFormatLib/DocxFormatLib.pro.user
View file @ d0f02341
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 3.1.1, 2014-08-07T16:23:35. -->
<!-- Written by QtCreator 3.1.1, 2014-08-11T19:31:54. -->
<qtcreator>
<data>
<variable>ProjectExplorer.Project.ActiveTarget</variable>
......
Common/DocxFormat/Source/Common/SimpleTypes_Base.h
View file @ d0f02341
......@@ -48,7 +48,7 @@ namespace SimpleTypes
#define SimpleTypes_AdditionalOpearators(Class) \
const bool operator==(const Class& oOther) const\
{\
if ( m_eValue == oOther.m_eValue )\
if ( this->m_eValue == oOther.m_eValue )\
return true;\
return false;\
}
......
Common/DocxFormat/Source/Common/SimpleTypes_Drawing.h
View file @ d0f02341
......@@ -4524,10 +4524,116 @@ namespace SimpleTypes
// SystemColorVal 20.1.10.58 (Part 1)
//--------------------------------------------------------------------------------
// from winuser.h ( http://msdn.microsoft.com/en-us/library/windows/desktop/ms724371(v=vs.85).aspx )
#ifndef COLOR_3DDKSHADOW
#define COLOR_3DDKSHADOW 21
#endif
#ifndef COLOR_3DFACE
#define COLOR_3DFACE 15
#endif
#ifndef COLOR_3DHIGHLIGHT
#define COLOR_3DHIGHLIGHT 20
#endif
#ifndef COLOR_3DHILIGHT
#define COLOR_3DHILIGHT 20
#endif
#ifndef COLOR_3DLIGHT
#define COLOR_3DLIGHT 22
#endif
#ifndef COLOR_3DSHADOW
#define COLOR_3DSHADOW 16
#endif
#ifndef COLOR_ACTIVEBORDER
#define COLOR_ACTIVEBORDER 10
#endif
#ifndef COLOR_ACTIVECAPTION
#define COLOR_ACTIVECAPTION 2
#endif
#ifndef COLOR_APPWORKSPACE
#define COLOR_APPWORKSPACE 12
#endif
#ifndef COLOR_BACKGROUND
#define COLOR_BACKGROUND 1
#endif
#ifndef COLOR_BTNFACE
#define COLOR_BTNFACE 15
#endif
#ifndef COLOR_BTNHIGHLIGHT
#define COLOR_BTNHIGHLIGHT 20
#endif
#ifndef COLOR_BTNHILIGHT
#define COLOR_BTNHILIGHT 20
#endif
#ifndef COLOR_BTNSHADOW
#define COLOR_BTNSHADOW 16
#endif
#ifndef COLOR_BTNTEXT
#define COLOR_BTNTEXT 18
#endif
#ifndef COLOR_CAPTIONTEXT
#define COLOR_CAPTIONTEXT 9
#endif
#ifndef COLOR_DESKTOP
#define COLOR_DESKTOP 1
#endif
#ifndef COLOR_GRAYTEXT
#define COLOR_GRAYTEXT 17
#endif
#ifndef COLOR_HIGHLIGHT
#define COLOR_HIGHLIGHT 13
#endif
#ifndef COLOR_HIGHLIGHTTEXT
#define COLOR_HIGHLIGHTTEXT 14
#endif
#ifndef COLOR_HOTLIGHT
#define COLOR_HOTLIGHT 26
#define COLOR_HOTLIGHT 26
#endif
#ifndef COLOR_INACTIVEBORDER
#define COLOR_INACTIVEBORDER 11
#endif
#ifndef COLOR_INACTIVECAPTION
#define COLOR_INACTIVECAPTION 3
#endif
#ifndef COLOR_INACTIVECAPTIONTEXT
#define COLOR_INACTIVECAPTIONTEXT 19
#endif
#ifndef COLOR_INFOBK
#define COLOR_INFOBK 24
#endif
#ifndef COLOR_INFOTEXT
#define COLOR_INFOTEXT 23
#endif
#ifndef COLOR_MENU
#define COLOR_MENU 4
#endif
#ifndef COLOR_GRADIENTACTIVECAPTION
#define COLOR_GRADIENTACTIVECAPTION 27
#endif
......@@ -4544,6 +4650,28 @@ namespace SimpleTypes
#define COLOR_MENUBAR 30
#endif
#ifndef COLOR_MENUTEXT
#define COLOR_MENUTEXT 7
#endif
#ifndef COLOR_SCROLLBAR
#define COLOR_SCROLLBAR 0
#endif
#ifndef COLOR_WINDOW
#define COLOR_WINDOW 5
#endif
#ifndef COLOR_WINDOWFRAME
#define COLOR_WINDOWFRAME 6
#endif
#ifndef COLOR_WINDOWTEXT
#define COLOR_WINDOWTEXT 8
#endif
enum ESystemColorVal
{
systemcolorval3dDkShadow = 0, // (3D Dark System Color)
......
Common/DocxFormat/Source/Common/SimpleTypes_Shared.h
View file @ d0f02341
......@@ -181,59 +181,73 @@ namespace SimpleTypes
if ( sValue.GetLength() != 38 )
return false;
unsigned __int64 unTemp = 0;
T_ULONG64 unTemp = 0;
if ( !HexToInt( sValue.Mid( 1, 8 ), unTemp ) )
CString sMidValue;
sMidValue = sValue.Mid( 1, 8 );
if ( !HexToInt( sMidValue, unTemp ) )
return false;
m_oGUID.a = (unsigned int)unTemp;
if ( !HexToInt( sValue.Mid( 10, 4 ), unTemp ) )
sMidValue = sValue.Mid( 10, 4 );
if ( !HexToInt(sMidValue, unTemp ) )
return false;
m_oGUID.b = (unsigned short)unTemp;
if ( !HexToInt( sValue.Mid( 15, 4 ), unTemp ) )
sMidValue = sValue.Mid( 15, 4 );
if ( !HexToInt( sMidValue, unTemp ) )
return false;
m_oGUID.c = (unsigned short)unTemp;
if ( !HexToInt( sValue.Mid( 20, 2 ), unTemp ) )
sMidValue = sValue.Mid( 20, 2 );
if ( !HexToInt( sMidValue, unTemp ) )
return false;
m_oGUID.d = (unsigned char)unTemp;
if ( !HexToInt( sValue.Mid( 22, 2 ), unTemp ) )
sMidValue = sValue.Mid( 22, 2 );
if ( !HexToInt( sMidValue, unTemp ) )
return false;
m_oGUID.e = (unsigned char)unTemp;
if ( !HexToInt( sValue.Mid( 25, 2 ), unTemp ) )
sMidValue = sValue.Mid( 25, 2 );
if ( !HexToInt( sMidValue, unTemp ) )
return false;
m_oGUID.f = (unsigned char)unTemp;
if ( !HexToInt( sValue.Mid( 27, 2 ), unTemp ) )
sMidValue = sValue.Mid( 27, 2 );
if ( !HexToInt( sMidValue, unTemp ) )
return false;
m_oGUID.g = (unsigned char)unTemp;
if ( !HexToInt( sValue.Mid( 29, 2 ), unTemp ) )
sMidValue = sValue.Mid( 29, 2 );
if ( !HexToInt( sMidValue, unTemp ) )
return false;
m_oGUID.h = (unsigned char)unTemp;
if ( !HexToInt( sValue.Mid( 31, 2 ), unTemp ) )
sMidValue = sValue.Mid( 31, 2 );
if ( !HexToInt( sMidValue, unTemp ) )
return false;
m_oGUID.i = (unsigned char)unTemp;
if ( !HexToInt( sValue.Mid( 33, 2 ), unTemp ) )
sMidValue = sValue.Mid( 33, 2 );
if ( !HexToInt( sMidValue, unTemp ) )
return false;
m_oGUID.j = (unsigned char)unTemp;
if ( !HexToInt( sValue.Mid( 35, 2 ), unTemp ) )
sMidValue = sValue.Mid( 35, 2 );
if ( !HexToInt( sMidValue, unTemp ) )
return false;
m_oGUID.k = (unsigned char)unTemp;
......@@ -241,22 +255,25 @@ namespace SimpleTypes
return true;
}
#ifdef _WIN32
bool FromString(const BSTR bsValue)
{
CString sTemp( bsValue );
return FromString( (CString &)sTemp );
}
bool FromString(const wchar_t* cwsStr)
{
CWCharWrapper wsStr = cwsStr;
return FromString( (const CWCharWrapper&)wsStr );
}
#endif
bool FromString(const CWCharWrapper& wsStr)
{
// TO DO:
CString sTemp( wsStr.m_cwsString );
return FromString( (CString &)sTemp );
}
bool FromString(const wchar_t* cwsStr)
{
CWCharWrapper wsStr = cwsStr;
return FromString( (const CWCharWrapper&)wsStr );
}
CString ToString () const
{
CString sResult;
......@@ -268,7 +285,7 @@ namespace SimpleTypes
private:
bool HexToInt(CString& sValue, unsigned __int64& unResult)
bool HexToInt(CString& sValue, T_ULONG64& unResult)
{
bool bResult = true;
......
Common/DocxFormat/Source/Common/SimpleTypes_Word.h
View file @ d0f02341
This source diff could not be displayed because it is too large. You can view the blob instead.
Common/DocxFormat/Source/DocxFormat/Drawing/DrawingExt.h
View file @ d0f02341
......@@ -107,7 +107,7 @@ namespace OOX
if ( _T("a:ext") == sName )
{
OOX::Drawing::COfficeArtExtension oExt = oReader;
m_arrExt.Add( oExt );
m_arrExt.push_back( oExt );
}
}
}
......@@ -115,7 +115,7 @@ namespace OOX
{
CString sResult = _T("<a:extLst>");
for ( int nIndex = 0; nIndex < m_arrExt.GetSize(); nIndex++ )
for ( int nIndex = 0; nIndex < m_arrExt.size(); nIndex++ )
sResult += m_arrExt[nIndex].toXML();
sResult += _T("</a:extLst>");
......@@ -130,9 +130,10 @@ namespace OOX
public:
// Childs
CSimpleArray<OOX::Drawing::COfficeArtExtension> m_arrExt;
//CSimpleArray<OOX::Drawing::COfficeArtExtension> m_arrExt;
std::vector<OOX::Drawing::COfficeArtExtension> m_arrExt;
};
} // namespace Drawing
} // namespace OOX
#endif // OOX_LOGIC_DRAWING_EXT_INCLUDE_H_
\ No newline at end of file
#endif // OOX_LOGIC_DRAWING_EXT_INCLUDE_H_
Common/DocxFormat/Source/DocxFormat/WritingElement.h
View file @ d0f02341
......@@ -732,7 +732,7 @@ namespace OOX
virtual ~WritingElementWithChilds() {ClearItems();}
virtual void ClearItems()
{
for ( int nIndex = 0; nIndex < m_arrItems.GetSize(); nIndex++ )
for ( int nIndex = 0; nIndex < m_arrItems.size(); nIndex++ )
{
if ( m_arrItems[nIndex] )
delete m_arrItems[nIndex];
......@@ -742,6 +742,7 @@ namespace OOX
m_arrItems.RemoveAll();
}
CSimpleArray<ElemType *> m_arrItems;
std::vector<ElemType *> m_arrItems;
//CSimpleArray<ElemType *> m_arrItems;
};
}
Common/DocxFormat/Source/XML/Utils.h
View file @ d0f02341
......@@ -86,6 +86,10 @@ namespace XmlUtils
{
return _ttoi(string);
}
AVSINLINE static size_t GetUInteger(const CString& string)
{
return (size_t) _ttoi(string);
}
AVSINLINE static double GetDouble (const CString& string)
{
double d = 0;
......
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