Attachment #34428 for issue #46895

View | Details | Raw Unified | Return to issue 46895
Collapse All | Expand All

Lines 87-94 private: Link Here

(-)sfx2/source/inc/mailmodel.hxx (-3 / +2 lines)
87		87
88	void ClearList( AddressList_Impl* pList );	88	void ClearList( AddressList_Impl* pList );
89	void MakeValueList( AddressList_Impl* pList, String& rValueList );	89	void MakeValueList( AddressList_Impl* pList, String& rValueList );
90	SaveResult SaveDocument( String& rFileName, String& rType );	90	SaveResult SaveDocumentAsFormat( String& rFileName, String& rType, const String& rFilter );
91	SaveResult SaveDocAsPDF( String& rFileName, String& rType );
92		91
93	DECL_LINK( DoneHdl, void* );	92	DECL_LINK( DoneHdl, void* );
94		93
Lines 108-114 public: Link Here
108	void SetSubject( const String& rSubject ) { maSubject = rSubject; }	107	void SetSubject( const String& rSubject ) { maSubject = rSubject; }
109	void SetPriority( MailPriority ePrio ) { mePriority = ePrio; }	108	void SetPriority( MailPriority ePrio ) { mePriority = ePrio; }
110		109
111	SendMailResult Send( MailDocType );	110	SendMailResult Send( const String& rFilter );
112	};	111	};
113		112
114	BOOL CreateFromAddress_Impl( String& rFrom );	113	BOOL CreateFromAddress_Impl( String& rFrom );

