more long to WW8_CP conversions

Change-Id: Ib56461af1ff911eeecfc560342c1f9b9a74cb7c6

4 files changed, 15 insertions, 18 deletions

diff --git a/sw/source/filter/ww8/ww8par.cxx b/sw/source/filter/ww8/ww8par.cxx
index 8f63523f6862..96c71b7fb12c 100644
--- a/sw/source/filter/ww8/ww8par.cxx
+++ b/sw/source/filter/ww8/ww8par.cxx
@@ -2295,8 +2295,7 @@ bool SwWW8ImplReader::HasOwnHeaderFooter(sal_uInt8 nWhichItems, sal_uInt8 grpfIh
 {
     if (m_pHdFt)
     {
-        WW8_CP start;
-        long nLen;
+        WW8_CP nStart, nLen;
         sal_uInt8 nNumber = 5;
 
         for( sal_uInt8 nI = 0x20; nI; nI >>= 1, nNumber-- )
@@ -2305,11 +2304,11 @@ bool SwWW8ImplReader::HasOwnHeaderFooter(sal_uInt8 nWhichItems, sal_uInt8 grpfIh
             {
                 bool bOk = true;
                 if( m_bVer67 )
-                    bOk = ( m_pHdFt->GetTextPos(grpfIhdt, nI, start, nLen ) && nLen >= 2 );
+                    bOk = ( m_pHdFt->GetTextPos(grpfIhdt, nI, nStart, nLen ) && nLen >= 2 );
                 else
                 {
-                    m_pHdFt->GetTextPosExact( static_cast< short >(nNumber + (nSect+1)*6), start, nLen);
-                    bOk = ( 2 <= nLen ) && isValid_HdFt_CP(start);
+                    m_pHdFt->GetTextPosExact( static_cast< short >(nNumber + (nSect+1)*6), nStart, nLen);
+                    bOk = ( 2 <= nLen ) && isValid_HdFt_CP(nStart);
                 }
 
                 if (bOk)
@@ -2328,8 +2327,7 @@ void SwWW8ImplReader::Read_HdFt(int nSect, const SwPageDesc *pPrev,
 
     if( m_pHdFt )
     {
-        WW8_CP start;
-        long nLen;
+        WW8_CP nStart, nLen;
         sal_uInt8 nNumber = 5;
 
         // This loops through the 6 flags WW8_{FOOTER,HEADER}_{ODD,EVEN,FIRST}
@@ -2341,11 +2339,11 @@ void SwWW8ImplReader::Read_HdFt(int nSect, const SwPageDesc *pPrev,
             {
                 bool bOk = true;
                 if( m_bVer67 )
-                    bOk = ( m_pHdFt->GetTextPos(grpfIhdt, nI, start, nLen ) && nLen >= 2 );
+                    bOk = ( m_pHdFt->GetTextPos(grpfIhdt, nI, nStart, nLen ) && nLen >= 2 );
                 else
                 {
-                    m_pHdFt->GetTextPosExact( static_cast< short >(nNumber + (nSect+1)*6), start, nLen);
-                    bOk = ( 2 <= nLen ) && isValid_HdFt_CP(start);
+                    m_pHdFt->GetTextPosExact( static_cast< short >(nNumber + (nSect+1)*6), nStart, nLen);
+                    bOk = ( 2 <= nLen ) && isValid_HdFt_CP(nStart);
                 }
 
                 bool bUseLeft
@@ -2405,11 +2403,11 @@ void SwWW8ImplReader::Read_HdFt(int nSect, const SwPageDesc *pPrev,
 
                     if (bHackRequired)
                     {
-                        Read_HdFtTextAsHackedFrame(start, nLen, *pHdFtFormat,
+                        Read_HdFtTextAsHackedFrame(nStart, nLen, *pHdFtFormat,
                             static_cast< sal_uInt16 >(rSection.GetTextAreaWidth()) );
                     }
                     else
-                        Read_HdFtText(start, nLen, pHdFtFormat);
+                        Read_HdFtText(nStart, nLen, pHdFtFormat);
                 }
                 else if (!bOk && pPrev)
                     CopyPageDescHdFt(pPrev, pPD, nI);
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 0e587a00265a..e36633a58f06 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -1143,8 +1143,7 @@ void wwSectionManager::CreateSep(const long nTextPos, bool /*bMustHaveBreak*/)
         {
             if (aNewSection.maSep.grpfIhdt & nMask)
             {
-                WW8_CP nStart;
-                long nLen;
+                WW8_CP nStart, nLen;
                 mrReader.m_pHdFt->GetTextPosExact( static_cast< short >(nI + ( maSegments.size() + 1) * 6), nStart, nLen);
                 //No header or footer, inherit pervious one, or set to zero
                 //if no previous one
diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx
index c093976b312e..8ad6e09aa70c 100644
--- a/sw/source/filter/ww8/ww8scan.cxx
+++ b/sw/source/filter/ww8/ww8scan.cxx
@@ -6650,7 +6650,7 @@ WW8PLCF_HdFt::WW8PLCF_HdFt( SvStream* pSt, WW8Fib& rFib, WW8Dop& rDop )
 }
 
 bool WW8PLCF_HdFt::GetTextPos(sal_uInt8 grpfIhdt, sal_uInt8 nWhich, WW8_CP& rStart,
-    long& rLen)
+    WW8_CP& rLen)
 {
     sal_uInt8 nI = 0x01;
     short nIdx = nIdxOffset;
@@ -6676,7 +6676,7 @@ bool WW8PLCF_HdFt::GetTextPos(sal_uInt8 grpfIhdt, sal_uInt8 nWhich, WW8_CP& rSta
     return true;
 }
 
-bool WW8PLCF_HdFt::GetTextPosExact(short nIdx, WW8_CP& rStart, long& rLen)
+bool WW8PLCF_HdFt::GetTextPosExact(short nIdx, WW8_CP& rStart, WW8_CP& rLen)
 {
     WW8_CP nEnd;
     void* pData;
diff --git a/sw/source/filter/ww8/ww8scan.hxx b/sw/source/filter/ww8/ww8scan.hxx
index cd101bd367d1..5c3970cfb43e 100644
--- a/sw/source/filter/ww8/ww8scan.hxx
+++ b/sw/source/filter/ww8/ww8scan.hxx
@@ -1768,8 +1768,8 @@ private:
 
 public:
     WW8PLCF_HdFt( SvStream* pSt, WW8Fib& rFib, WW8Dop& rDop );
-    bool GetTextPos(sal_uInt8 grpfIhdt, sal_uInt8 nWhich, WW8_CP& rStart, long& rLen);
-    bool GetTextPosExact(short nIdx, WW8_CP& rStart, long& rLen);
+    bool GetTextPos(sal_uInt8 grpfIhdt, sal_uInt8 nWhich, WW8_CP& rStart, WW8_CP& rLen);
+    bool GetTextPosExact(short nIdx, WW8_CP& rStart, WW8_CP& rLen);
     void UpdateIndex( sal_uInt8 grpfIhdt );
 };