118572 - remove ui string and help content regarding usage of Java Mail in Writer's Mail Merge as Java Mail is not used.

4 files changed, 0 insertions, 20 deletions

diff --git a/sw/source/ui/dbui/mmoutputtypepage.cxx b/sw/source/ui/dbui/mmoutputtypepage.cxx
index 8d229b94c06c..67a18e606021 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.cxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.cxx
@@ -58,7 +58,6 @@ SwMailMergeOutputTypePage::SwMailMergeOutputTypePage( SwMailMergeWizard* _pParen
     m_aMailRB(      this, SW_RES( RB_MAIL    )),
     m_aHintHeaderFI(this, SW_RES( FI_HINTHEADER)),
     m_aHintFI(      this, SW_RES( FI_HINT)),
-    m_aNoMailHintFI(this, SW_RES( FT_NOMAILHINT)),
 #ifdef MSC
 #pragma warning (default : 4355)
 #endif
@@ -74,19 +73,10 @@ SwMailMergeOutputTypePage::SwMailMergeOutputTypePage( SwMailMergeWizard* _pParen
     m_aMailRB.SetClickHdl(aLink);
 
     SwMailMergeConfigItem& rConfigItem = m_pWizard->GetConfigItem();
-    m_pWizard->EnterWait();
-    bool bMailAvailable = rConfigItem.IsMailAvailable();
-    m_pWizard->LeaveWait();
     if(rConfigItem.IsOutputToLetter())
         m_aLetterRB.Check();
     else
         m_aMailRB.Check();
-    if(!bMailAvailable)
-    {
-        m_aNoMailHintFI.Show();
-        m_aMailRB.Enable(sal_False);
-        m_aLetterRB.Check();
-    }
     TypeHdl_Impl(&m_aLetterRB);
 
 }
diff --git a/sw/source/ui/dbui/mmoutputtypepage.hrc b/sw/source/ui/dbui/mmoutputtypepage.hrc
index 6deff71251b9..71350b3c82b8 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.hrc
+++ b/sw/source/ui/dbui/mmoutputtypepage.hrc
@@ -37,7 +37,6 @@
 #define ST_MAILHINTHEADER           8
 #define ST_LETTERHINT               9
 #define ST_MAILHINT                 10
-#define FT_NOMAILHINT               11
 
 #endif
 
diff --git a/sw/source/ui/dbui/mmoutputtypepage.hxx b/sw/source/ui/dbui/mmoutputtypepage.hxx
index 9db02409cd1c..10bf3fed3cb9 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.hxx
+++ b/sw/source/ui/dbui/mmoutputtypepage.hxx
@@ -46,7 +46,6 @@ class SwMailMergeOutputTypePage : public svt::OWizardPage
 
     SwBoldFixedInfo m_aHintHeaderFI;
     FixedInfo       m_aHintFI;
-    FixedInfo       m_aNoMailHintFI;
 
     String          m_sLetterHintHeader;
     String          m_sMailHintHeader;
diff --git a/sw/source/ui/dbui/mmoutputtypepage.src b/sw/source/ui/dbui/mmoutputtypepage.src
index f1b9fda069ce..523b820e4439 100644
--- a/sw/source/ui/dbui/mmoutputtypepage.src
+++ b/sw/source/ui/dbui/mmoutputtypepage.src
@@ -87,14 +87,6 @@ TabPage DLG_MM_OUTPUTTYPE_PAGE
     {
         Text[ en-US ] = "Send e-mail messages to a group of recipients. The e-mail messages can contain a salutation. The e-mail messages can be personalized for each recipient.";
     };
-    FixedText FT_NOMAILHINT
-    {
-        Pos = MAP_APPFONT ( 12 , 113 ) ;
-        Size = MAP_APPFONT ( 242 , 42 ) ;
-        WordBreak = TRUE;
-        Hide = TRUE;
-        Text[ en-US ] = "%PRODUCTNAME was unable to find a Java Mail connection. In order to send e-mail with %PRODUCTNAME, you need to install the latest version of Java Mail. You can find further information about Java Mail on the internet at 'http://java.sun.com/products/javamail/'.";
-    };
 };