Lines 243-251 void SfxMailModel_Impl::MakeValueList( A Link Here

(-)sfx2/source/dialog/mailmodel.cxx (-95 / +18 lines)
243	}	243	}
244	}	244	}
245		245
246	SfxMailModel_Impl::SaveResult SfxMailModel_Impl::SaveDocument( String& rFileName, String& rType )	246	SfxMailModel_Impl::SaveResult SfxMailModel_Impl::SaveDocumentAsFormat( String& rFileName, String& rType, const String& rFilter )
247	{	247	{
248	SaveResult eRet = SAVE_CANCELLED;	248	SaveResult eRet = SAVE_CANCELLED;
		249	bool bSaveAs = ( rFilter.Len() > 0 );
		250
249	SfxViewFrame* pTopViewFrm = mpBindings->GetDispatcher_Impl()->GetFrame()->GetTopViewFrame();	251	SfxViewFrame* pTopViewFrm = mpBindings->GetDispatcher_Impl()->GetFrame()->GetTopViewFrame();
250	SfxObjectShellRef xDocShell = pTopViewFrm->GetObjectShell();	252	SfxObjectShellRef xDocShell = pTopViewFrm->GetObjectShell();
251		253
Lines 256-262 SfxMailModel_Impl::SaveResult SfxMailMod Link Here
256	BOOL bModified = xDocShell->IsModified();	258	BOOL bModified = xDocShell->IsModified();
257		259
258	// detect filter	260	// detect filter
259	const SfxFilter* pFilter = xDocShell->GetMedium()->GetFilter();	261	String sFactoryShortName = String::CreateFromAscii(xDocShell->GetFactory().GetShortName());
		262	String sFactoryLongName = SfxObjectShell::GetServiceNameFromFactory(sFactoryShortName);
		263	SfxFilterMatcher aMatcher( sFactoryShortName );
		264
		265	const SfxFilter* pFilter = NULL;
		266	if ( bSaveAs )
		267	pFilter = aMatcher.GetFilter4FilterName( rFilter );
		268	else
		269	pFilter = xDocShell->GetMedium()->GetFilter();
260	sal_Bool bHasFilter = pFilter ? sal_True : sal_False;	270	sal_Bool bHasFilter = pFilter ? sal_True : sal_False;
261	if ( !pFilter )	271	if ( !pFilter )
262	{	272	{
Lines 280-285 SfxMailModel_Impl::SaveResult SfxMailMod Link Here
280	String aName;	290	String aName;
281	if ( aFileObj.hasExtension() )	291	if ( aFileObj.hasExtension() )
282	{	292	{
283	pExt = new String( String::CreateFromAscii( "." ) + (OUString) aFileObj.getExtension() );	293	if ( !bSaveAs ) // Only use extension in NOT save in another
		294	// Format
		295	pExt = new String( String::CreateFromAscii( "." ) + (OUString) aFileObj.getExtension() );
284	aFileObj.removeExtension();	296	aFileObj.removeExtension();
285	aLeadingStr = aFileObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET );	297	aLeadingStr = aFileObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET );
Lines 305-311 SfxMailModel_Impl::SaveResult SfxMailMod Link Here
305		313
306	rFileName = aTempFile.GetURL();	314	rFileName = aTempFile.GetURL();
307		315
308	if ( bModified \|\| !xDocShell->HasName() )	316	if ( bModified \|\| !xDocShell->HasName() \|\| bSaveAs )
309	{	317	{
310	// prepare for mail export	318	// prepare for mail export
311	SfxDispatcher* pDisp = pTopViewFrm->GetDispatcher();	319	SfxDispatcher* pDisp = pTopViewFrm->GetDispatcher();
Lines 488-579 const SfxFilter* impl_getPDFFilterForDoc Link Here
488	return 0;	496	return 0;
489	}	497	}
490		498
491	SfxMailModel_Impl::SaveResult SfxMailModel_Impl::SaveDocAsPDF( String& rFileName, String& rType )
492	{
493	SaveResult eRet = SAVE_CANCELLED;
494	SfxViewFrame* pTopViewFrm = mpBindings->GetDispatcher_Impl()->GetFrame()->GetTopViewFrame();
495	SfxObjectShellRef xDocShell = pTopViewFrm->GetObjectShell();
496
497	// save the document
498	if ( xDocShell.Is() && xDocShell->GetMedium() )
499	{
500	// save old settings
501	BOOL bModified = xDocShell->IsModified();
502	// prepare for mail export
503	SfxDispatcher* pDisp = pTopViewFrm->GetDispatcher();
504	pDisp->Execute( SID_MAIL_PREPAREEXPORT, SFX_CALLMODE_SYNCHRON );
505
506	// Get PDF Filter from document
507	String sFactoryShortName = String::CreateFromAscii(xDocShell->GetFactory().GetShortName());
508	String sFactoryLongName = SfxObjectShell::GetServiceNameFromFactory(sFactoryShortName);
509	SfxFilterMatcher aMatcher( sFactoryShortName );
510	String aPDFExtension = String::CreateFromAscii( "pdf" ); // Extension without dot!
511
512	const SfxFilter* pFilter = impl_getPDFFilterForDoc( sFactoryLongName, aMatcher);
513	sal_Bool bHasFilter = pFilter ? sal_True : sal_False;
514
515	// create temp file name with leading chars and extension
516	sal_Bool bHasName = xDocShell->HasName();
517	String aLeadingStr;
518	String* pExt = NULL;
519
520	if ( !bHasName )
521	aLeadingStr = String( DEFINE_CONST_UNICODE("noname") );
522	else
523	{
524	INetURLObject aFileObj = xDocShell->GetMedium()->GetURLObject();
525	String aName;
526	if ( aFileObj.hasExtension() )
527	{
528	pExt = new String( String::CreateFromAscii( "." ) + (OUString)aPDFExtension );
529	aFileObj.removeExtension();
530	aLeadingStr = aFileObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET );
531	aLeadingStr += String::CreateFromAscii( "_" );
532	}
533	else
534	{
535	aLeadingStr = aFileObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET );
536	aLeadingStr += String::CreateFromAscii( "_" );
537	}
538	}
539
540	if ( pFilter && !pExt )
541	{
542	pExt = new String( pFilter->GetWildcard()().GetToken(0) );
543	// erase the '' from the extension (e.g. ".sdw")
544	pExt->Erase( 0, 1 );
545	}
546
547	::utl::TempFile aTempFile( aLeadingStr, pExt );
548	delete pExt;
549
550	rFileName = aTempFile.GetURL();
551
552	// save document to temp file
553	SfxStringItem aFileName( SID_FILE_NAME, rFileName );
554	const SfxBoolItem pRet = (const SfxBoolItem)pDisp->Execute( SID_EXPORTDOCASPDF, SFX_CALLMODE_SYNCHRON, &aFileName, 0L );
555	BOOL bRet = pRet ? pRet->GetValue() : FALSE;
556	eRet = bRet ? SAVE_SUCCESSFULL : SAVE_CANCELLED;
557
558	if ( pFilter )
559	{
560	// detect content type and expand with the file name
561	rType = pFilter->GetMimeType();
562	rType += DEFINE_CONST_UNICODE("; name =\"");
563	INetURLObject aFileObj = xDocShell->GetMedium()->GetURLObject();
564	rType += String(aFileObj.getName( INetURLObject::LAST_SEGMENT,
565	true, INetURLObject::DECODE_WITH_CHARSET ));
566	rType += '\"';
567	}
568
569	// restore old settings
570	if ( !bModified && xDocShell->IsEnableSetModified() )
571	xDocShell->SetModified( FALSE );
572	}
573
574	return eRet;
575	}
576
577	IMPL_LINK_INLINE_START( SfxMailModel_Impl, DoneHdl, void*, EMPTYARG )	499	IMPL_LINK_INLINE_START( SfxMailModel_Impl, DoneHdl, void*, EMPTYARG )
578	{	500	{
579	mbLoadDone = sal_True;	501	mbLoadDone = sal_True;
Lines 644-660 void SfxMailModel_Impl::AddAddress( cons Link Here
644	}	566	}
645	}	567	}
646		568
647	SfxMailModel_Impl::SendMailResult SfxMailModel_Impl::Send( MailDocType eMailDocType )	569	SfxMailModel_Impl::SendMailResult SfxMailModel_Impl::Send( const String& rFilterName )
648	{	570	{
649	SaveResult eSaveResult;	571	SaveResult eSaveResult;
650	SendMailResult eResult = SEND_MAIL_ERROR;	572	SendMailResult eResult = SEND_MAIL_ERROR;
651	String aFileName, aContentType;	573	String aFileName, aContentType;
652		574
653	sal_Bool bSuccessfull = sal_False;	575	sal_Bool bSuccessfull = sal_False;
654	if ( eMailDocType == TYPE_SELF )	576	eSaveResult = SaveDocumentAsFormat( aFileName, aContentType, rFilterName );
655	eSaveResult = SaveDocument( aFileName, aContentType );
656	else
657	eSaveResult = SaveDocAsPDF( aFileName, aContentType );
658		577
659	if ( eSaveResult == SAVE_SUCCESSFULL )	578	if ( eSaveResult == SAVE_SUCCESSFULL )
660	{	579	{





		// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -

		case SID_MAIL_SENDDOCASPDF:
		case SID_MAIL_SENDDOC:
		{
			SfxObjectShell* pDoc = GetObjectShell();

				}

				SfxMailModel_Impl::SendMailResult eResult = SfxMailModel_Impl::SEND_MAIL_ERROR;
				String sFilterName;
				SFX_REQUEST_ARG(rReq, pFilterName, SfxStringItem, SID_FILTER_NAME, FALSE );
				if ( pFilterName )
					sFilterName = pFilterName->GetValue();

				eResult = aModel.Send( sFilterName );

				if ( eResult == SfxMailModel_Impl::SEND_MAIL_ERROR )
				{

			}

			// Mail-Funktionen
			case SID_MAIL_SENDDOCASPDF:
			case SID_MAIL_SENDDOC:
			{
                BOOL bEnable = !GetViewFrame()->HasChildWindow( SID_MAIL_CHILDWIN );

Lines 21-27 Link Here

(-)sc/uiconfig/scalc/menubar/menubar.xml (-1 / +2 lines)
21	<menu:menu menu:id=".uno:SendTo" menu:label="" >	21	<menu:menu menu:id=".uno:SendTo" menu:label="" >
22	<menu:menupopup>	22	<menu:menupopup>
23	<menu:menuitem menu:id=".uno:SendMail" menu:helpid="5331" menu:label="" />	23	<menu:menuitem menu:id=".uno:SendMail" menu:helpid="5331" menu:label="" />
24	<menu:menuitem menu:id=".uno:SendMailDocAsPDF" menu:helpid="6672" menu:label="" />	24	<menu:menuitem menu:id=".uno:SendMail?FilterName:string=calc_pdf_Export" menu:helpid="6672" menu:label="" />
		25	<menu:menuitem menu:id=".uno:SendMail?FilterName:string=MS Excel 95" menu:helpid="6707" menu:label="" />
25	</menu:menupopup>	26	</menu:menupopup>
26	</menu:menu>	27	</menu:menu>
27	<menu:menuseparator/>	28	<menu:menuseparator/>

Lines 21-27 Link Here

(-)sw/uiconfig/sglobal/menubar/menubar.xml (-1 / +1 lines)
21	<menu:menu menu:id=".uno:SendToMenu" menu:label="" >	21	<menu:menu menu:id=".uno:SendToMenu" menu:label="" >
22	<menu:menupopup>	22	<menu:menupopup>
23	<menu:menuitem menu:id=".uno:SendMail" menu:helpid="5331" menu:label="" />	23	<menu:menuitem menu:id=".uno:SendMail" menu:helpid="5331" menu:label="" />
24	<menu:menuitem menu:id=".uno:SendMailDocAsPDF" menu:helpid="6672" menu:label="" />	24	<menu:menuitem menu:id=".uno:SendMail?FilterName:string=writer_globaldocument_pdf_Export" menu:helpid="6672" menu:label="" />
25	<menu:menuseparator/>	25	<menu:menuseparator/>
26	<menu:menuitem menu:id=".uno:NewGlobalDoc" menu:helpid="20004" menu:label="" />	26	<menu:menuitem menu:id=".uno:NewGlobalDoc" menu:helpid="20004" menu:label="" />
27	<menu:menuitem menu:id=".uno:NewHtmlDoc" menu:helpid="20040" menu:label="" />	27	<menu:menuitem menu:id=".uno:NewHtmlDoc" menu:helpid="20040" menu:label="" />

Lines 18-24 Link Here

(-)sw/uiconfig/sweb/menubar/menubar.xml (-1 / +1 lines)
18	<menu:menu menu:id=".uno:SendToMenu" menu:label="" >	18	<menu:menu menu:id=".uno:SendToMenu" menu:label="" >
19	<menu:menupopup>	19	<menu:menupopup>
20	<menu:menuitem menu:id=".uno:SendMail" menu:helpid="5331" menu:label="" />	20	<menu:menuitem menu:id=".uno:SendMail" menu:helpid="5331" menu:label="" />
21	<menu:menuitem menu:id=".uno:SendMailDocAsPDF" menu:helpid="6672" menu:label="" />	21	<menu:menuitem menu:id=".uno:SendMail?FilterName:string=writer_web_pdf_Export" menu:helpid="6672" menu:label="" />
22	</menu:menupopup>	22	</menu:menupopup>
23	</menu:menu>	23	</menu:menu>
24	<menu:menuseparator/>	24	<menu:menuseparator/>

Lines 21-27 Link Here

(-)sw/uiconfig/swriter/menubar/menubar.xml (-1 / +3 lines)
21	<menu:menu menu:id=".uno:SendToMenu" menu:label="" >	21	<menu:menu menu:id=".uno:SendToMenu" menu:label="" >
22	<menu:menupopup>	22	<menu:menupopup>
23	<menu:menuitem menu:id=".uno:SendMail" menu:helpid="5331" menu:label="" />	23	<menu:menuitem menu:id=".uno:SendMail" menu:helpid="5331" menu:label="" />
24	<menu:menuitem menu:id=".uno:SendMailDocAsPDF" menu:helpid="6672" menu:label="" />	24	<menu:menuitem menu:id=".uno:SendMail?FilterName:string=writer_pdf_Export" menu:helpid="6672" menu:label="" />
		25	<menu:menuitem menu:id=".uno:SendMail?FilterName:string=MS WinWord 6.0" menu:helpid="6707" menu:label="" />
		26
25	<menu:menuseparator/>	27	<menu:menuseparator/>
26	<menu:menuitem menu:id=".uno:NewGlobalDoc" menu:helpid="20004" menu:label="" />	28	<menu:menuitem menu:id=".uno:NewGlobalDoc" menu:helpid="20004" menu:label="" />
27	<menu:menuitem menu:id=".uno:NewHtmlDoc" menu:helpid="20040" menu:label="" />	29	<menu:menuitem menu:id=".uno:NewHtmlDoc" menu:helpid="20040" menu:label="" />

Lines 21-27 Link Here

(-)sd/uiconfig/sdraw/menubar/menubar.xml (-1 / +1 lines)
21	<menu:menu menu:id=".uno:SendMenu" menu:label="" >	21	<menu:menu menu:id=".uno:SendMenu" menu:label="" >
22	<menu:menupopup>	22	<menu:menupopup>
23	<menu:menuitem menu:id=".uno:SendMail" menu:helpid="5331" menu:label="" />	23	<menu:menuitem menu:id=".uno:SendMail" menu:helpid="5331" menu:label="" />
24	<menu:menuitem menu:id=".uno:SendMailDocAsPDF" menu:helpid="6672" menu:label="" />	24	<menu:menuitem menu:id=".uno:SendMail?Filtername:string=draw_pdf_Export" menu:helpid="6672" menu:label="" />
25	</menu:menupopup>	25	</menu:menupopup>
26	</menu:menu>	26	</menu:menu>
27	<menu:menuseparator/>	27	<menu:menuseparator/>

Lines 21-27 Link Here

(-)sd/uiconfig/simpress/menubar/menubar.xml (-1 / +2 lines)
21	<menu:menu menu:id=".uno:SendMenu" menu:label="" >	21	<menu:menu menu:id=".uno:SendMenu" menu:label="" >
22	<menu:menupopup>	22	<menu:menupopup>
23	<menu:menuitem menu:id=".uno:SendMail" menu:helpid="5331" menu:label="" />	23	<menu:menuitem menu:id=".uno:SendMail" menu:helpid="5331" menu:label="" />
24	<menu:menuitem menu:id=".uno:SendMailDocAsPDF" menu:helpid="6672" menu:label="" />	24	<menu:menuitem menu:id=".uno:SendMail?FilterName:string=impress_pdf_Export" menu:helpid="6672" menu:label="" />
		25	<menu:menuitem menu:id=".uno:SendMail?FilterName:string=MS PowerPoint 97" menu:helpid="6706" menu:label="" />
25	</menu:menupopup>	26	</menu:menupopup>
26	</menu:menu>	27	</menu:menu>
27	<menu:menuseparator/>	28	<menu:menuseparator/>

Lines 20-26 Link Here

(-)starmath/uiconfig/smath/menubar/menubar.xml (-1 / +1 lines)
20	<menu:menu menu:id=".uno:SendToMenu" menu:label="" >	20	<menu:menu menu:id=".uno:SendToMenu" menu:label="" >
21	<menu:menupopup>	21	<menu:menupopup>
22	<menu:menuitem menu:id=".uno:SendMail" menu:helpid="5331" menu:label="" />	22	<menu:menuitem menu:id=".uno:SendMail" menu:helpid="5331" menu:label="" />
23	<menu:menuitem menu:id=".uno:SendMailDocAsPDF" menu:helpid="6672" menu:label="" />	23	<menu:menuitem menu:id=".uno:SendMail?FilterName:string=math_pdf_Export" menu:helpid="6672" menu:label="" />
24	</menu:menupopup>	24	</menu:menupopup>
25	</menu:menu>	25	</menu:menu>
26	<menu:menuseparator/>	26	<menu:menuseparator/>

Lines 1498-1503 Link Here

(-)officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu (+5 lines)
1498	<value xml:lang="en-US">Sen~d</value>	1503	<value xml:lang="en-US">Sen~d</value>
1499	</prop>	1504	</prop>
1500	</node>	1505	</node>
		1506	<node oor:name=".uno:SendMail?FilterName:string=MS Excel 95" oor:op="replace">
		1507	<prop oor:name="Label" oor:type="xs:string">
		1508	<value xml:lang="en-US">Document as MS-E~xcel Attachment...</value>
		1509	</prop>
		1510	</node>
1501	<node oor:name=".uno:ProtectMenu" oor:op="replace">	1511	<node oor:name=".uno:ProtectMenu" oor:op="replace">
1502	<prop oor:name="Label" oor:type="xs:string">	1512	<prop oor:name="Label" oor:type="xs:string">
1503	<value xml:lang="de">Dokument sch~ützen</value>	1513	<value xml:lang="de">Dokument sch~ützen</value>

Lines 1737-1742 Link Here

(-)officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu (+5 lines)
1737	<value xml:lang="en-US">Styl~es</value>	1737	<value xml:lang="en-US">Styl~es</value>
1738	</prop>	1738	</prop>
1739	</node>	1739	</node>
		1740	<node oor:name=".uno:SendMail?FilterName:string=MS PowerPoint 97" oor:op="replace">
		1741	<prop oor:name="Label" oor:type="xs:string">
		1742	<value xml:lang="en-US">Document as MS-~PPT Attachment...</value>
		1743	</prop>
		1744	</node>
1740	<node oor:name=".uno:SnapLinesMenu" oor:op="replace">	1745	<node oor:name=".uno:SnapLinesMenu" oor:op="replace">
1741	<prop oor:name="Label" oor:type="xs:string">	1746	<prop oor:name="Label" oor:type="xs:string">
1742	<value xml:lang="de">Führungslinien</value>	1747	<value xml:lang="de">Führungslinien</value>




					<value xml:lang="en-US">Stop Recording</value>
				</prop>
			</node>
			<node oor:name=".uno:SendMailDocAsPDF" oor:op="replace">
				<prop oor:name="Label" oor:type="xs:string">
					<value xml:lang="de">Dokument als PD~F-Anhang...</value>
					<value xml:lang="en-US">Document as P~DF Attachment...</value>
				</prop>
			</node>
			<node oor:name=".uno:ExportToPDF" oor:op="replace">
				<prop oor:name="Label" oor:type="xs:string">
					<value xml:lang="de">Exportieren als ~PDF...</value>

					<value>1</value>
				</prop>
			</node>
			<node oor:name=".uno:SendMail?FilterName:string=writer_pdf_Export" oor:op="replace">
                                <prop oor:name="Label" oor:type="xs:string">
                                        <value xml:lang="de">Dokument als PD~F-Anhang...</value>
                                        <value xml:lang="en-US">Document as P~DF Attachment...</value>
                                </prop>
			</node>
			<node oor:name=".uno:SendMail?FilterName:string=calc_pdf_Export" oor:op="replace">
                                <prop oor:name="Label" oor:type="xs:string">
                                        <value xml:lang="de">Dokument als PD~F-Anhang...</value>
                                        <value xml:lang="en-US">Document as P~DF Attachment...</value>
                                </prop>
                        </node>
			<node oor:name=".uno:SendMail?FilterName:string=impress_pdf_Export" oor:op="replace">
                                <prop oor:name="Label" oor:type="xs:string">
                                        <value xml:lang="de">Dokument als PD~F-Anhang...</value>
                                        <value xml:lang="en-US">Document as P~DF Attachment...</value>
                                </prop>
                        </node>
			<node oor:name=".uno:SendMail?FilterName:string=writer_web_pdf_Export" oor:op="replace">
                                <prop oor:name="Label" oor:type="xs:string">
                                        <value xml:lang="de">Dokument als PD~F-Anhang...</value>
                                        <value xml:lang="en-US">Document as P~DF Attachment...</value>
                                </prop>
                        </node>
			<node oor:name=".uno:SendMail?FilterName:string=math_pdf_Export" oor:op="replace">
                                <prop oor:name="Label" oor:type="xs:string">
                                        <value xml:lang="de">Dokument als PD~F-Anhang...</value>
                                        <value xml:lang="en-US">Document as P~DF Attachment...</value>
                                </prop>
                        </node>
			<node oor:name=".uno:SendMail?FilterName:string=writer_globaldocument_pdf_Export" oor:op="replace">
                                <prop oor:name="Label" oor:type="xs:string">
                                        <value xml:lang="de">Dokument als PD~F-Anhang...</value>
                                        <value xml:lang="en-US">Document as P~DF Attachment...</value>
                                </prop>
                        </node>
			<node oor:name=".uno:SendMail" oor:op="replace">
				<prop oor:name="Label" oor:type="xs:string">
					<value xml:lang="de">Dokument als ~E-Mail...</value>

Lines 791-796 Link Here

(-)officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu (+5 lines)
791	<value>1</value>	791	<value>1</value>
792	</prop>	792	</prop>
793	</node>	793	</node>
		794	<node oor:name=".uno:SendMail?FilterName:string=MS WinWord 6.0" oor:op="replace">
		795	<prop oor:name="Label" oor:type="xs:string">
		796	<value xml:lang="en-US">Document as MS-~Doc Attachment...</value>
		797	</prop>
		798	</node>
794	<node oor:name=".uno:SendOutlineToClipboard" oor:op="replace">	799	<node oor:name=".uno:SendOutlineToClipboard" oor:op="replace">
795	<prop oor:name="Label" oor:type="xs:string">	800	<prop oor:name="Label" oor:type="xs:string">
796	<value xml:lang="de">Gliederung zur Zwis~chenablage</value>	801	<value xml:lang="de">Gliederung zur Zwis~chenablage</value>





//--------------------------------------------------------------------------
SfxBoolItem SendMail SID_MAIL_SENDDOC
(SfxStringItem Recipient SID_MAIL_RECIPIENT,SfxStringItem Subject SID_MAIL_SUBJECT,SfxStringItem MailText SID_MAIL_TEXT,SfxUInt16Item Priority SID_MAIL_PRIORITY,SfxBoolItem AttachedDoc SID_MAIL_ATTACH,SfxStringItem AttachFiles SID_MAIL_ATTACH_FILE, SfxStringItem FilterName SID_FILTER_NAME)
[
	/* flags: */
	AutoUpdate = FALSE,
	Cachable = Cachable,
	FastCall = FALSE,
	HasCoreId = FALSE,
	HasDialog = TRUE,
	ReadOnlyDoc = TRUE,
	Toggle = FALSE,
	Container = TRUE,
	RecordAbsolute = FALSE,
	RecordPerSet;
	Asynchron;

	/* status: */
	SlotType = SfxStringItem

	/* config: */
	AccelConfig = TRUE,
	MenuConfig = TRUE,
	StatusBarConfig = FALSE,
	ToolBoxConfig = TRUE,
	GroupId = GID_DOCUMENT;
]

SfxBoolItem SendMailDocAsPDF SID_MAIL_SENDDOCASPDF
(SfxStringItem Recipient SID_MAIL_RECIPIENT,SfxStringItem Subject SID_MAIL_SUBJECT,SfxStringItem MailText SID_MAIL_TEXT,SfxUInt16Item Priority SID_MAIL_PRIORITY,SfxBoolItem AttachedDoc SID_MAIL_ATTACH,SfxStringItem AttachFiles SID_MAIL_ATTACH_FILE)
[
	/* flags: */
	AutoUpdate = FALSE,

Lines 17-27 interface View : Object Link Here

(-)sfx2/sdi/viwslots.sdi (-5 lines)
17	ExecMethod = ExecMisc_Impl ;	17	ExecMethod = ExecMisc_Impl ;
18	StateMethod = GetState_Impl ;	18	StateMethod = GetState_Impl ;
19	]	19	]
20	SID_MAIL_SENDDOCASPDF // ole(no) api(todo)
21	[
22	ExecMethod = ExecMisc_Impl ;
23	StateMethod = GetState_Impl ;
24	]
25	//---------------------------------------------------------------------	20	//---------------------------------------------------------------------
26	SID_PRINTDOC // ole(no) api(play/rec)	21	SID_PRINTDOC // ole(no) api(play/rec)
27	[	22	[

Lines 122-128 Link Here

(-)sfx2/inc/sfxsids.hrc (-1 lines)
122	#define SID_MAIL_OPEN (SID_SFX_START + 329)	122	#define SID_MAIL_OPEN (SID_SFX_START + 329)
123	#define SID_MAIL_NOTIFY (SID_SFX_START + 330)	123	#define SID_MAIL_NOTIFY (SID_SFX_START + 330)
124	#define SID_MAIL_SENDDOC (SID_SFX_START + 331)	124	#define SID_MAIL_SENDDOC (SID_SFX_START + 331)
125	#define SID_MAIL_SENDDOCASPDF (SID_SFX_START + 1672)
126		125
127		126
128	#define SID_MAIL_RECIPIENT (SID_SFX_START + 334)	127	#define SID_MAIL_RECIPIENT (SID_SFX_START + 334)




    Text [ en-US ] = "Document as ~E-mail..." ; \
	Text [ x-comment ] = " ";	\

#define ITEM_FILE_MAIL_SENDDOCASPDF \
    Identifier = SID_MAIL_SENDDOCASPDF ; \
	Command = ".uno:SendMailDocAsPDF" ; \
    HelpID = SID_MAIL_SENDDOCASPDF ; \
    Text [ de ] = "Dokument als PD~F-Anhang..." ; \
    Text [ en-US ] = "Document as P~DF Attachment..." ;	\


#define ITEM_FILE_QUITAPP \
    Identifier = SID_QUITAPP ; \
	Command = ".uno:Quit" ; \

Lines 102-112 Link Here

(-)sd/source/ui/app/menuids2_tmpl.src (-5 lines)
102	Text [ en-US ] = "Sen~d" ; \	102	Text [ en-US ] = "Sen~d" ; \
103	SubMenu = Menu\	103	SubMenu = Menu\
104	{\	104	{\
105	ItemList = \
106	{\
107	MI ( ITEM_FILE_MAIL_SENDDOC ) \
108	MI ( ITEM_FILE_MAIL_SENDDOCASPDF ) \
109	};\
110	};\	105	};\
111	};	106	};
112		107

Lines 176-185 interface WebSourceView : View Link Here

(-)sw/sdi/wviewsh.sdi (-4 lines)
176	[	176	[
177	StateMethod = GetState ;	177	StateMethod = GetState ;
178	]	178	]
179	SID_MAIL_SENDDOCASPDF
180	[
181	StateMethod = GetState ;
182	]
183	SID_EXPORTDOC	179	SID_EXPORTDOC
184	[	180	[
185	StateMethod = GetState ;	181	StateMethod = GetState ;

Lines 710-716 void SwSrcView::GetState(SfxItemSet& rSe Link Here

(-)sw/source/ui/uiview/srcview.cxx (-1 lines)
710	}	710	}
711	}	711	}
712	break;	712	break;
713	case SID_MAIL_SENDDOCASPDF:
714	case SID_MAIL_SENDDOC :	713	case SID_MAIL_SENDDOC :
715	case SID_EXPORTDOCASPDF:	714	case SID_EXPORTDOCASPDF:
716	case SID_DIRECTEXPORTDOCASPDF:	715	case SID_DIRECTEXPORTDOCASPDF:

Return to issue 46895

Lines 160-166 void SfxViewShell::ExecMisc_Impl( SfxReq Link Here

(-)sfx2/source/view/viewsh.cxx (-6 / +6 lines)
160		160
161	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -	161	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
162		162
163	case SID_MAIL_SENDDOCASPDF:
164	case SID_MAIL_SENDDOC:	163	case SID_MAIL_SENDDOC:
165	{	164	{
166	SfxObjectShell* pDoc = GetObjectShell();	165	SfxObjectShell* pDoc = GetObjectShell();
Lines 192-201 void SfxViewShell::ExecMisc_Impl( SfxReq Link Here
192	}	191	}
193		192
194	SfxMailModel_Impl::SendMailResult eResult = SfxMailModel_Impl::SEND_MAIL_ERROR;	193	SfxMailModel_Impl::SendMailResult eResult = SfxMailModel_Impl::SEND_MAIL_ERROR;
195	if ( nId == SID_MAIL_SENDDOCASPDF )	194	String sFilterName;
196	eResult = aModel.Send( SfxMailModel_Impl::TYPE_ASPDF );	195	SFX_REQUEST_ARG(rReq, pFilterName, SfxStringItem, SID_FILTER_NAME, FALSE );
197	else	196	if ( pFilterName )
198	eResult = aModel.Send( SfxMailModel_Impl::TYPE_SELF );	197	sFilterName = pFilterName->GetValue();
		198
		199	eResult = aModel.Send( sFilterName );
199		200
200	if ( eResult == SfxMailModel_Impl::SEND_MAIL_ERROR )	201	if ( eResult == SfxMailModel_Impl::SEND_MAIL_ERROR )
201	{	202	{
Lines 314-320 void SfxViewShell::GetState_Impl( SfxIte Link Here
314	}	316	}
315		317
316	// Mail-Funktionen	318	// Mail-Funktionen
317	case SID_MAIL_SENDDOCASPDF:
318	case SID_MAIL_SENDDOC:	319	case SID_MAIL_SENDDOC:
319	{	320	{
320	BOOL bEnable = !GetViewFrame()->HasChildWindow( SID_MAIL_CHILDWIN );	321	BOOL bEnable = !GetViewFrame()->HasChildWindow( SID_MAIL_CHILDWIN );

Lines 4516-4527 Link Here

(-)officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu (-6 / +36 lines)
4516	<value xml:lang="en-US">Stop Recording</value>	4516	<value xml:lang="en-US">Stop Recording</value>
4517	</prop>	4517	</prop>
4518	</node>	4518	</node>
4519	<node oor:name=".uno:SendMailDocAsPDF" oor:op="replace">
4520	<prop oor:name="Label" oor:type="xs:string">
4521	<value xml:lang="de">Dokument als PD~F-Anhang...</value>
4522	<value xml:lang="en-US">Document as P~DF Attachment...</value>
4523	</prop>
4524	</node>
4525	<node oor:name=".uno:ExportToPDF" oor:op="replace">	4519	<node oor:name=".uno:ExportToPDF" oor:op="replace">
4526	<prop oor:name="Label" oor:type="xs:string">	4520	<prop oor:name="Label" oor:type="xs:string">
4527	<value xml:lang="de">Exportieren als ~PDF...</value>	4521	<value xml:lang="de">Exportieren als ~PDF...</value>
Lines 5241-5246 Link Here
5241	<value>1</value>	5235	<value>1</value>
5242	</prop>	5236	</prop>
5243	</node>	5237	</node>
		5238	<node oor:name=".uno:SendMail?FilterName:string=writer_pdf_Export" oor:op="replace">
		5239	<prop oor:name="Label" oor:type="xs:string">
		5240	<value xml:lang="de">Dokument als PD~F-Anhang...</value>
		5241	<value xml:lang="en-US">Document as P~DF Attachment...</value>
		5242	</prop>
		5243	</node>
		5244	<node oor:name=".uno:SendMail?FilterName:string=calc_pdf_Export" oor:op="replace">
		5245	<prop oor:name="Label" oor:type="xs:string">
		5246	<value xml:lang="de">Dokument als PD~F-Anhang...</value>
		5247	<value xml:lang="en-US">Document as P~DF Attachment...</value>
		5248	</prop>
		5249	</node>
		5250	<node oor:name=".uno:SendMail?FilterName:string=impress_pdf_Export" oor:op="replace">
		5251	<prop oor:name="Label" oor:type="xs:string">
		5252	<value xml:lang="de">Dokument als PD~F-Anhang...</value>
		5253	<value xml:lang="en-US">Document as P~DF Attachment...</value>
		5254	</prop>
		5255	</node>
		5256	<node oor:name=".uno:SendMail?FilterName:string=writer_web_pdf_Export" oor:op="replace">
		5257	<prop oor:name="Label" oor:type="xs:string">
		5258	<value xml:lang="de">Dokument als PD~F-Anhang...</value>
		5259	<value xml:lang="en-US">Document as P~DF Attachment...</value>
		5260	</prop>
		5261	</node>
		5262	<node oor:name=".uno:SendMail?FilterName:string=math_pdf_Export" oor:op="replace">
		5263	<prop oor:name="Label" oor:type="xs:string">
		5264	<value xml:lang="de">Dokument als PD~F-Anhang...</value>
		5265	<value xml:lang="en-US">Document as P~DF Attachment...</value>
		5266	</prop>
		5267	</node>
		5268	<node oor:name=".uno:SendMail?FilterName:string=writer_globaldocument_pdf_Export" oor:op="replace">
		5269	<prop oor:name="Label" oor:type="xs:string">
		5270	<value xml:lang="de">Dokument als PD~F-Anhang...</value>
		5271	<value xml:lang="en-US">Document as P~DF Attachment...</value>
		5272	</prop>
		5273	</node>
5244	<node oor:name=".uno:SendMail" oor:op="replace">	5274	<node oor:name=".uno:SendMail" oor:op="replace">
5245	<prop oor:name="Label" oor:type="xs:string">	5275	<prop oor:name="Label" oor:type="xs:string">
5246	<value xml:lang="de">Dokument als ~E-Mail...</value>	5276	<value xml:lang="de">Dokument als ~E-Mail...</value>

Lines 6369-6402 SfxVoidItem SendFax FN_FAX Link Here

(-)sfx2/sdi/sfx.sdi (-28 / +1 lines)
6369		6369
6370	//--------------------------------------------------------------------------	6370	//--------------------------------------------------------------------------
6371	SfxBoolItem SendMail SID_MAIL_SENDDOC	6371	SfxBoolItem SendMail SID_MAIL_SENDDOC
6372	(SfxStringItem Recipient SID_MAIL_RECIPIENT,SfxStringItem Subject SID_MAIL_SUBJECT,SfxStringItem MailText SID_MAIL_TEXT,SfxUInt16Item Priority SID_MAIL_PRIORITY,SfxBoolItem AttachedDoc SID_MAIL_ATTACH,SfxStringItem AttachFiles SID_MAIL_ATTACH_FILE)	6372	(SfxStringItem Recipient SID_MAIL_RECIPIENT,SfxStringItem Subject SID_MAIL_SUBJECT,SfxStringItem MailText SID_MAIL_TEXT,SfxUInt16Item Priority SID_MAIL_PRIORITY,SfxBoolItem AttachedDoc SID_MAIL_ATTACH,SfxStringItem AttachFiles SID_MAIL_ATTACH_FILE, SfxStringItem FilterName SID_FILTER_NAME)
6373	[
6374	/* flags: */
6375	AutoUpdate = FALSE,
6376	Cachable = Cachable,
6377	FastCall = FALSE,
6378	HasCoreId = FALSE,
6379	HasDialog = TRUE,
6380	ReadOnlyDoc = TRUE,
6381	Toggle = FALSE,
6382	Container = TRUE,
6383	RecordAbsolute = FALSE,
6384	RecordPerSet;
6385	Asynchron;
6386
6387	/* status: */
6388	SlotType = SfxStringItem
6389
6390	/* config: */
6391	AccelConfig = TRUE,
6392	MenuConfig = TRUE,
6393	StatusBarConfig = FALSE,
6394	ToolBoxConfig = TRUE,
6395	GroupId = GID_DOCUMENT;
6396	]
6397
6398	SfxBoolItem SendMailDocAsPDF SID_MAIL_SENDDOCASPDF
6399	(SfxStringItem Recipient SID_MAIL_RECIPIENT,SfxStringItem Subject SID_MAIL_SUBJECT,SfxStringItem MailText SID_MAIL_TEXT,SfxUInt16Item Priority SID_MAIL_PRIORITY,SfxBoolItem AttachedDoc SID_MAIL_ATTACH,SfxStringItem AttachFiles SID_MAIL_ATTACH_FILE)
6400	[	6373	[
6401	/* flags: */	6374	/* flags: */
6402	AutoUpdate = FALSE,	6375	AutoUpdate = FALSE,

Lines 555-568 Link Here

(-)svx/inc/globlmn_tmpl.hrc (-8 lines)
555	Text [ en-US ] = "Document as ~E-mail..." ; \	555	Text [ en-US ] = "Document as ~E-mail..." ; \
556	Text [ x-comment ] = " "; \	556	Text [ x-comment ] = " "; \
557		557
558	#define ITEM_FILE_MAIL_SENDDOCASPDF \
559	Identifier = SID_MAIL_SENDDOCASPDF ; \
560	Command = ".uno:SendMailDocAsPDF" ; \
561	HelpID = SID_MAIL_SENDDOCASPDF ; \
562	Text [ de ] = "Dokument als PD~F-Anhang..." ; \
563	Text [ en-US ] = "Document as P~DF Attachment..." ; \
564
565
566	#define ITEM_FILE_QUITAPP \	558	#define ITEM_FILE_QUITAPP \
567	Identifier = SID_QUITAPP ; \	559	Identifier = SID_QUITAPP ; \
568	Command = ".uno:Quit" ; \	560	Command = ".uno:Quit" ; \