Skip to content

C
core
Kaydet (Commit) 88254f05 authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

convert _EDIT constants to scoped enum 

Change-Id: I1502692f9491bc55856b7477040bd5918faf4df8
üst 07f6b08b
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 63 deletions
cui/source/options/optgenrl.cxx
Dosyayı görüntüle @ 88254f05
...@@ -109,48 +109,48 @@ struct ...@@ -109,48 +109,48 @@ struct
// id for SvtUserOptions in unotools/useroptions.hxx // id for SvtUserOptions in unotools/useroptions.hxx
int nUserOptionsId; int nUserOptionsId;
// id for settings the focus (defined in svx/optgenrl.hxx) // id for settings the focus (defined in svx/optgenrl.hxx)
int nGrabFocusId; EditPosition nGrabFocusId;
} }
const vFieldInfo[] = const vFieldInfo[] =
{ {
// Company // Company
{ Row_Company, "company", USER_OPT_COMPANY, COMPANY_EDIT }, { Row_Company, "company", USER_OPT_COMPANY, EditPosition::COMPANY },
// Name // Name
{ Row_Name, "firstname", USER_OPT_FIRSTNAME, FIRSTNAME_EDIT }, { Row_Name, "firstname", USER_OPT_FIRSTNAME, EditPosition::FIRSTNAME },
{ Row_Name, "lastname", USER_OPT_LASTNAME, LASTNAME_EDIT }, { Row_Name, "lastname", USER_OPT_LASTNAME, EditPosition::LASTNAME },
{ Row_Name, "shortname", USER_OPT_ID, SHORTNAME_EDIT }, { Row_Name, "shortname", USER_OPT_ID, EditPosition::SHORTNAME },
// Name (russian) // Name (russian)
{ Row_Name_Russian, "ruslastname", USER_OPT_LASTNAME, LASTNAME_EDIT }, { Row_Name_Russian, "ruslastname", USER_OPT_LASTNAME, EditPosition::LASTNAME },
{ Row_Name_Russian, "rusfirstname", USER_OPT_FIRSTNAME, FIRSTNAME_EDIT }, { Row_Name_Russian, "rusfirstname", USER_OPT_FIRSTNAME, EditPosition::FIRSTNAME },
{ Row_Name_Russian, "rusfathersname", USER_OPT_FATHERSNAME, 0 }, { Row_Name_Russian, "rusfathersname", USER_OPT_FATHERSNAME, EditPosition::UNKNOWN },
{ Row_Name_Russian, "russhortname", USER_OPT_ID, SHORTNAME_EDIT }, { Row_Name_Russian, "russhortname", USER_OPT_ID, EditPosition::SHORTNAME },
// Name (eastern: reversed name ord // Name (eastern: reversed name ord
{ Row_Name_Eastern, "eastlastname", USER_OPT_LASTNAME, LASTNAME_EDIT }, { Row_Name_Eastern, "eastlastname", USER_OPT_LASTNAME, EditPosition::LASTNAME },
{ Row_Name_Eastern, "eastfirstname", USER_OPT_FIRSTNAME, FIRSTNAME_EDIT }, { Row_Name_Eastern, "eastfirstname", USER_OPT_FIRSTNAME, EditPosition::FIRSTNAME },
{ Row_Name_Eastern, "eastshortname", USER_OPT_ID, SHORTNAME_EDIT }, { Row_Name_Eastern, "eastshortname", USER_OPT_ID, EditPosition::SHORTNAME },
// Street // Street
{ Row_Street, "street", USER_OPT_STREET, STREET_EDIT }, { Row_Street, "street", USER_OPT_STREET, EditPosition::STREET },
// Street (russian) // Street (russian)
{ Row_Street_Russian, "russtreet", USER_OPT_STREET, STREET_EDIT }, { Row_Street_Russian, "russtreet", USER_OPT_STREET, EditPosition::STREET },
{ Row_Street_Russian, "apartnum", USER_OPT_APARTMENT, 0 }, { Row_Street_Russian, "apartnum", USER_OPT_APARTMENT, EditPosition::UNKNOWN },
// City // City
{ Row_City, "izip", USER_OPT_ZIP, PLZ_EDIT }, { Row_City, "izip", USER_OPT_ZIP, EditPosition::PLZ },
{ Row_City, "icity", USER_OPT_CITY, CITY_EDIT }, { Row_City, "icity", USER_OPT_CITY, EditPosition::CITY },
// City (US) // City (US)
{ Row_City_US, "city", USER_OPT_CITY, CITY_EDIT }, { Row_City_US, "city", USER_OPT_CITY, EditPosition::CITY },
{ Row_City_US, "state", USER_OPT_STATE, STATE_EDIT }, { Row_City_US, "state", USER_OPT_STATE, EditPosition::STATE },
{ Row_City_US, "zip", USER_OPT_ZIP, PLZ_EDIT }, { Row_City_US, "zip", USER_OPT_ZIP, EditPosition::PLZ },
// Country // Country
{ Row_Country, "country", USER_OPT_COUNTRY, COUNTRY_EDIT }, { Row_Country, "country", USER_OPT_COUNTRY, EditPosition::COUNTRY },
// Title/Position // Title/Position
{ Row_TitlePos, "title", USER_OPT_TITLE, TITLE_EDIT }, { Row_TitlePos, "title", USER_OPT_TITLE, EditPosition::TITLE },
{ Row_TitlePos, "position", USER_OPT_POSITION, POSITION_EDIT }, { Row_TitlePos, "position", USER_OPT_POSITION, EditPosition::POSITION },
// Phone // Phone
{ Row_Phone, "home", USER_OPT_TELEPHONEHOME, TELPRIV_EDIT }, { Row_Phone, "home", USER_OPT_TELEPHONEHOME, EditPosition::TELPRIV },
{ Row_Phone, "work", USER_OPT_TELEPHONEWORK, TELCOMPANY_EDIT }, { Row_Phone, "work", USER_OPT_TELEPHONEWORK, EditPosition::TELCOMPANY },
// Fax/Mail // Fax/Mail
{ Row_FaxMail, "fax", USER_OPT_FAX, FAX_EDIT }, { Row_FaxMail, "fax", USER_OPT_FAX, EditPosition::FAX },
{ Row_FaxMail, "email", USER_OPT_EMAIL, EMAIL_EDIT }, { Row_FaxMail, "email", USER_OPT_EMAIL, EditPosition::EMAIL },
}; };
...@@ -335,7 +335,8 @@ void SvxGeneralTabPage::Reset( const SfxItemSet* rSet ) ...@@ -335,7 +335,8 @@ void SvxGeneralTabPage::Reset( const SfxItemSet* rSet )
if (rSet->GetItemState(nWhich) == SfxItemState::SET) if (rSet->GetItemState(nWhich) == SfxItemState::SET)
{ {
if (sal_uInt16 const nField = static_cast<const SfxUInt16Item&>(rSet->Get(nWhich)).GetValue()) EditPosition nField = static_cast<EditPosition>(static_cast<const SfxUInt16Item&>(rSet->Get(nWhich)).GetValue());
if (nField != EditPosition::UNKNOWN)
{ {
for (unsigned i = 0; i != vFields.size(); ++i) for (unsigned i = 0; i != vFields.size(); ++i)
if (nField == vFieldInfo[vFields[i]->iField].nGrabFocusId) if (nField == vFieldInfo[vFields[i]->iField].nGrabFocusId)
......
include/svx/optgenrl.hxx
Dosyayı görüntüle @ 88254f05
...@@ -20,22 +20,25 @@ ...@@ -20,22 +20,25 @@
#define INCLUDED_SVX_OPTGENRL_HXX #define INCLUDED_SVX_OPTGENRL_HXX
// Defines for setting the focus of a Edit via a slot from external. // Defines for setting the focus of a Edit via a slot from external.
#define UNKNOWN_EDIT ((sal_uInt16)0) enum class EditPosition
#define COMPANY_EDIT ((sal_uInt16)1) {
#define FIRSTNAME_EDIT ((sal_uInt16)2) UNKNOWN = 0,
#define LASTNAME_EDIT ((sal_uInt16)3) COMPANY = 1,
#define STREET_EDIT ((sal_uInt16)4) FIRSTNAME = 2,
#define COUNTRY_EDIT ((sal_uInt16)5) LASTNAME = 3,
#define PLZ_EDIT ((sal_uInt16)6) STREET = 4,
#define CITY_EDIT ((sal_uInt16)7) COUNTRY = 5,
#define STATE_EDIT ((sal_uInt16)8) PLZ = 6,
#define TITLE_EDIT ((sal_uInt16)9) CITY = 7,
#define POSITION_EDIT ((sal_uInt16)10) STATE = 8,
#define SHORTNAME_EDIT ((sal_uInt16)11) TITLE = 9,
#define TELPRIV_EDIT ((sal_uInt16)12) POSITION = 10,
#define TELCOMPANY_EDIT ((sal_uInt16)13) SHORTNAME = 11,
#define FAX_EDIT ((sal_uInt16)14) TELPRIV = 12,
#define EMAIL_EDIT ((sal_uInt16)15) TELCOMPANY = 13,
FAX = 14,
EMAIL = 15,
};
#endif // INCLUDED_SVX_OPTGENRL_HXX #endif // INCLUDED_SVX_OPTGENRL_HXX
......
sw/source/ui/fldui/fldedt.cxx
Dosyayı görüntüle @ 88254f05
...@@ -306,30 +306,30 @@ IMPL_LINK_NOARG(SwFldEditDlg, AddressHdl) ...@@ -306,30 +306,30 @@ IMPL_LINK_NOARG(SwFldEditDlg, AddressHdl)
SID_FIELD_GRABFOCUS, SID_FIELD_GRABFOCUS, SID_FIELD_GRABFOCUS, SID_FIELD_GRABFOCUS,
0L ); 0L );
sal_uInt16 nEditPos = UNKNOWN_EDIT; EditPosition nEditPos = EditPosition::UNKNOWN;
switch(pCurFld->GetSubType()) switch(pCurFld->GetSubType())
{ {
case EU_FIRSTNAME: nEditPos = FIRSTNAME_EDIT; break; case EU_FIRSTNAME: nEditPos = EditPosition::FIRSTNAME; break;
case EU_NAME: nEditPos = LASTNAME_EDIT; break; case EU_NAME: nEditPos = EditPosition::LASTNAME; break;
case EU_SHORTCUT: nEditPos = SHORTNAME_EDIT; break; case EU_SHORTCUT: nEditPos = EditPosition::SHORTNAME; break;
case EU_COMPANY: nEditPos = COMPANY_EDIT; break; case EU_COMPANY: nEditPos = EditPosition::COMPANY; break;
case EU_STREET: nEditPos = STREET_EDIT; break; case EU_STREET: nEditPos = EditPosition::STREET; break;
case EU_TITLE: nEditPos = TITLE_EDIT; break; case EU_TITLE: nEditPos = EditPosition::TITLE; break;
case EU_POSITION: nEditPos = POSITION_EDIT; break; case EU_POSITION: nEditPos = EditPosition::POSITION; break;
case EU_PHONE_PRIVATE:nEditPos = TELPRIV_EDIT; break; case EU_PHONE_PRIVATE:nEditPos = EditPosition::TELPRIV; break;
case EU_PHONE_COMPANY:nEditPos = TELCOMPANY_EDIT; break; case EU_PHONE_COMPANY:nEditPos = EditPosition::TELCOMPANY; break;
case EU_FAX: nEditPos = FAX_EDIT; break; case EU_FAX: nEditPos = EditPosition::FAX; break;
case EU_EMAIL: nEditPos = EMAIL_EDIT; break; case EU_EMAIL: nEditPos = EditPosition::EMAIL; break;
case EU_COUNTRY: nEditPos = COUNTRY_EDIT; break; case EU_COUNTRY: nEditPos = EditPosition::COUNTRY; break;
case EU_ZIP: nEditPos = PLZ_EDIT; break; case EU_ZIP: nEditPos = EditPosition::PLZ; break;
case EU_CITY: nEditPos = CITY_EDIT; break; case EU_CITY: nEditPos = EditPosition::CITY; break;
case EU_STATE: nEditPos = STATE_EDIT; break; case EU_STATE: nEditPos = EditPosition::STATE; break;
default: nEditPos = UNKNOWN_EDIT; break; default: nEditPos = EditPosition::UNKNOWN; break;
} }
aSet.Put(SfxUInt16Item(SID_FIELD_GRABFOCUS, nEditPos)); aSet.Put(SfxUInt16Item(SID_FIELD_GRABFOCUS, static_cast<sal_uInt16>(nEditPos)));
SwAbstractDialogFactory* pFact = swui::GetFactory(); SwAbstractDialogFactory* pFact = swui::GetFactory();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!"); OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
......
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