summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-03-16 20:26:31 +0200
committerTor Lillqvist <tml@iki.fi>2013-03-16 20:27:56 +0200
commit494042ef5b104a4b4fd1cf7b4a861df9ba6771a8 (patch)
tree0ebe2b6d28c61897dd7114d97e3ec7867a7ee669 /svx
parentb0bc47d628ceb6d89d22cd2bd5abc5e5c92af4d8 (diff)
CONTAINER_APPEND is SAL_ULONG, an unsigned long
Fix WaE: implicit conversion from 'unsigned long' to 'sal_uInt32' (aka 'unsigned int') changes value from 18446744073709551615 to 4294967295, which definitely sounds like an actual bug-inducing error to me, not "just a warning". So don't try to use it as default value for a parameter of type sal_uInt32. Changing the parameter to sal_uLong. Change-Id: I8ebc7195ba1bf94f4f2d6df7cd7863f779ba3fa6
Diffstat (limited to 'svx')
-rw-r--r--svx/source/svdraw/svdfmtf.cxx2
-rw-r--r--svx/source/svdraw/svdfmtf.hxx2
2 files changed, 2 insertions, 2 deletions
diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx
index 5c83ee78732d..dc2f6c8730a3 100644
--- a/svx/source/svdraw/svdfmtf.cxx
+++ b/svx/source/svdraw/svdfmtf.cxx
@@ -201,7 +201,7 @@ void ImpSdrGDIMetaFileImport::DoLoopActions(GDIMetaFile& rMtf, SvdProgressInfo*
sal_uInt32 ImpSdrGDIMetaFileImport::DoImport(
const GDIMetaFile& rMtf,
SdrObjList& rOL,
- sal_uInt32 nInsPos,
+ sal_uLong nInsPos,
SvdProgressInfo* pProgrInfo)
{
// setup some global scale parameter
diff --git a/svx/source/svdraw/svdfmtf.hxx b/svx/source/svdraw/svdfmtf.hxx
index e52f8353be56..93e39041e7a8 100644
--- a/svx/source/svdraw/svdfmtf.hxx
+++ b/svx/source/svdraw/svdfmtf.hxx
@@ -162,7 +162,7 @@ public:
sal_uInt32 DoImport(
const GDIMetaFile& rMtf,
SdrObjList& rDestList,
- sal_uInt32 nInsPos = CONTAINER_APPEND,
+ sal_uLong nInsPos = CONTAINER_APPEND,
SvdProgressInfo* pProgrInfo = 0);
};