Skip to content

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

linux build 

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@58612 954022d7-b5bf-4e40-9824-e11837661b57
parent fb720ff5
Hide whitespace changes
Inline Side-by-side
Showing with 64 additions and 34 deletions
Common/DocxFormat/DocxFormatLib/DocxFormatLib.pro.user
View file @ 0f3ee553
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE QtCreatorProject>
<!-- Written by QtCreator 3.1.1, 2014-10-01T16:36:48. -->
<!-- Written by QtCreator 3.1.1, 2014-10-01T19:43:27. -->
<qtcreator>
<data>
<variable>ProjectExplorer.Project.ActiveTarget</variable>
......
Common/DocxFormat/Source/Common/SimpleTypes_Base.h
View file @ 0f3ee553
......@@ -61,10 +61,11 @@ namespace SimpleTypes
return false;\
}
#ifdef _WIN32
#define SimpleType_Operator_Equal(Class) \
Class(const BSTR &bsValue)\
{\
/*FromString( bsValue );*/\
FromString( bsValue );\
}\
Class(CString &sValue)\
{\
......@@ -85,7 +86,7 @@ namespace SimpleTypes
}\
const Class &operator =(const BSTR &bsValue)\
{\
/*FromString( bsValue );*/\
FromString( bsValue );\
return *this;\
}\
const Class &operator =(const wchar_t* cwsString)\
......@@ -98,7 +99,36 @@ namespace SimpleTypes
FromString( wsStr );\
return *this;\
}
#else
#define SimpleType_Operator_Equal(Class) \
Class(CString &sValue)\
{\
FromString( sValue );\
}\
Class(const wchar_t* cwsValue)\
{\
FromString( cwsValue );\
}\
Class(const CWCharWrapper& wsStr)\
{\
FromString( wsStr );\
}\
const Class &operator =(CString &sValue)\
{\
FromString( sValue );\
return *this;\
}\
const Class &operator =(const wchar_t* cwsString)\
{\
FromString( cwsString );\
return *this;\
}\
const Class &operator =(const CWCharWrapper& wsStr)\
{\
FromString( wsStr );\
return *this;\
}
#endif
template<typename E, E DefValue = 0>
class CSimpleType
......
Common/DocxFormat/Source/Common/SimpleTypes_Vml.h
View file @ 0f3ee553
......@@ -4091,10 +4091,10 @@ namespace SimpleTypes
if ( -1 == nPos )
return 0;
SimpleTypes::CPoint oPt1 = sValue.Mid( 0, nPos );
SimpleTypes::CPoint oPt1 = (const TCHAR *) sValue.Mid( 0, nPos );
m_dX = oPt1.GetValue();
SimpleTypes::CPoint oPt2 = sValue.Mid( nPos + 1, nLen - nPos - 1 );
SimpleTypes::CPoint oPt2 = (const TCHAR *) sValue.Mid( nPos + 1, nLen - nPos - 1 );
m_dY = oPt2.GetValue();
return 0;
......@@ -4156,10 +4156,10 @@ namespace SimpleTypes
if ( -1 == nPos )
return 0;
SimpleTypes::CPercentage oPerc1 = sValue.Mid( 0, nPos );
SimpleTypes::CPercentage oPerc1 = (const TCHAR *) sValue.Mid( 0, nPos );
m_dX = oPerc1.GetValue();
SimpleTypes::CPercentage oPerc2 = sValue.Mid( nPos + 1, nLen - nPos - 1 );
SimpleTypes::CPercentage oPerc2 = (const TCHAR *) sValue.Mid( nPos + 1, nLen - nPos - 1 );
m_dY = oPerc2.GetValue();
return 0;
......@@ -4221,10 +4221,10 @@ namespace SimpleTypes
if ( -1 == nPos )
return 0;
SimpleTypes::Vml::CVml_1_65536 oFraction1 = sValue.Mid( 0, nPos );
SimpleTypes::Vml::CVml_1_65536 oFraction1 = (const TCHAR *) sValue.Mid( 0, nPos );
m_dX = oFraction1.GetValue();
SimpleTypes::Vml::CVml_1_65536 oFraction2 = sValue.Mid( nPos + 1, nLen - nPos - 1 );
SimpleTypes::Vml::CVml_1_65536 oFraction2 = (const TCHAR *) sValue.Mid( nPos + 1, nLen - nPos - 1 );
m_dY = oFraction2.GetValue();
return 0;
......@@ -4293,7 +4293,7 @@ namespace SimpleTypes
if ( -1 == nSpacePos )
nSpacePos = nLen;
SimpleTypes::CPoint oPoint = sValue.Mid( nPos, nSpacePos - nPos );
SimpleTypes::CPoint oPoint = (const TCHAR *) sValue.Mid( nPos, nSpacePos - nPos );
nPos = nSpacePos + 1;
m_arrLimits.push_back( oPoint.ToPoints() );
......@@ -5159,7 +5159,7 @@ namespace SimpleTypes
if ( -1 == nEndPos )
nEndPos = nLen;
SimpleTypes::CPoint oPtLeft = sValue.Mid( nStartPos, nEndPos - nStartPos );
SimpleTypes::CPoint oPtLeft = (const TCHAR *) sValue.Mid( nStartPos, nEndPos - nStartPos );
m_dLeft = oPtLeft.GetValue();
// Top
......@@ -5168,7 +5168,7 @@ namespace SimpleTypes
if ( -1 == nEndPos )
nEndPos = nLen;
SimpleTypes::CPoint oPtTop = sValue.Mid( nStartPos, nEndPos - nStartPos );
SimpleTypes::CPoint oPtTop = (const TCHAR *) sValue.Mid( nStartPos, nEndPos - nStartPos );
m_dTop = oPtTop.GetValue();
// Right
......@@ -5177,7 +5177,7 @@ namespace SimpleTypes
if ( -1 == nEndPos )
nEndPos = nLen;
SimpleTypes::CPoint oPtRight = sValue.Mid( nStartPos, nEndPos - nStartPos );
SimpleTypes::CPoint oPtRight = (const TCHAR *) sValue.Mid( nStartPos, nEndPos - nStartPos );
m_dRight = oPtRight.GetValue();
// Bottom
......@@ -5186,7 +5186,7 @@ namespace SimpleTypes
if ( -1 == nEndPos )
nEndPos = nLen;
SimpleTypes::CPoint oPtBottom = sValue.Mid( nStartPos, nEndPos - nStartPos );
SimpleTypes::CPoint oPtBottom = (const TCHAR *) sValue.Mid( nStartPos, nEndPos - nStartPos );
m_dBottom = oPtBottom.GetValue();
return 0;
......
Common/DocxFormat/Source/Common/SimpleTypes_Word.h
View file @ 0f3ee553
......@@ -2862,7 +2862,7 @@ namespace SimpleTypes
this->m_eValue = eDefValue;
//
FromString( ToString() );
FromString( ToString() );
}
return this->m_eValue;
......
Common/DocxFormat/Source/DocxFormat/App.h
View file @ 0f3ee553
......@@ -42,13 +42,13 @@ namespace OOX
if ( oProperties.GetNode( _T("Characters"), oItem ) )
{
SimpleTypes::CDecimalNumber<> oNum = oItem.GetText();
SimpleTypes::CDecimalNumber<> oNum = (const TCHAR *) oItem.GetText();
m_nCharacters = oNum.GetValue();
}
if ( oProperties.GetNode( _T("CharactersWithSpaces"), oItem ) )
{
SimpleTypes::CDecimalNumber<> oNum = oItem.GetText();
SimpleTypes::CDecimalNumber<> oNum = (const TCHAR *) oItem.GetText();
m_nCharactersWithSpaces = oNum.GetValue();
}
......@@ -57,13 +57,13 @@ namespace OOX
if ( oProperties.GetNode( _T("DocSecurity"), oItem ) )
{
SimpleTypes::CDecimalNumber<> oNum = oItem.GetText();
SimpleTypes::CDecimalNumber<> oNum = (const TCHAR *) oItem.GetText();
m_nDocSecurity = oNum.GetValue();
}
if ( oProperties.GetNode( _T("HiddenSlides"), oItem ) )
{
SimpleTypes::CDecimalNumber<> oNum = oItem.GetText();
SimpleTypes::CDecimalNumber<> oNum = (const TCHAR *) oItem.GetText();
m_nHiddenSlides = oNum.GetValue();
}
......@@ -72,19 +72,19 @@ namespace OOX
if ( oProperties.GetNode( _T("HyperlinksChanged"), oItem ) )
{
SimpleTypes::COnOff<> oBool = oItem.GetText();
SimpleTypes::COnOff<> oBool = (const TCHAR *) oItem.GetText();
m_bHyperlinksChanged = (oBool.GetValue() == SimpleTypes::onoffTrue);
}
if ( oProperties.GetNode( _T("Lines"), oItem ) )
{
SimpleTypes::CDecimalNumber<> oNum = oItem.GetText();
SimpleTypes::CDecimalNumber<> oNum = (const TCHAR *) oItem.GetText();
m_nLines = oNum.GetValue();
}
if ( oProperties.GetNode( _T("LinksUpToDate"), oItem ) )
{
SimpleTypes::COnOff<> oBool = oItem.GetText();
SimpleTypes::COnOff<> oBool = (const TCHAR *) oItem.GetText();
m_bLinksUpToDate = (oBool.GetValue() == SimpleTypes::onoffTrue);
}
......@@ -93,43 +93,43 @@ namespace OOX
if ( oProperties.GetNode( _T("MMClips"), oItem ) )
{
SimpleTypes::CDecimalNumber<> oNum = oItem.GetText();
SimpleTypes::CDecimalNumber<> oNum = (const TCHAR *) oItem.GetText();
m_nMMClips = oNum.GetValue();
}
if ( oProperties.GetNode( _T("Notes"), oItem ) )
{
SimpleTypes::CDecimalNumber<> oNum = oItem.GetText();
SimpleTypes::CDecimalNumber<> oNum = (const TCHAR *) oItem.GetText();
m_nNotes = oNum.GetValue();
}
if ( oProperties.GetNode( _T("Pages"), oItem ) )
{
SimpleTypes::CDecimalNumber<> oNum = oItem.GetText();
SimpleTypes::CDecimalNumber<> oNum = (const TCHAR *) oItem.GetText();
m_nPages = oNum.GetValue();
}
if ( oProperties.GetNode( _T("Paragraphs"), oItem ) )
{
SimpleTypes::CDecimalNumber<> oNum = oItem.GetText();
SimpleTypes::CDecimalNumber<> oNum = (const TCHAR *) oItem.GetText();
m_nParagraphs = oNum.GetValue();
}
if ( oProperties.GetNode( _T("ScaleCrop"), oItem ) )
if ( oProperties.GetNode( _T("ScaleCrop"), oItem ) )
{
SimpleTypes::COnOff<> oBool = oItem.GetText();
SimpleTypes::COnOff<> oBool = (const TCHAR *) oItem.GetText();
m_bScaleCrop = (oBool.GetValue() == SimpleTypes::onoffTrue);
}
if ( oProperties.GetNode( _T("SharedDoc"), oItem ) )
{
SimpleTypes::COnOff<> oBool = oItem.GetText();
SimpleTypes::COnOff<> oBool = (const TCHAR *) oItem.GetText();
m_bSharedDoc = (oBool.GetValue() == SimpleTypes::onoffTrue);
}
if ( oProperties.GetNode( _T("Slides"), oItem ) )
{
SimpleTypes::CDecimalNumber<> oNum = oItem.GetText();
SimpleTypes::CDecimalNumber<> oNum = (const TCHAR *) oItem.GetText();
m_nSlides = oNum.GetValue();
}
......@@ -138,13 +138,13 @@ namespace OOX
if ( oProperties.GetNode( _T("TotalTime"), oItem ) )
{
SimpleTypes::CDecimalNumber<> oNum = oItem.GetText();
SimpleTypes::CDecimalNumber<> oNum = (const TCHAR *) oItem.GetText();
m_nTotalTime = oNum.GetValue();
}
if ( oProperties.GetNode( _T("Words"), oItem ) )
{
SimpleTypes::CDecimalNumber<> oNum = oItem.GetText();
SimpleTypes::CDecimalNumber<> oNum = (const TCHAR *) oItem.GetText();
m_nWords = oNum.GetValue();
}
}
......@@ -432,4 +432,4 @@ namespace OOX
};
} // namespace OOX
#endif // OOX_APP_INCLUDE_H_
\ No newline at end of file
#endif // OOX_APP_INCLUDE_H_
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