From 437a5d7c72547f6f17b4ffecd51e76a2487de99e Mon Sep 17 00:00:00 2001
From: Chris Sherlock <chris.sherlock79@gmail.com>
Date: Sat, 15 Apr 2017 19:38:53 +1000
Subject: 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.sherlock79@gmail.com>
Tested-by: Chris Sherlock <chris.sherlock79@gmail.com>
---
sd/source/filter/html/htmlex.cxx | 2 +-
sd/source/filter/html/htmlex.hxx | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
(limited to 'sd')
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 );
--
cgit