[Libreoffice-commits] core.git: 2 commits - sw/source

[Andras Timar]

 sw/source/ui/dbui/mmaddressblockpage.cxx |    2 +-
 sw/source/ui/dbui/mmaddressblockpage.src |   21 ---------------------
 2 files changed, 1 insertion(+), 22 deletions(-)

New commits:
commit 7527e8f71bbdb87f283a6c19e4dbdfa0faf0622a
Author: Andras Timar <andras.timar at collabora.com>
Date:   Thu Oct 17 21:14:01 2013 +0200

    fix thinko
    
    Change-Id: I766665e9b4cc83a78d718b194eb8dbb3fd5113aa

diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index e9ead95..aef961e 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -684,7 +684,7 @@ sal_Int32 SwCustomizeAddressBlockDialog::GetSelectedItem_Impl()
         {
             SvTreeListEntry* pEntry = m_pAddressElementsLB->GetEntry(i);
             OUString sEntry = m_pAddressElementsLB->GetEntryText(pEntry);
-            if( sSelected == sEntry.copy( 1, sSelected.getLength() - 2 ) )
+            if( sEntry == sSelected.copy( 1, sSelected.getLength() - 2 ) )
             {
                 nRet = (sal_Int32)(sal_IntPtr)pEntry->GetUserData();
                 break;
commit 828bc9d9376d296db47fbee699ae08e546b50a8d
Author: Andras Timar <andras.timar at collabora.com>
Date:   Thu Oct 17 20:38:59 2013 +0200

    remove German text from resource
    
    Change-Id: I8a34d2a5d4ea5e8e7f2245b97e4b8b0577edcc17

diff --git a/sw/source/ui/dbui/mmaddressblockpage.src b/sw/source/ui/dbui/mmaddressblockpage.src
index fdd871d..81f6f9e 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.src
+++ b/sw/source/ui/dbui/mmaddressblockpage.src
@@ -232,13 +232,6 @@ String ST_TEXT
 };
 StringArray RA_SALUTATION_MALE
 {
-    ItemList =
-    {
-        < "Sehr geehrter Herr <2>," ; > ;
-        < "Lieber Herr <2>," ; > ;
-        < "Hallo Herr <2>," ; > ;
-        < "Hallo <1>," ; > ;
-    };
     ItemList [en-US]=
     {
         < "Dear Mr. <2>," ; > ;
@@ -249,13 +242,6 @@ StringArray RA_SALUTATION_MALE
 };
 StringArray RA_SALUTATION_FEMALE
 {
-    ItemList =
-    {
-        < "Sehr geehrte Frau <2>," ; > ;
-        < "Liebe Frau <2>," ; > ;
-        < "Hallo Frau <2>," ; > ;
-        < "Hallo <1>," ; > ;
-    };
     ItemList [en-US]=
     {
         < "Dear Mrs. <2>," ; > ;
@@ -266,13 +252,6 @@ StringArray RA_SALUTATION_FEMALE
 };
 StringArray RA_PUNCTUATION
 {
-    ItemList =
-    {
-        < "," ; > ;
-        < ":" ; > ;
-        < "!" ; > ;
-        < "(kein)" ; > ;
-    };
     ItemList [en-US]=
     {
         < "," ; > ;