include/svtools/ehdl.hxx | 2 +-
include/vcl/errinf.hxx | 24 ++++++++++++------------
sd/source/filter/html/htmlex.cxx | 2 +-
sd/source/filter/html/htmlex.hxx | 2 +-
svtools/source/misc/ehdl.cxx | 2 +-
vcl/source/window/errinf.cxx | 18 +++++++++---------
6 files changed, 25 insertions(+), 25 deletions(-)
New commits:
commit 437a5d7c72547f6f17b4ffecd51e76a2487de99e
Author: Chris Sherlock <chris.sherloc...@gmail.com>
Date: Sat Apr 15 19:38:53 2017 +1000
tdf#75280: convert sal_uIntPtr to sal_uInt32 for ErrorInfo member
Change-Id: I97f3b18604f17b0ccc9fd1bbb0221ff5e11fe826
Reviewed-on: https://gerrit.libreoffice.org/36840
Reviewed-by: Chris Sherlock <chris.sherloc...@gmail.com>
Tested-by: Chris Sherlock <chris.sherloc...@gmail.com>
diff --git a/include/svtools/ehdl.hxx b/include/svtools/ehdl.hxx
index 183121851e9c..681a22ac2872 100644
--- a/include/svtools/ehdl.hxx
+++ b/include/svtools/ehdl.hxx
@@ -39,7 +39,7 @@ public:
SfxErrorContext(
sal_uInt16 nCtxIdP, const OUString &aArg1, vcl::Window
*pWin=nullptr,
sal_uInt16 nResIdP=USHRT_MAX, ResMgr *pMgrP=nullptr);
- bool GetString(sal_uLong nErrId, OUString &rStr) override;
+ bool GetString(sal_uInt32 nErrId, OUString &rStr) override;
private:
sal_uInt16 nCtxId;
diff --git a/include/vcl/errinf.hxx b/include/vcl/errinf.hxx
index 68e5f08e0840..f458ef6da474 100644
--- a/include/vcl/errinf.hxx
+++ b/include/vcl/errinf.hxx
@@ -65,17 +65,17 @@ namespace o3tl
class SAL_WARN_UNUSED VCL_DLLPUBLIC ErrorInfo
{
private:
- sal_uIntPtr lUserId;
+ sal_uInt32 lUserId;
public:
- ErrorInfo( sal_uIntPtr lArgUserId ) :
+ ErrorInfo( sal_uInt32 lArgUserId ) :
lUserId( lArgUserId ){}
virtual ~ErrorInfo();
- sal_uIntPtr GetErrorCode() const { return lUserId; }
+ sal_uInt32 GetErrorCode() const { return lUserId; }
- static ErrorInfo* GetErrorInfo(sal_uIntPtr);
+ static ErrorInfo* GetErrorInfo(sal_uInt32);
};
class SAL_WARN_UNUSED VCL_DLLPUBLIC DynamicErrorInfo : public ErrorInfo
@@ -87,10 +87,10 @@ private:
public:
- DynamicErrorInfo(sal_uIntPtr lUserId,
ErrorHandlerFlags nMask);
+ DynamicErrorInfo(sal_uInt32 lUserId,
ErrorHandlerFlags nMask);
virtual ~DynamicErrorInfo() override;
- operator sal_uIntPtr() const;
+ operator sal_uInt32() const;
ErrorHandlerFlags GetDialogMask() const;
};
@@ -101,7 +101,7 @@ private:
public:
- StringErrorInfo( sal_uIntPtr lUserId,
+ StringErrorInfo( sal_uInt32 lUserId,
const OUString& aStringP,
ErrorHandlerFlags nMask =
ErrorHandlerFlags::NONE);
const OUString& GetErrorString() const { return aString; }
@@ -115,7 +115,7 @@ private:
public:
- TwoStringErrorInfo(sal_uIntPtr nUserID, const OUString & rTheArg1,
+ TwoStringErrorInfo(sal_uInt32 nUserID, const OUString & rTheArg1,
const OUString & rTheArg2, ErrorHandlerFlags nMask):
DynamicErrorInfo(nUserID, nMask), aArg1(rTheArg1), aArg2(rTheArg2) {}
@@ -135,7 +135,7 @@ public:
ErrorContext(vcl::Window *pWin);
virtual ~ErrorContext();
- virtual bool GetString( sal_uIntPtr nErrId, OUString& rCtxStr )
= 0;
+ virtual bool GetString( sal_uInt32 nErrId, OUString& rCtxStr )
= 0;
vcl::Window* GetParent();
static ErrorContext* GetContext();
@@ -152,7 +152,7 @@ class SAL_WARN_UNUSED VCL_DLLPUBLIC ErrorHandler
friend class ErrorHandler_Impl;
private:
- static ErrorHandlerFlags HandleError_Impl( sal_uIntPtr lId,
+ static ErrorHandlerFlags HandleError_Impl( sal_uInt32 lId,
ErrorHandlerFlags nFlags,
bool bJustCreateString,
OUString & rError);
@@ -163,8 +163,8 @@ public:
ErrorHandler();
virtual ~ErrorHandler();
- static ErrorHandlerFlags HandleError ( sal_uIntPtr lId, ErrorHandlerFlags
nMask = ErrorHandlerFlags::MAX );
- static bool GetErrorString( sal_uIntPtr lId, OUString& rStr );
+ static ErrorHandlerFlags HandleError ( sal_uInt32 lId, ErrorHandlerFlags
nMask = ErrorHandlerFlags::MAX );
+ static bool GetErrorString( sal_uInt32 lId, OUString& rStr );
static void RegisterDisplay( BasicDisplayErrorFunc* );
static void RegisterDisplay( WindowDisplayErrorFunc* );
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index 41c62c616d5d..934f8027fba5 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -3229,7 +3229,7 @@ HtmlErrorContext::HtmlErrorContext()
mnResId = 0;
}
-bool HtmlErrorContext::GetString( sal_uLong, OUString& rCtxStr )
+bool HtmlErrorContext::GetString( sal_uInt32, OUString& rCtxStr )
{
DBG_ASSERT( mnResId != 0, "No error context set" );
if( mnResId == 0 )
diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx
index 2af311c78573..e7e5ff6d9d96 100644
--- a/sd/source/filter/html/htmlex.hxx
+++ b/sd/source/filter/html/htmlex.hxx
@@ -68,7 +68,7 @@ private:
public:
explicit HtmlErrorContext();
- virtual bool GetString( sal_uLong nErrId, OUString& rCtxStr ) override;
+ virtual bool GetString( sal_uInt32 nErrId, OUString& rCtxStr ) override;
void SetContext( sal_uInt16 nResId, const OUString& rURL );
void SetContext( sal_uInt16 nResId, const OUString& rURL1,
const OUString& rURL2 );
diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx
index aa2a7faa48c0..c1415de3e3be 100644
--- a/svtools/source/misc/ehdl.cxx
+++ b/svtools/source/misc/ehdl.cxx
@@ -272,7 +272,7 @@ SfxErrorContext::SfxErrorContext(
}
-bool SfxErrorContext::GetString(sal_uLong nErrId, OUString &rStr)
+bool SfxErrorContext::GetString(sal_uInt32 nErrId, OUString &rStr)
/* [Description]
diff --git a/vcl/source/window/errinf.cxx b/vcl/source/window/errinf.cxx
index cfe44da63c2f..af9a68010de8 100644
--- a/vcl/source/window/errinf.cxx
+++ b/vcl/source/window/errinf.cxx
@@ -52,7 +52,7 @@ class DynamicErrorInfo_Impl
void RegisterEDcr(DynamicErrorInfo *);
static void UnRegisterEDcr(DynamicErrorInfo const *);
- static ErrorInfo* GetDynamicErrorInfo(sal_uIntPtr lId);
+ static ErrorInfo* GetDynamicErrorInfo(sal_uInt32 lId);
friend class DynamicErrorInfo;
friend class ErrorInfo;
@@ -97,7 +97,7 @@ ErrorInfo::~ErrorInfo()
}
-ErrorInfo *ErrorInfo::GetErrorInfo(sal_uIntPtr lId)
+ErrorInfo *ErrorInfo::GetErrorInfo(sal_uInt32 lId)
{
if(lId & ERRCODE_DYNAMIC_MASK)
return DynamicErrorInfo_Impl::GetDynamicErrorInfo(lId);
@@ -105,12 +105,12 @@ ErrorInfo *ErrorInfo::GetErrorInfo(sal_uIntPtr lId)
return new ErrorInfo(lId);
}
-DynamicErrorInfo::operator sal_uIntPtr() const
+DynamicErrorInfo::operator sal_uInt32() const
{
return pImpl->lErrId;
}
-DynamicErrorInfo::DynamicErrorInfo(sal_uIntPtr lArgUserId, ErrorHandlerFlags
nMask)
+DynamicErrorInfo::DynamicErrorInfo(sal_uInt32 lArgUserId, ErrorHandlerFlags
nMask)
: ErrorInfo(lArgUserId),
pImpl(new DynamicErrorInfo_Impl)
{
@@ -123,7 +123,7 @@ DynamicErrorInfo::~DynamicErrorInfo()
DynamicErrorInfo_Impl::UnRegisterEDcr(this);
}
-ErrorInfo* DynamicErrorInfo_Impl::GetDynamicErrorInfo(sal_uIntPtr lId)
+ErrorInfo* DynamicErrorInfo_Impl::GetDynamicErrorInfo(sal_uInt32 lId)
{
sal_uIntPtr lIdx = ((lId & ERRCODE_DYNAMIC_MASK)>>ERRCODE_DYNAMIC_SHIFT)-1;
DynamicErrorInfo* pDynErrInfo = TheErrorRegistry::get().ppDynErrInfo[lIdx];
@@ -139,7 +139,7 @@ ErrorHandlerFlags DynamicErrorInfo::GetDialogMask() const
}
StringErrorInfo::StringErrorInfo(
- sal_uIntPtr UserId, const OUString& aStringP, ErrorHandlerFlags nMask)
+ sal_uInt32 UserId, const OUString& aStringP, ErrorHandlerFlags nMask)
: DynamicErrorInfo(UserId, nMask), aString(aStringP)
{
}
@@ -236,7 +236,7 @@ void ErrorHandler::RegisterDisplay(BasicDisplayErrorFunc
*aDsp)
@return ???
*/
ErrorHandlerFlags ErrorHandler::HandleError_Impl(
- sal_uIntPtr nErrCodeId, ErrorHandlerFlags nFlags, bool bJustCreateString,
OUString & rError)
+ sal_uInt32 nErrCodeId, ErrorHandlerFlags nFlags, bool bJustCreateString,
OUString & rError)
{
OUString aErr;
OUString aAction;
@@ -322,7 +322,7 @@ ErrorHandlerFlags ErrorHandler::HandleError_Impl(
}
// static
-bool ErrorHandler::GetErrorString(sal_uIntPtr lId, OUString& rStr)
+bool ErrorHandler::GetErrorString(sal_uInt32 lId, OUString& rStr)
{
return HandleError_Impl( lId, ErrorHandlerFlags::MAX, true, rStr ) !=
ErrorHandlerFlags::NONE;
}
@@ -331,7 +331,7 @@ bool ErrorHandler::GetErrorString(sal_uIntPtr lId,
OUString& rStr)
@see ErrorHandler::HandleError_Impl
*/
-ErrorHandlerFlags ErrorHandler::HandleError(sal_uIntPtr lId, ErrorHandlerFlags
nFlags)
+ErrorHandlerFlags ErrorHandler::HandleError(sal_uInt32 lId, ErrorHandlerFlags
nFlags)
{
OUString aDummy;
return HandleError_Impl( lId, nFlags, false, aDummy );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
