unotools/source/config/useroptions.cxx | 38 ++++++++++++++++----------------- 1 file changed, 19 insertions(+), 19 deletions(-)
New commits: commit f59733d45f900bf3e1427f69d7172cde5d877399 Author: Caolán McNamara <[email protected]> Date: Wed Aug 29 23:55:45 2012 +0100 fix build Change-Id: I3616e62689246a091d9f26d69105a27f64553d48 diff --git a/unotools/source/config/useroptions.cxx b/unotools/source/config/useroptions.cxx index adb5db0..3e81f7e 100644 --- a/unotools/source/config/useroptions.cxx +++ b/unotools/source/config/useroptions.cxx @@ -56,26 +56,26 @@ OUString const sData = "org.openoffice.UserProfile/Data"; // vOptionNames[] -- names of the user option entries // The order corresponds to the #define USER_OPT_* list in useroptions.hxx. OUString const vOptionNames[] = { - "l", // USER_OPT_CITY - "o", // USER_OPT_COMPANY - "c", // USER_OPT_COUNTRY - "mail", // USER_OPT_EMAIL - "facsimiletelephonenumber", // USER_OPT_FAX - "givenname", // USER_OPT_FIRSTNAME - "sn", // USER_OPT_LASTNAME - "position", // USER_OPT_POSITION - "st", // USER_OPT_STATE - "street", // USER_OPT_STREET - "homephone", // USER_OPT_TELEPHONEHOME - "telephonenumber", // USER_OPT_TELEPHONEWORK - "title", // USER_OPT_TITLE - "initials", // USER_OPT_ID - "postalcode", // USER_OPT_ZIP - "fathersname", // USER_OPT_FATHERSNAME - "apartment", // USER_OPT_APARTMENT - "customernumber", // USER_OPT_CUSTOMERNUMBER + OUString("l"), // USER_OPT_CITY + OUString("o"), // USER_OPT_COMPANY + OUString("c"), // USER_OPT_COUNTRY + OUString("mail"), // USER_OPT_EMAIL + OUString("facsimiletelephonenumber"), // USER_OPT_FAX + OUString("givenname"), // USER_OPT_FIRSTNAME + OUString("sn"), // USER_OPT_LASTNAME + OUString("position"), // USER_OPT_POSITION + OUString("st"), // USER_OPT_STATE + OUString("street"), // USER_OPT_STREET + OUString("homephone"), // USER_OPT_TELEPHONEHOME + OUString("telephonenumber"), // USER_OPT_TELEPHONEWORK + OUString("title"), // USER_OPT_TITLE + OUString("initials"), // USER_OPT_ID + OUString("postalcode"), // USER_OPT_ZIP + OUString("fathersname"), // USER_OPT_FATHERSNAME + OUString("apartment"), // USER_OPT_APARTMENT + OUString("customernumber") // USER_OPT_CUSTOMERNUMBER }; -unsigned const nOptionNameCount = sizeof vOptionNames / sizeof vOptionNames[0]; +const sal_uInt16 nOptionNameCount = SAL_N_ELEMENTS(vOptionNames); } // namespace
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
