basic/source/basmgr/basicmanagerrepository.cxx|2 -
basic/source/classes/image.cxx| 28 +-
basic/source/classes/sb.cxx |6 +--
basic/source/inc/iosys.hxx|8 ++---
connectivity/source/drivers/dbase/DIndex.cxx |4 +-
cppcanvas/source/mtfrenderer/implrenderer.cxx |2 -
framework/source/uielement/newmenucontroller.cxx |6 +--
framework/source/uielement/toolbarsmenucontroller.cxx |2 -
8 files changed, 29 insertions(+), 29 deletions(-)
New commits:
commit bccd83ea5434f945c22d0c45dbc2c3d13efdffee
Author: Johannes Hauf <hauf.johan...@gmail.com>
Date: Thu Dec 31 10:58:37 2015 +0100
Some cleanup for sal_uIntPtr usage
Change-Id: Ia9779e6477d8848588f3543d09ea6b4477f594a2
Reviewed-on: https://gerrit.libreoffice.org/21022
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
Tested-by: Stephan Bergmann <sberg...@redhat.com>
diff --git a/basic/source/basmgr/basicmanagerrepository.cxx
b/basic/source/basmgr/basicmanagerrepository.cxx
index de559e9..fd2dc80 100644
--- a/basic/source/basmgr/basicmanagerrepository.cxx
+++ b/basic/source/basmgr/basicmanagerrepository.cxx
@@ -599,7 +599,7 @@ namespace basic
void BasicManagerRepository::resetApplicationBasicManager()
{
-return ImplRepository::Instance().setApplicationBasicManager( nullptr
);
+ImplRepository::Instance().setApplicationBasicManager( nullptr );
}
diff --git a/basic/source/classes/image.cxx b/basic/source/classes/image.cxx
index a487e62..d79c21c 100644
--- a/basic/source/classes/image.cxx
+++ b/basic/source/classes/image.cxx
@@ -83,17 +83,17 @@ bool SbiGood( SvStream& r )
}
// Open Record
-sal_uIntPtr SbiOpenRecord( SvStream& r, sal_uInt16 nSignature, sal_uInt16
nElem )
+sal_uInt64 SbiOpenRecord( SvStream& r, sal_uInt16 nSignature, sal_uInt16 nElem
)
{
-sal_Size nPos = r.Tell();
+sal_uInt64 nPos = r.Tell();
r.WriteUInt16( nSignature ).WriteInt32( 0 ).WriteUInt16( nElem );
return nPos;
}
// Close Record
-void SbiCloseRecord( SvStream& r, sal_Size nOff )
+void SbiCloseRecord( SvStream& r, sal_uInt64 nOff )
{
-sal_Size nPos = r.Tell();
+sal_uInt64 nPos = r.Tell();
r.Seek( nOff + 2 );
r.WriteInt32(nPos - nOff - 8 );
r.Seek( nPos );
@@ -114,7 +114,7 @@ bool SbiImage::Load( SvStream& r, sal_uInt32& nVersion )
Clear();
// Read Master-Record
r.ReadUInt16( nSign ).ReadUInt32( nLen ).ReadUInt16( nCount );
-sal_Size nLast = r.Tell() + nLen;
+sal_uInt64 nLast = r.Tell() + nLen;
sal_uInt32 nCharSet; // System charset
sal_uInt32 lDimBase;
sal_uInt16 nReserved1;
@@ -135,7 +135,7 @@ bool SbiImage::Load( SvStream& r, sal_uInt32& nVersion )
bool bLegacy = ( nVersion < B_EXT_IMG_VERSION );
-sal_Size nNext;
+sal_uInt64 nNext;
while( ( nNext = r.Tell() ) < nLast )
{
@@ -160,7 +160,7 @@ bool SbiImage::Load( SvStream& r, sal_uInt32& nVersion )
{
//assuming an empty string with just the lead 32bit/16bit len
indicator
const size_t nMinStringSize = (eCharSet ==
RTL_TEXTENCODING_UNICODE) ? 4 : 2;
-const size_t nMaxStrings = r.remainingSize() / nMinStringSize;
+const sal_uInt64 nMaxStrings = r.remainingSize() /
nMinStringSize;
if (nCount > nMaxStrings)
{
SAL_WARN("basic", "Parsing error: " << nMaxStrings <<
@@ -207,8 +207,8 @@ bool SbiImage::Load( SvStream& r, sal_uInt32& nVersion )
{
if( bBadVer ) break;
//assuming an empty string with just the lead 32bit len
indicator
-const size_t nMinStringSize = 4;
-const size_t nMaxStrings = r.remainingSize() / nMinStringSize;
+const sal_uInt64 nMinStringSize = 4;
+const sal_uInt64 nMaxStrings = r.remainingSize() /
nMinStringSize;
if (nCount > nMaxStrings)
{
SAL_WARN("basic", "Parsing error: " << nMaxStrings <<
@@ -244,8 +244,8 @@ bool SbiImage::Load( SvStream& r, sal_uInt32& nVersion )
{
//assuming an empty string with just the lead 32bit/16bit len
indicator
const size_t nMinStringSize = (eCharSet ==
RTL_TEXTENCODING_UNICODE) ? 4 : 2;
-const size_t nMinRecordSize = nMinStringSize +
sizeof(sal_Int16);
-const size_t nMaxRecords = r.remainingSize() / nMinRecordSize;
+const sal_uInt64 nMinRecordSize = nMinStringSize +
sizeof(sal_Int16);
+const sal_uInt64 nMaxRecords = r.remainingSize() /
nMinRecordSize;
if (nCount > nM
