mailmerge: fix salutation list

Previous state: there were two salutation lists, one for men,
one for women. But they contained not only the salutation, but
title, placeholder, and a punctuation merk. Therefore, when the user
composed a Custom Salutation, and selected a pre-defined salutation,
the result was something like for example "Dear Mr. 2, Mr. Lastname,"
instead of "Dear Mr. Lastname,".
Current state: salutation list contains only salutations. There is no
need for two lists, because the Custom Salutation is customizable
separately for men and women and it is not necessary to choose
from the list.

Change-Id: Ibb4e195401f1d01d5e63c9085b99d7acf3ef1229

1 files changed, 4 insertions, 15 deletions

diff --git a/sw/source/ui/dbui/mmaddressblockpage.src b/sw/source/ui/dbui/mmaddressblockpage.src
index 81f6f9e4fb01..c93450fb5992 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.src
+++ b/sw/source/ui/dbui/mmaddressblockpage.src
@@ -230,24 +230,13 @@ String ST_TEXT
 {
     Text[ en-US ] = "Text";
 };
-StringArray RA_SALUTATION_MALE
+StringArray RA_SALUTATION
 {
     ItemList [en-US]=
     {
-        < "Dear Mr. <2>," ; > ;
-        < "Mr. <2>," ; > ;
-        < "Dear <1>," ; > ;
-        < "Hello <1>," ; > ;
-    };
-};
-StringArray RA_SALUTATION_FEMALE
-{
-    ItemList [en-US]=
-    {
-        < "Dear Mrs. <2>," ; > ;
-        < "Ms. <2>," ; > ;
-        < "Dear <1>," ; > ;
-        < "Hello <1>," ; > ;
+        < "Dear" ; > ;
+        < "Hello" ; > ;
+        < "Hi" ; > ;
     };
 };
 StringArray RA_PUNCTUATION