harmonize Tell() Seek() type.

Change-Id: I2e472aa0279d0763762d3c660207cd74da512626

4 files changed, 16 insertions, 16 deletions

diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
index 92201b729cef..626c834587d3 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx
@@ -345,14 +345,14 @@ void RTFDocumentImpl::setIgnoreFirst(OUString& rIgnoreFirst)
     m_aIgnoreFirst = rIgnoreFirst;
 }
 
-void RTFDocumentImpl::resolveSubstream(sal_uInt32 nPos, Id nId)
+void RTFDocumentImpl::resolveSubstream(sal_Size nPos, Id nId)
 {
     OUString aStr;
     resolveSubstream(nPos, nId, aStr);
 }
-void RTFDocumentImpl::resolveSubstream(sal_uInt32 nPos, Id nId, OUString& rIgnoreFirst)
+void RTFDocumentImpl::resolveSubstream(sal_Size nPos, Id nId, OUString& rIgnoreFirst)
 {
-    sal_uInt32 nCurrent = Strm().Tell();
+    sal_Size nCurrent = Strm().Tell();
     // Seek to header position, parse, then seek back.
     RTFDocumentImpl::Pointer_t pImpl(new RTFDocumentImpl(m_xContext, m_xInputStream, m_xDstDoc, m_xFrame, m_xStatusIndicator));
     pImpl->setSuperstream(this);
@@ -539,7 +539,7 @@ void RTFDocumentImpl::sectBreak(bool bFinal = false)
     }
     while (!m_nHeaderFooterPositions.empty())
     {
-        std::pair<Id, sal_uInt32> aPair = m_nHeaderFooterPositions.front();
+        std::pair<Id, sal_Size> aPair = m_nHeaderFooterPositions.front();
         m_nHeaderFooterPositions.pop();
         resolveSubstream(aPair.second, aPair.first);
     }
@@ -575,7 +575,7 @@ void RTFDocumentImpl::sectBreak(bool bFinal = false)
     m_bNeedSect = false;
 }
 
-void RTFDocumentImpl::seek(sal_uInt32 nPos)
+void RTFDocumentImpl::seek(sal_Size nPos)
 {
     Strm().Seek(nPos);
 }
@@ -1278,7 +1278,7 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword)
         case RTF_FLDINST:
             {
                 // Look for the field type
-                sal_Int32 nPos = Strm().Tell();
+                sal_Size nPos = Strm().Tell();
                 OStringBuffer aBuf;
                 char ch = 0;
                 bool bFoundCode = false;
@@ -1385,7 +1385,7 @@ int RTFDocumentImpl::dispatchDestination(RTFKeyword nKeyword)
             if (!m_pSuperstream)
             {
                 Id nId = 0;
-                sal_uInt32 nPos = m_nGroupStartPos - 1;
+                sal_Size nPos = m_nGroupStartPos - 1;
                 switch (nKeyword)
                 {
                     case RTF_HEADER: nId = NS_ooxml::LN_headerr; break;
diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.hxx b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
index b7c299c9583b..a6450c1f48ee 100644
--- a/writerfilter/source/rtftok/rtfdocumentimpl.hxx
+++ b/writerfilter/source/rtftok/rtfdocumentimpl.hxx
@@ -318,7 +318,7 @@ namespace writerfilter {
                 void setAuthor(OUString& rAuthor);
                 void setAuthorInitials(OUString& rAuthorInitials);
                 void setIgnoreFirst(OUString& rIgnoreFirst);
-                void seek(sal_uInt32 nPos);
+                void seek(sal_Size nPos);
                 uno::Reference<lang::XMultiServiceFactory> getModelFactory();
                 bool isInBackground();
                 void setDestinationText(OUString& rString);
@@ -348,8 +348,8 @@ namespace writerfilter {
                 RTFSprms mergeAttributes();
                 void resetSprms();
                 void resetAttributes();
-                void resolveSubstream(sal_uInt32 nPos, Id nId);
-                void resolveSubstream(sal_uInt32 nPos, Id nId, OUString& rIgnoreFirst);
+                void resolveSubstream(sal_Size nPos, Id nId);
+                void resolveSubstream(sal_Size nPos, Id nId, OUString& rIgnoreFirst);
 
                 void text(OUString& rString);
                 // Sends a single character to dmapper, taking care of buffering.
@@ -421,8 +421,8 @@ namespace writerfilter {
                 RTFDocumentImpl *m_pSuperstream;
                 /// Type of the stream: header, footer, footnote, etc.
                 Id m_nStreamType;
-                std::queue< std::pair<Id, sal_uInt32> > m_nHeaderFooterPositions;
-                sal_uInt32 m_nGroupStartPos;
+                std::queue< std::pair<Id, sal_Size> > m_nHeaderFooterPositions;
+                sal_Size m_nGroupStartPos;
                 /// Ignore the first occurrence of this text.
                 OUString m_aIgnoreFirst;
                 /// Bookmark name <-> index map.
diff --git a/writerfilter/source/rtftok/rtftokenizer.cxx b/writerfilter/source/rtftok/rtftokenizer.cxx
index 636778d2022b..1750306c8d02 100644
--- a/writerfilter/source/rtftok/rtftokenizer.cxx
+++ b/writerfilter/source/rtftok/rtftokenizer.cxx
@@ -67,9 +67,9 @@ int RTFTokenizer::resolveParse()
         static ResMgr* pResMgr = ResMgr::CreateResMgr("svx", Application::GetSettings().GetUILanguageTag());
         OUString sDocLoad(ResId(RID_SVXSTR_DOC_LOAD, *pResMgr).toString());
 
-        sal_uInt32 nCurrentPos = Strm().Tell();
+        sal_Size nCurrentPos = Strm().Tell();
         Strm().Seek(STREAM_SEEK_TO_END);
-        sal_uInt32 nEndPos = Strm().Tell();
+        sal_Size nEndPos = Strm().Tell();
         Strm().Seek(nCurrentPos);
         m_xStatusIndicator->start(sDocLoad, nEndPos);
         nPercentSize = nEndPos / 100;
@@ -81,7 +81,7 @@ int RTFTokenizer::resolveParse()
     {
         //SAL_INFO("writerfilter", OSL_THIS_FUNC << ": parsing character '" << ch << "'");
 
-        sal_uInt32 nCurrentPos = Strm().Tell();
+        sal_Size nCurrentPos = Strm().Tell();
         if (m_xStatusIndicator.is() && nCurrentPos > (nLastPos + nPercentSize))
             m_xStatusIndicator->setValue(nLastPos = nCurrentPos);
 
diff --git a/writerfilter/source/rtftok/rtftokenizer.hxx b/writerfilter/source/rtftok/rtftokenizer.hxx
index b055b8c12669..7eb6fdd7b989 100644
--- a/writerfilter/source/rtftok/rtftokenizer.hxx
+++ b/writerfilter/source/rtftok/rtftokenizer.hxx
@@ -48,7 +48,7 @@ namespace writerfilter {
                 /// Same as the size of the importer's states, except that this can be negative for invalid input.
                 int m_nGroup;
                 sal_Int32 m_nLineNumber;
-                sal_Int32 m_nLineStartPos;
+                sal_Size m_nLineStartPos;
                 sal_Size m_nGroupStart;
         };
     } // namespace rtftok