From 061130bd6d60c648991afb83bc0befb48a68f34e Mon Sep 17 00:00:00 2001 From: Valentin Kettner Date: Mon, 17 Mar 2014 17:18:08 +0100 Subject: fdo#75280 Started cleaning up of sal_uIntPtr usage. Converted wrong usage of sal_uIntPtr to appropriate other types in basic module. The bug is not fully fixed with this since many other occurences of sal_uIntPtr remain. Update due to code review comments: Fixed forgetting to change some declarations in iosys.cxx. Cleaned up the one remaining sal_uIntPtr in iosys.cxx Fixed adding a sal_uInt64 to a Date (uses long now instead) in methods.cxx Fixed the VarDecFromUI4 call in sbxdec.cxx from sal_uLong to ULONG . Conflicts: basic/source/runtime/iosys.cxx Change-Id: Ia6460be04967deb68b92eb62d945da8814fae605 --- include/basic/basmgr.hxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'include/basic') diff --git a/include/basic/basmgr.hxx b/include/basic/basmgr.hxx index 9a55f5d92e7c..01d90e7ecf52 100644 --- a/include/basic/basmgr.hxx +++ b/include/basic/basmgr.hxx @@ -46,19 +46,19 @@ class SotStorage; class BASIC_DLLPUBLIC BasicError { private: - sal_uIntPtr nErrorId; + sal_uInt64 nErrorId; sal_uInt16 nReason; OUString aErrStr; public: BasicError( const BasicError& rErr ); - BasicError( sal_uIntPtr nId, sal_uInt16 nR, const OUString& rErrStr ); + BasicError( sal_uInt64 nId, sal_uInt16 nR, const OUString& rErrStr ); - sal_uIntPtr GetErrorId() const { return nErrorId; } + sal_uInt64 GetErrorId() const { return nErrorId; } sal_uInt16 GetReason() const { return nReason; } OUString GetErrorStr() { return aErrStr; } - void SetErrorId( sal_uIntPtr n ) { nErrorId = n; } + void SetErrorId( sal_uInt64 n ) { nErrorId = n; } void SetReason( sal_uInt16 n ) { nReason = n; } void SetErrorStr( const OUString& rStr) { aErrStr = rStr; } }; -- cgit