openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From o..@apache.org
Subject svn commit: r1197035 - in /incubator/ooo/trunk/main: helpcontent2/source/text/swriter/01/ sw/source/ui/dbui/
Date Thu, 03 Nov 2011 09:56:08 GMT
Author: orw
Date: Thu Nov  3 09:56:08 2011
New Revision: 1197035

URL: http://svn.apache.org/viewvc?rev=1197035&view=rev
Log:
118572 - remove ui string and help content regarding usage of Java Mail in Writer's Mail Merge
as Java Mail is not used.

Modified:
    incubator/ooo/trunk/main/helpcontent2/source/text/swriter/01/mailmerge02.xhp
    incubator/ooo/trunk/main/sw/source/ui/dbui/mmoutputtypepage.cxx
    incubator/ooo/trunk/main/sw/source/ui/dbui/mmoutputtypepage.hrc
    incubator/ooo/trunk/main/sw/source/ui/dbui/mmoutputtypepage.hxx
    incubator/ooo/trunk/main/sw/source/ui/dbui/mmoutputtypepage.src

Modified: incubator/ooo/trunk/main/helpcontent2/source/text/swriter/01/mailmerge02.xhp
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/helpcontent2/source/text/swriter/01/mailmerge02.xhp?rev=1197035&r1=1197034&r2=1197035&view=diff
==============================================================================
--- incubator/ooo/trunk/main/helpcontent2/source/text/swriter/01/mailmerge02.xhp (original)
+++ incubator/ooo/trunk/main/helpcontent2/source/text/swriter/01/mailmerge02.xhp Thu Nov 
3 09:56:08 2011
@@ -47,7 +47,7 @@
 <bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_OUTPUTTYPE_PAGE:RB_LETTER"
id="bm_id2589190" localize="false"/><paragraph role="heading" id="par_idN10556" xml-lang="en-US"
level="2" l10n="NEW">Letter</paragraph>
 <paragraph role="paragraph" id="par_idN1055A" xml-lang="en-US" l10n="NEW"><ahelp
hid=".">Creates a printable mail merge document.</ahelp></paragraph>
 <paragraph role="heading" id="hd_id6954863" xml-lang="en-US" level="2" l10n="NEW">E-mail
message</paragraph>
-<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_OUTPUTTYPE_PAGE:RB_MAIL"
id="bm_id3822443" localize="false"/><paragraph role="paragraph" id="par_idN10561" xml-lang="en-US"
l10n="CHG"><ahelp hid=".">Creates mail merge documents that you can send as an e-mail
message or an e-mail attachment.</ahelp> This feature needs Java Mail. If Java Mail
is not installed, you can download the software from <link href="http://java.sun.com/products/javamail/">http://java.sun.com/products/javamail/</link>.</paragraph>
+<bookmark xml-lang="en-US" branch="hid/sw:RadioButton:DLG_MM_OUTPUTTYPE_PAGE:RB_MAIL"
id="bm_id3822443" localize="false"/><paragraph role="paragraph" id="par_idN10561" xml-lang="en-US"
l10n="CHG"><ahelp hid=".">Creates mail merge documents that you can send as an e-mail
message or an e-mail attachment.</ahelp></paragraph>
 <paragraph role="paragraph" id="par_idN10572" xml-lang="en-US" l10n="NEW"><link
href="text/swriter/01/mailmerge03.xhp" name="Mail Merge Wizard - Addresses">Mail Merge
Wizard - Addresses</link></paragraph>
 </body>
 </helpdocument>

Modified: incubator/ooo/trunk/main/sw/source/ui/dbui/mmoutputtypepage.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/source/ui/dbui/mmoutputtypepage.cxx?rev=1197035&r1=1197034&r2=1197035&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/source/ui/dbui/mmoutputtypepage.cxx (original)
+++ incubator/ooo/trunk/main/sw/source/ui/dbui/mmoutputtypepage.cxx Thu Nov  3 09:56:08 2011
@@ -58,7 +58,6 @@ SwMailMergeOutputTypePage::SwMailMergeOu
     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::SwMailMergeOu
     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);
 
 }

Modified: incubator/ooo/trunk/main/sw/source/ui/dbui/mmoutputtypepage.hrc
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/source/ui/dbui/mmoutputtypepage.hrc?rev=1197035&r1=1197034&r2=1197035&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/source/ui/dbui/mmoutputtypepage.hrc (original)
+++ incubator/ooo/trunk/main/sw/source/ui/dbui/mmoutputtypepage.hrc Thu Nov  3 09:56:08 2011
@@ -37,7 +37,6 @@
 #define ST_MAILHINTHEADER           8
 #define ST_LETTERHINT               9
 #define ST_MAILHINT                 10
-#define FT_NOMAILHINT               11
 
 #endif
 

Modified: incubator/ooo/trunk/main/sw/source/ui/dbui/mmoutputtypepage.hxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/source/ui/dbui/mmoutputtypepage.hxx?rev=1197035&r1=1197034&r2=1197035&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/source/ui/dbui/mmoutputtypepage.hxx (original)
+++ incubator/ooo/trunk/main/sw/source/ui/dbui/mmoutputtypepage.hxx Thu Nov  3 09:56:08 2011
@@ -46,7 +46,6 @@ class SwMailMergeOutputTypePage : public
     
     SwBoldFixedInfo m_aHintHeaderFI;
     FixedInfo       m_aHintFI;
-    FixedInfo       m_aNoMailHintFI;
 
     String          m_sLetterHintHeader;
     String          m_sMailHintHeader;

Modified: incubator/ooo/trunk/main/sw/source/ui/dbui/mmoutputtypepage.src
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sw/source/ui/dbui/mmoutputtypepage.src?rev=1197035&r1=1197034&r2=1197035&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sw/source/ui/dbui/mmoutputtypepage.src (original)
+++ incubator/ooo/trunk/main/sw/source/ui/dbui/mmoutputtypepage.src Thu Nov  3 09:56:08 2011
@@ -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/'.";
-    };
 };
 
 



Mime
View raw message