summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--cui/source/options/optgenrl.cxx57
-rw-r--r--include/svx/optgenrl.hxx35
-rw-r--r--sw/source/ui/fldui/fldedt.cxx38
3 files changed, 67 insertions, 63 deletions
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index f102d9e50eb8..babda6a7ce8e 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -109,48 +109,48 @@ struct
// id for SvtUserOptions in unotools/useroptions.hxx
int nUserOptionsId;
// id for settings the focus (defined in svx/optgenrl.hxx)
- int nGrabFocusId;
+ EditPosition nGrabFocusId;
}
const vFieldInfo[] =
{
// Company
- { Row_Company, "company", USER_OPT_COMPANY, COMPANY_EDIT },
+ { Row_Company, "company", USER_OPT_COMPANY, EditPosition::COMPANY },
// Name
- { Row_Name, "firstname", USER_OPT_FIRSTNAME, FIRSTNAME_EDIT },
- { Row_Name, "lastname", USER_OPT_LASTNAME, LASTNAME_EDIT },
- { Row_Name, "shortname", USER_OPT_ID, SHORTNAME_EDIT },
+ { Row_Name, "firstname", USER_OPT_FIRSTNAME, EditPosition::FIRSTNAME },
+ { Row_Name, "lastname", USER_OPT_LASTNAME, EditPosition::LASTNAME },
+ { Row_Name, "shortname", USER_OPT_ID, EditPosition::SHORTNAME },
// Name (russian)
- { Row_Name_Russian, "ruslastname", USER_OPT_LASTNAME, LASTNAME_EDIT },
- { Row_Name_Russian, "rusfirstname", USER_OPT_FIRSTNAME, FIRSTNAME_EDIT },
- { Row_Name_Russian, "rusfathersname", USER_OPT_FATHERSNAME, 0 },
- { Row_Name_Russian, "russhortname", USER_OPT_ID, SHORTNAME_EDIT },
+ { Row_Name_Russian, "ruslastname", USER_OPT_LASTNAME, EditPosition::LASTNAME },
+ { Row_Name_Russian, "rusfirstname", USER_OPT_FIRSTNAME, EditPosition::FIRSTNAME },
+ { Row_Name_Russian, "rusfathersname", USER_OPT_FATHERSNAME, EditPosition::UNKNOWN },
+ { Row_Name_Russian, "russhortname", USER_OPT_ID, EditPosition::SHORTNAME },
// Name (eastern: reversed name ord
- { Row_Name_Eastern, "eastlastname", USER_OPT_LASTNAME, LASTNAME_EDIT },
- { Row_Name_Eastern, "eastfirstname", USER_OPT_FIRSTNAME, FIRSTNAME_EDIT },
- { Row_Name_Eastern, "eastshortname", USER_OPT_ID, SHORTNAME_EDIT },
+ { Row_Name_Eastern, "eastlastname", USER_OPT_LASTNAME, EditPosition::LASTNAME },
+ { Row_Name_Eastern, "eastfirstname", USER_OPT_FIRSTNAME, EditPosition::FIRSTNAME },
+ { Row_Name_Eastern, "eastshortname", USER_OPT_ID, EditPosition::SHORTNAME },
// Street
- { Row_Street, "street", USER_OPT_STREET, STREET_EDIT },
+ { Row_Street, "street", USER_OPT_STREET, EditPosition::STREET },
// Street (russian)
- { Row_Street_Russian, "russtreet", USER_OPT_STREET, STREET_EDIT },
- { Row_Street_Russian, "apartnum", USER_OPT_APARTMENT, 0 },
+ { Row_Street_Russian, "russtreet", USER_OPT_STREET, EditPosition::STREET },
+ { Row_Street_Russian, "apartnum", USER_OPT_APARTMENT, EditPosition::UNKNOWN },
// City
- { Row_City, "izip", USER_OPT_ZIP, PLZ_EDIT },
- { Row_City, "icity", USER_OPT_CITY, CITY_EDIT },
+ { Row_City, "izip", USER_OPT_ZIP, EditPosition::PLZ },
+ { Row_City, "icity", USER_OPT_CITY, EditPosition::CITY },
// City (US)
- { Row_City_US, "city", USER_OPT_CITY, CITY_EDIT },
- { Row_City_US, "state", USER_OPT_STATE, STATE_EDIT },
- { Row_City_US, "zip", USER_OPT_ZIP, PLZ_EDIT },
+ { Row_City_US, "city", USER_OPT_CITY, EditPosition::CITY },
+ { Row_City_US, "state", USER_OPT_STATE, EditPosition::STATE },
+ { Row_City_US, "zip", USER_OPT_ZIP, EditPosition::PLZ },
// Country
- { Row_Country, "country", USER_OPT_COUNTRY, COUNTRY_EDIT },
+ { Row_Country, "country", USER_OPT_COUNTRY, EditPosition::COUNTRY },
// Title/Position
- { Row_TitlePos, "title", USER_OPT_TITLE, TITLE_EDIT },
- { Row_TitlePos, "position", USER_OPT_POSITION, POSITION_EDIT },
+ { Row_TitlePos, "title", USER_OPT_TITLE, EditPosition::TITLE },
+ { Row_TitlePos, "position", USER_OPT_POSITION, EditPosition::POSITION },
// Phone
- { Row_Phone, "home", USER_OPT_TELEPHONEHOME, TELPRIV_EDIT },
- { Row_Phone, "work", USER_OPT_TELEPHONEWORK, TELCOMPANY_EDIT },
+ { Row_Phone, "home", USER_OPT_TELEPHONEHOME, EditPosition::TELPRIV },
+ { Row_Phone, "work", USER_OPT_TELEPHONEWORK, EditPosition::TELCOMPANY },
// Fax/Mail
- { Row_FaxMail, "fax", USER_OPT_FAX, FAX_EDIT },
- { Row_FaxMail, "email", USER_OPT_EMAIL, EMAIL_EDIT },
+ { Row_FaxMail, "fax", USER_OPT_FAX, EditPosition::FAX },
+ { Row_FaxMail, "email", USER_OPT_EMAIL, EditPosition::EMAIL },
};
@@ -335,7 +335,8 @@ void SvxGeneralTabPage::Reset( const SfxItemSet* rSet )
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)
if (nField == vFieldInfo[vFields[i]->iField].nGrabFocusId)
diff --git a/include/svx/optgenrl.hxx b/include/svx/optgenrl.hxx
index 137ba0f67eb8..102cd18ef334 100644
--- a/include/svx/optgenrl.hxx
+++ b/include/svx/optgenrl.hxx
@@ -20,22 +20,25 @@
#define INCLUDED_SVX_OPTGENRL_HXX
// Defines for setting the focus of a Edit via a slot from external.
-#define UNKNOWN_EDIT ((sal_uInt16)0)
-#define COMPANY_EDIT ((sal_uInt16)1)
-#define FIRSTNAME_EDIT ((sal_uInt16)2)
-#define LASTNAME_EDIT ((sal_uInt16)3)
-#define STREET_EDIT ((sal_uInt16)4)
-#define COUNTRY_EDIT ((sal_uInt16)5)
-#define PLZ_EDIT ((sal_uInt16)6)
-#define CITY_EDIT ((sal_uInt16)7)
-#define STATE_EDIT ((sal_uInt16)8)
-#define TITLE_EDIT ((sal_uInt16)9)
-#define POSITION_EDIT ((sal_uInt16)10)
-#define SHORTNAME_EDIT ((sal_uInt16)11)
-#define TELPRIV_EDIT ((sal_uInt16)12)
-#define TELCOMPANY_EDIT ((sal_uInt16)13)
-#define FAX_EDIT ((sal_uInt16)14)
-#define EMAIL_EDIT ((sal_uInt16)15)
+enum class EditPosition
+{
+ UNKNOWN = 0,
+ COMPANY = 1,
+ FIRSTNAME = 2,
+ LASTNAME = 3,
+ STREET = 4,
+ COUNTRY = 5,
+ PLZ = 6,
+ CITY = 7,
+ STATE = 8,
+ TITLE = 9,
+ POSITION = 10,
+ SHORTNAME = 11,
+ TELPRIV = 12,
+ TELCOMPANY = 13,
+ FAX = 14,
+ EMAIL = 15,
+};
#endif // INCLUDED_SVX_OPTGENRL_HXX
diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx
index 1b7906b02368..dc0be5131705 100644
--- a/sw/source/ui/fldui/fldedt.cxx
+++ b/sw/source/ui/fldui/fldedt.cxx
@@ -306,30 +306,30 @@ IMPL_LINK_NOARG(SwFldEditDlg, AddressHdl)
SID_FIELD_GRABFOCUS, SID_FIELD_GRABFOCUS,
0L );
- sal_uInt16 nEditPos = UNKNOWN_EDIT;
+ EditPosition nEditPos = EditPosition::UNKNOWN;
switch(pCurFld->GetSubType())
{
- case EU_FIRSTNAME: nEditPos = FIRSTNAME_EDIT; break;
- case EU_NAME: nEditPos = LASTNAME_EDIT; break;
- case EU_SHORTCUT: nEditPos = SHORTNAME_EDIT; break;
- case EU_COMPANY: nEditPos = COMPANY_EDIT; break;
- case EU_STREET: nEditPos = STREET_EDIT; break;
- case EU_TITLE: nEditPos = TITLE_EDIT; break;
- case EU_POSITION: nEditPos = POSITION_EDIT; break;
- case EU_PHONE_PRIVATE:nEditPos = TELPRIV_EDIT; break;
- case EU_PHONE_COMPANY:nEditPos = TELCOMPANY_EDIT; break;
- case EU_FAX: nEditPos = FAX_EDIT; break;
- case EU_EMAIL: nEditPos = EMAIL_EDIT; break;
- case EU_COUNTRY: nEditPos = COUNTRY_EDIT; break;
- case EU_ZIP: nEditPos = PLZ_EDIT; break;
- case EU_CITY: nEditPos = CITY_EDIT; break;
- case EU_STATE: nEditPos = STATE_EDIT; break;
-
- default: nEditPos = UNKNOWN_EDIT; break;
+ case EU_FIRSTNAME: nEditPos = EditPosition::FIRSTNAME; break;
+ case EU_NAME: nEditPos = EditPosition::LASTNAME; break;
+ case EU_SHORTCUT: nEditPos = EditPosition::SHORTNAME; break;
+ case EU_COMPANY: nEditPos = EditPosition::COMPANY; break;
+ case EU_STREET: nEditPos = EditPosition::STREET; break;
+ case EU_TITLE: nEditPos = EditPosition::TITLE; break;
+ case EU_POSITION: nEditPos = EditPosition::POSITION; break;
+ case EU_PHONE_PRIVATE:nEditPos = EditPosition::TELPRIV; break;
+ case EU_PHONE_COMPANY:nEditPos = EditPosition::TELCOMPANY; break;
+ case EU_FAX: nEditPos = EditPosition::FAX; break;
+ case EU_EMAIL: nEditPos = EditPosition::EMAIL; break;
+ case EU_COUNTRY: nEditPos = EditPosition::COUNTRY; break;
+ case EU_ZIP: nEditPos = EditPosition::PLZ; break;
+ case EU_CITY: nEditPos = EditPosition::CITY; break;
+ case EU_STATE: nEditPos = EditPosition::STATE; 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();
OSL_ENSURE(pFact, "SwAbstractDialogFactory fail!");
generated by cgit (git 2.34.1) at 2025-02-16 08:38:33 +0000