summaryrefslogtreecommitdiff
path: root/starmath
diff options
context:
space:
mode:
authorTakeshi Abe <tabe@fixedpoint.jp>2017-06-12 22:32:37 +0900
committerTakeshi Abe <tabe@fixedpoint.jp>2017-06-13 01:56:46 +0200
commit94662151fef3845aa7cf32dbd9d60fe10bc4a3c5 (patch)
treea2201f607845b5361067106f46456ef82dc14dca /starmath
parentb7f515fefbb104da08062bd158a4c32c9b2afa10 (diff)
starmath: SvStream::Seek()/Tell() uses sal_uInt64, not sal_uLong
Change-Id: I210a9969f4bf6a1dc5c199836abec08d78968c36 Reviewed-on: https://gerrit.libreoffice.org/38702 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Takeshi Abe <tabe@fixedpoint.jp>
Diffstat (limited to 'starmath')
-rw-r--r--starmath/source/mathtype.cxx14
-rw-r--r--starmath/source/mathtype.hxx4
2 files changed, 9 insertions, 9 deletions
diff --git a/starmath/source/mathtype.cxx b/starmath/source/mathtype.cxx
index 1fc3ba3b8fdb..be6edef032b5 100644
--- a/starmath/source/mathtype.cxx
+++ b/starmath/source/mathtype.cxx
@@ -590,7 +590,7 @@ bool MathType::Parse(SotStorage *pStor)
//sigh, theres no point! MathType (in some bizarre subvarient) pads
//the end of the formula with ENDs (0)'s
- sal_uLong nEnd = pS->Tell();
+ auto nEnd = pS->Tell();
SAL_WARN_IF(nEnd == pS->Seek(STREAM_SEEK_TO_END), "starmath", "Possibly unfully parsed formula");
#endif
return bRet;
@@ -2164,7 +2164,7 @@ void MathType::HandleRoot(SmNode *pNode,int nLevel)
}
sal_uInt8 MathType::HandleCScript(SmNode *pNode,SmNode *pContent,int nLevel,
- sal_uLong *pPos,bool bTest)
+ sal_uInt64 *pPos,bool bTest)
{
sal_uInt8 nVariation2=0xff;
@@ -2352,7 +2352,7 @@ void MathType::HandleBrace(SmNode *pNode,int nLevel)
pS->WriteUChar( TMPL ); //Template
bIsReInterpBrace=false;
sal_uInt8 nBSpec=0x10;
- sal_uLong nLoc = pS->Tell();
+ auto nLoc = pS->Tell();
if (pLeft)
{
switch (pLeft->GetToken().eType)
@@ -2410,7 +2410,7 @@ void MathType::HandleBrace(SmNode *pNode,int nLevel)
HandleNodes(pLeft,nLevel+1);
if (bIsReInterpBrace)
{
- sal_uLong nLoc2 = pS->Tell();
+ auto nLoc2 = pS->Tell();
pS->Seek(nLoc);
pS->WriteUChar( 0x2D );
pS->Seek(nLoc2);
@@ -2458,7 +2458,7 @@ void MathType::HandleOperator(SmNode *pNode,int nLevel)
if (HandleLim(pNode,nLevel))
return;
- sal_uLong nPos;
+ sal_uInt64 nPos;
sal_uInt8 nVariation;
switch (pNode->GetToken().eType)
@@ -2480,7 +2480,7 @@ void MathType::HandleOperator(SmNode *pNode,int nLevel)
sal_uInt8 nOldVariation=nVariation;
sal_uInt8 nIntVariation=nVariation;
- sal_uLong nPos2=0;
+ sal_uInt64 nPos2=0;
if (nVariation != 0xff)
{
nPos2 = pS->Tell();
@@ -3226,7 +3226,7 @@ void MathType::HandleAttributes(SmNode *pNode,int nLevel)
{
if ((nInsertion != 0) && nullptr != (pTemp = pNode->GetSubNode(0)))
{
- sal_uLong nPos = pS->Tell();
+ auto nPos = pS->Tell();
nInsertion--;
pS->Seek(nInsertion);
switch(pTemp->GetToken().eType)
diff --git a/starmath/source/mathtype.hxx b/starmath/source/mathtype.hxx
index 2fd259fd81f7..07951c935ddd 100644
--- a/starmath/source/mathtype.hxx
+++ b/starmath/source/mathtype.hxx
@@ -134,7 +134,7 @@ private:
void HandleRoot(SmNode *pNode,int nLevel);
void HandleSubSupScript(SmNode *pNode,int nLevel);
sal_uInt8 HandleCScript(SmNode *pNode,SmNode *pContent,int nLevel,
- sal_uLong *pPos=nullptr,bool bTest=true);
+ sal_uInt64 *pPos=nullptr,bool bTest=true);
void HandleFractions(SmNode *pNode,int nLevel);
void HandleBrace(SmNode *pNode,int nLevel);
void HandleVerticalBrace(SmNode *pNode,int nLevel);
@@ -152,7 +152,7 @@ private:
sal_uInt8 nHAlign;
int nPendingAttributes;
- sal_uLong nInsertion;
+ sal_uInt64 nInsertion;
std::vector<sal_Int16> aSizeTable;
sal_Int16 nLSize;