diff options
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/inc/strings.hxx | 8 | ||||
| -rw-r--r-- | svtools/source/dialogs/addresstemplate.cxx | 7 | ||||
| -rw-r--r-- | svtools/source/dialogs/addresstemplate.src | 8 |
3 files changed, 9 insertions, 14 deletions
diff --git a/svtools/inc/strings.hxx b/svtools/inc/strings.hxx index 68fca72f9aa2..32ca8890c444 100644 --- a/svtools/inc/strings.hxx +++ b/svtools/inc/strings.hxx @@ -10,8 +10,12 @@ #ifndef INCLUDED_SVTOOLS_INC_STRINGS_HXX #define INCLUDED_SVTOOLS_INC_STRINGS_HXX -#define STR_ERR_HDLMESS "$(ACTION)$(ERROR)" -#define RID_ERRHDL_CLASS "$(CLASS)$(ERROR)" +#define STR_ERR_HDLMESS "$(ACTION)$(ERROR)" +#define RID_ERRHDL_CLASS "$(CLASS)$(ERROR)" +// no need to translate this +// the items in this string have to be in the same order as the STR_FIELD_* strings are added to the +// field label list of the dialog +#define STR_LOGICAL_FIELD_NAMES "FirstName;LastName;Company;Department;Street;Zip;City;State;Country;PhonePriv;PhoneComp;PhoneOffice;PhoneCell;PhoneOther;Pager;Fax;EMail;URL;Title;Position;Code;AddrForm;AddrFormMail;Id;CalendarURL;InviteParticipant;Note;Altfield1;Altfield2;Altfield3;Altfield4" #endif diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx index b2f367d041af..414f3f434715 100644 --- a/svtools/source/dialogs/addresstemplate.cxx +++ b/svtools/source/dialogs/addresstemplate.cxx @@ -51,12 +51,11 @@ #include <algorithm> #include <map> #include <array> +#include "strings.hxx" namespace svt { - - using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::container; @@ -159,7 +158,7 @@ namespace svt // first collect all known programmatic names StringBag aKnownNames; - OUString sLogicalFieldNames(SVT_RESSTR(STR_LOGICAL_FIELD_NAMES)); + OUString sLogicalFieldNames(STR_LOGICAL_FIELD_NAMES); sal_Int32 nIndex = 0; do { @@ -621,7 +620,7 @@ void AssignmentPersistentData::ImplCommit() implScrollFields(0, false, false); // the logical names - OUString sLogicalFieldNames(SVT_RESSTR(STR_LOGICAL_FIELD_NAMES)); + OUString sLogicalFieldNames(STR_LOGICAL_FIELD_NAMES); sal_Int32 nAdjustedTokenCount = comphelper::string::getTokenCount(sLogicalFieldNames, ';') + (m_pImpl->bOddFieldNumber ? 1 : 0); DBG_ASSERT(nAdjustedTokenCount == (sal_Int32)m_pImpl->aFieldLabels.size(), "AddressBookSourceDialog::AddressBookSourceDialog: inconsistence between logical and UI field names!"); diff --git a/svtools/source/dialogs/addresstemplate.src b/svtools/source/dialogs/addresstemplate.src index cdefacbd064a..2044f18ff6a4 100644 --- a/svtools/source/dialogs/addresstemplate.src +++ b/svtools/source/dialogs/addresstemplate.src @@ -20,14 +20,6 @@ #include <svtools/svtools.hrc> #include "addresstemplate.hrc" -String STR_LOGICAL_FIELD_NAMES -{ - Text = "FirstName;LastName;Company;Department;Street;Zip;City;State;Country;PhonePriv;PhoneComp;PhoneOffice;PhoneCell;PhoneOther;Pager;Fax;EMail;URL;Title;Position;Code;AddrForm;AddrFormMail;Id;CalendarURL;InviteParticipant;Note;Altfield1;Altfield2;Altfield3;Altfield4"; - // no need to translate this - // the items in this string have to be in the same order as the STR_FIELD_* strings are added to the - // field label list of the dialog -}; - String STR_NO_FIELD_SELECTION { Text [ en-US ] = "<none>"; |