Skip to content

C
core
Kaydet (Commit) 7493a4ad authored tarafından Matteo Casalin's avatar Matteo Casalin
Dosyalara gözat
Seçenekler

sal_uInt16 to sal_uInt32 

Change-Id: I4cd153b38a02d7b1d58877134857dd9825b6ace5
üst 48709932
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
sw/source/ui/dbui/mmlayoutpage.cxx
Dosyayı görüntüle @ 7493a4ad
...@@ -336,8 +336,9 @@ SwFrmFmt* SwMailMergeLayoutPage::InsertAddressFrame( ...@@ -336,8 +336,9 @@ SwFrmFmt* SwMailMergeLayoutPage::InsertAddressFrame(
if(aItem.bIsColumn) if(aItem.bIsColumn)
{ {
OUString sConvertedColumn = aItem.sText; OUString sConvertedColumn = aItem.sText;
for(sal_uInt16 nColumn = 0; for(sal_uInt32 nColumn = 0;
nColumn < rHeaders.Count() && nColumn < aAssignment.getLength(); nColumn < rHeaders.Count() &&
nColumn < static_cast<sal_uInt32>(aAssignment.getLength());
++nColumn) ++nColumn)
{ {
if (rHeaders.GetString(nColumn).equals(aItem.sText) && if (rHeaders.GetString(nColumn).equals(aItem.sText) &&
...@@ -579,8 +580,9 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig ...@@ -579,8 +580,9 @@ void SwMailMergeLayoutPage::InsertGreeting(SwWrtShell& rShell, SwMailMergeConfig
{ {
OUString sDB(sDBName); OUString sDB(sDBName);
OUString sConvertedColumn = aItem.sText; OUString sConvertedColumn = aItem.sText;
for(sal_uInt16 nColumn = 0; for(sal_uInt32 nColumn = 0;
nColumn < rHeaders.Count() && nColumn < aAssignment.getLength(); nColumn < rHeaders.Count() &&
nColumn < static_cast<sal_uInt32>(aAssignment.getLength());
++nColumn) ++nColumn)
{ {
if (rHeaders.GetString(nColumn).equals(aItem.sText) && if (rHeaders.GetString(nColumn).equals(aItem.sText) &&
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment