diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-09-14 17:01:50 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-09-15 12:01:11 +0200 |
| commit | b647996a9babbee7b33cf45192e57df6a124628b (patch) | |
| tree | ddc6dfe8a62ec53fbacc4eeccfeb20019f3ef4f0 /dbaccess | |
| parent | a19a67e20e847a42063559694ec5beec71abcfb3 (diff) | |
replace sal_Size with std::size_t (or sal_uInt64 for SvStream pos)
... except in include/rtl, include/sal, include/uno, where sal_Size is
retained for compatibility, and where callers of rtl functions pass in
pointers that are incompatible on MSVC.
Change-Id: I8344453780689f5120ba0870e44965b6d292450c
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/ui/misc/HtmlReader.cxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/misc/RtfReader.cxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/ui/misc/WTypeSelect.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/dbaccess/source/ui/misc/HtmlReader.cxx b/dbaccess/source/ui/misc/HtmlReader.cxx index e36bd7bee673..ade33d9dbef2 100644 --- a/dbaccess/source/ui/misc/HtmlReader.cxx +++ b/dbaccess/source/ui/misc/HtmlReader.cxx @@ -148,7 +148,7 @@ void OHTMLReader::NextToken( int nToken ) case HTML_THEAD_ON: case HTML_TBODY_ON: { - sal_Size nTell = rInput.Tell(); // perhaps alters position of the stream + sal_uInt64 const nTell = rInput.Tell(); // perhaps alters position of the stream if ( !m_xTable.is() ) {// use first line as header m_bError = !CreateTable(nToken); diff --git a/dbaccess/source/ui/misc/RtfReader.cxx b/dbaccess/source/ui/misc/RtfReader.cxx index 5386ef879706..4adee9797122 100644 --- a/dbaccess/source/ui/misc/RtfReader.cxx +++ b/dbaccess/source/ui/misc/RtfReader.cxx @@ -140,7 +140,7 @@ void ORTFReader::NextToken( int nToken ) bool bInsertRow = true; if ( !m_xTable.is() ) // use first line as header { - sal_Size nTell = rInput.Tell(); // perhaps alters position of the stream + sal_uInt64 const nTell = rInput.Tell(); // perhaps alters position of the stream m_bError = !CreateTable(nToken); bInsertRow = m_bAppendFirstLine; diff --git a/dbaccess/source/ui/misc/WTypeSelect.cxx b/dbaccess/source/ui/misc/WTypeSelect.cxx index 054dff335d22..204a33610e46 100644 --- a/dbaccess/source/ui/misc/WTypeSelect.cxx +++ b/dbaccess/source/ui/misc/WTypeSelect.cxx @@ -482,7 +482,7 @@ void OWizTypeSelect::fillColumnList(sal_uInt32 nRows) { if(m_pParserStream) { - sal_Size nTell = m_pParserStream->Tell(); // might change seek position of stream + sal_uInt64 const nTell = m_pParserStream->Tell(); // might change seek position of stream SvParser *pReader = createReader(nRows); if(pReader) |