summaryrefslogtreecommitdiff
path: root/editeng
diff options
context:
space:
mode:
authorJochen Nitschke <j.nitschke+logerrit@ok.de>2017-07-23 22:05:40 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2017-07-27 08:12:27 +0200
commit7f381be4d3261149a5b54048f9605fab0340c221 (patch)
tree445c49bb915f4c6bd28dac90e17c8d8e73e88ccc /editeng
parentece1072049fba0c7f77391da7775c7cf3f4725ea (diff)
replace sal_uLong variables with sal_uInt32 for SvNumberFormatter IDs
Replace the stopgap type sal_uLong as SvNumberFormatter format index uses sal_uInt32. SwInsertDBColAutoPilot uses format indices from SvNumberFormatter and from the property "FormatKey" which is stored as sal_Int32 but ctor guards against negative values. Change type of loop variable in SwCaptionDialog to avoid narrowing in GetFormatStr/GetFormatKey. Change-Id: I79980696c07760f7ff026bb1bacf0e069363898c Reviewed-on: https://gerrit.libreoffice.org/40464 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'editeng')
-rw-r--r--editeng/source/items/flditem.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/editeng/source/items/flditem.cxx b/editeng/source/items/flditem.cxx
index 50dc38219431..7612621b6678 100644
--- a/editeng/source/items/flditem.cxx
+++ b/editeng/source/items/flditem.cxx
@@ -439,7 +439,7 @@ OUString SvxDateField::GetFormatted( Date const & aDate, SvxDateFormat eFormat,
eFormat = SVXDATEFORMAT_STDSMALL;
}
- sal_uLong nFormatKey;
+ sal_uInt32 nFormatKey;
switch( eFormat )
{