diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-04-04 07:12:22 +0200 |
|---|---|---|
| committer | Matteo Casalin <matteo.casalin@yahoo.com> | 2014-04-06 22:19:55 +0200 |
| commit | 7493a4ad64ebeb0569e5efa3c8d9719f22cd1275 (patch) | |
| tree | 9a4d33dcab5412761514abb930cc9a41f8dc3d96 /sw | |
| parent | 487099327b957fc55ae643967eec9a353a1f954f (diff) | |
sal_uInt16 to sal_uInt32
Change-Id: I4cd153b38a02d7b1d58877134857dd9825b6ace5
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/ui/dbui/mmlayoutpage.cxx | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/sw/source/ui/dbui/mmlayoutpage.cxx b/sw/source/ui/dbui/mmlayoutpage.cxx index 416ef7bc214c..86192c68ed63 100644 --- a/sw/source/ui/dbui/mmlayoutpage.cxx +++ b/sw/source/ui/dbui/mmlayoutpage.cxx @@ -336,8 +336,9 @@ SwFrmFmt* SwMailMergeLayoutPage::InsertAddressFrame( if(aItem.bIsColumn) { OUString sConvertedColumn = aItem.sText; - for(sal_uInt16 nColumn = 0; - nColumn < rHeaders.Count() && nColumn < aAssignment.getLength(); + for(sal_uInt32 nColumn = 0; + nColumn < rHeaders.Count() && + nColumn < static_cast<sal_uInt32>(aAssignment.getLength()); ++nColumn) { if (rHeaders.GetString(nColumn).equals(aItem.sText) && @@ -579,8 +580,9 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig { OUString sDB(sDBName); OUString sConvertedColumn = aItem.sText; - for(sal_uInt16 nColumn = 0; - nColumn < rHeaders.Count() && nColumn < aAssignment.getLength(); + for(sal_uInt32 nColumn = 0; + nColumn < rHeaders.Count() && + nColumn < static_cast<sal_uInt32>(aAssignment.getLength()); ++nColumn) { if (rHeaders.GetString(nColumn).equals(aItem.sText) && |