XlsFormat - исправление конфликтов сборки под QT

git-svn-id: svn://fileserver/activex/AVS/Sources/TeamlabOffice/trunk/ServerComponents@68357 954022d7-b5bf-4e40-9824-e11837661b57

ASCOfficeXlsFile2/source/XlsFormat/Logic/Biff_records/UserSViewBegin.cpp

@@ -143,9 +143,9 @@ void UserSViewBegin::readFields(CFRecord& record)
 	fPageLayoutView = GETBIT(flags, 11);
 	fRuler			= GETBIT(flags, 13);
 
-	record >> operNumX >> operNumY >> colRPane >> rwBPane;
+    record >> operNumX >> operNumY >> colRPane >> rwBPane;
 
-	pane_top_left_cell = CellRef(fSplitH ? rwBPane : 0 , fSplitV ? colRPane : 0, true, true).toString();
+    pane_top_left_cell = CellRef(fSplitH ? (int)rwBPane : 0 , fSplitV ? (int)colRPane : 0, true, true).toString();
 }
 
 } // namespace XLS

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/FormulaShape.cpp

@@ -2,7 +2,7 @@
 
 #include "FormulaShape.h"
 
-LONG NSGuidesVML::CFormula::Calculate(NSGuidesVML::CFormulasManager* pManager)
+LONG NSGuidesVML::CFormula::CalculateFormula(NSGuidesVML::CFormulasManager* pManager)
 {
 	if ((0 > m_lIndex) || (m_lIndex >= pManager->m_arResults.size()))
 		return 0;
@@ -19,7 +19,7 @@ LONG NSGuidesVML::CFormula::Calculate(NSGuidesVML::CFormulasManager* pManager)
 	LONG a1 = m_lParam1;
 	if (ptFormula == m_eType1)
 	{
-		a1 = (m_lParam1 >= lGuidesCount) ? 0 : pManager->m_arFormulas[m_lParam1].Calculate(pManager);
+        a1 = (m_lParam1 >= lGuidesCount) ? 0 : pManager->m_arFormulas[m_lParam1].CalculateFormula(pManager);
 	}
 	else if (ptAdjust == m_eType1)
 	{
@@ -29,7 +29,7 @@ LONG NSGuidesVML::CFormula::Calculate(NSGuidesVML::CFormulasManager* pManager)
 	LONG b1 = m_lParam2;
 	if (ptFormula == m_eType2)
 	{
-		b1 = (m_lParam2 >= lGuidesCount) ? 0 : pManager->m_arFormulas[m_lParam2].Calculate(pManager);
+        b1 = (m_lParam2 >= lGuidesCount) ? 0 : pManager->m_arFormulas[m_lParam2].CalculateFormula(pManager);
 	}
 	else if (ptAdjust == m_eType2)
 	{
@@ -39,7 +39,7 @@ LONG NSGuidesVML::CFormula::Calculate(NSGuidesVML::CFormulasManager* pManager)
 	LONG c1 = m_lParam3;
 	if (ptFormula == m_eType3)
 	{
-		c1 = (m_lParam3 >= lGuidesCount) ? 0 : pManager->m_arFormulas[m_lParam3].Calculate(pManager);
+        c1 = (m_lParam3 >= lGuidesCount) ? 0 : pManager->m_arFormulas[m_lParam3].CalculateFormula(pManager);
 	}
 	else if (ptAdjust == m_eType3)
 	{

ASCOfficeXlsFile2/source/XlsXlsxConverter/ConvertShapes/FormulaShape.h

@@ -294,7 +294,7 @@ private:
 				m_eType3 = ptType;		
 			}
 		}
-		LONG Calculate(CFormulasManager* pManager);
+        LONG CalculateFormula(CFormulasManager* pManager);
 	};
 
 	class CFormulasManager
@@ -372,7 +372,7 @@ private:
 		{
 			for (int index = 0; index < m_arFormulas.size(); ++index)
 			{
-                LONG lResult = m_arFormulas[index].Calculate(this);
+                LONG lResult = m_arFormulas[index].CalculateFormula(this);
 			}
 		}
 	};