cui/source/options/optgenrl.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit 341acca82250f4e1e7f73212628b2fa451cf51bc Author: Caolán McNamara <caol...@redhat.com> Date: Thu Aug 30 00:13:35 2012 +0100 some more build failures Change-Id: I2c2eac4fd848925fada754ced03328fa5320f901 diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index fdca005..366ddda 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -380,7 +380,7 @@ void SvxGeneralTabPage::SetAccessibleNames () for (unsigned iField = rRow.nFirstField; iField != rRow.nLastField; ++iField) { // the token - rtl::OUString sPart = sList.getToken(0, '/', nIndex).trim(); + rtl::OUString sPart = sList.getToken(0, static_cast<sal_Unicode>('/'), nIndex).trim(); Edit& rEdit = vFields[iField]->aEdit; // creating the accessible name if (iBracket != -1) commit 716c0233cfa58d898012b23ec64fd7a598b8fe78 Author: Caolán McNamara <caol...@redhat.com> Date: Wed Aug 29 23:59:56 2012 +0100 use SAL_N_ELEMENTS Change-Id: Ia55c8696657c459423d745e298630d549e4125df diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx index e8d031d..fdca005 100644 --- a/cui/source/options/optgenrl.cxx +++ b/cui/source/options/optgenrl.cxx @@ -271,7 +271,7 @@ void SvxGeneralTabPage::CreateControls () )); Row& rRow = *vRows.back(); // fields in the row - static unsigned const nFieldCount = sizeof vFieldInfo / sizeof vFieldInfo[0]; + static unsigned const nFieldCount = SAL_N_ELEMENTS(vFieldInfo); // skipping other (invisible) rows while (iField != nFieldCount && vFieldInfo[iField].eRow != eRow) ++iField;
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits