User: timar Date: 06/03/01 06:42:05 Modified: /hu/src/2.0.2/Patches/ i46895-ms-interoperability-email-attachment-as-doc-xls-ppt-m99.diff
Log: updated patch File Changes: Directory: /hu/src/2.0.2/Patches/ ================================= File [changed]: i46895-ms-interoperability-email-attachment-as-doc-xls-ppt-m99.diff Url: http://hu.openoffice.org/source/browse/hu/src/2.0.2/Patches/i46895-ms-interoperability-email-attachment-as-doc-xls-ppt-m99.diff?r1=1.1&r2=1.2 Delta lines: +555 -367 ----------------------- --- i46895-ms-interoperability-email-attachment-as-doc-xls-ppt-m99.diff 28 Jan 2006 12:53:02 -0000 1.1 +++ i46895-ms-interoperability-email-attachment-as-doc-xls-ppt-m99.diff 1 Mar 2006 14:42:03 -0000 1.2 @@ -1,16 +1,214 @@ ---- sfx2/source/view/viewsh.cxx.bakj 2005-02-17 16:51:32.000000000 +0530 -+++ sfx2/source/view/viewsh.cxx 2005-02-18 16:07:53.935695125 +0530 -@@ -188,6 +188,9 @@ +Index: sfx2/source/inc/mailmodel.hxx +=================================================================== +RCS file: framework/sfx2/source/inc/mailmodel.hxx,v + +diff -u -p -r1.4 mailmodel.hxx +--- sfx2/source/inc/mailmodel.hxx 7 Sep 2005 19:06:14 -0000 1.4 ++++ sfx2/source/inc/mailmodel.hxx 21 Feb 2006 12:29:11 -0000 +@@ -87,8 +87,7 @@ private: - case SID_MAIL_SENDDOCASPDF: + void ClearList( AddressList_Impl* pList ); + void MakeValueList( AddressList_Impl* pList, String& rValueList ); +- SaveResult SaveDocument( String& rFileName, String& rType ); +- SaveResult SaveDocAsPDF( String& rFileName, String& rType ); ++ SaveResult SaveDocumentAsFormat( String& rFileName, String& rType, const String& rFilter ); + + DECL_LINK( DoneHdl, void* ); + +@@ -108,7 +107,7 @@ public: + void SetSubject( const String& rSubject ) { maSubject = rSubject; } + void SetPriority( MailPriority ePrio ) { mePriority = ePrio; } + +- SendMailResult Send( MailDocType ); ++ SendMailResult Send( const String& rFilter ); + }; + + BOOL CreateFromAddress_Impl( String& rFrom ); +Index: sfx2/source/dialog/mailmodel.cxx +=================================================================== +RCS file: framework/sfx2/source/dialog/mailmodel.cxx,v + +diff -u -p -r1.37 mailmodel.cxx +--- sfx2/source/dialog/mailmodel.cxx 7 Sep 2005 18:23:34 -0000 1.37 ++++ sfx2/source/dialog/mailmodel.cxx 21 Feb 2006 12:29:26 -0000 +@@ -243,9 +243,11 @@ void SfxMailModel_Impl::MakeValueList( A + } + } + +-SfxMailModel_Impl::SaveResult SfxMailModel_Impl::SaveDocument( String& rFileName, String& rType ) ++SfxMailModel_Impl::SaveResult SfxMailModel_Impl::SaveDocumentAsFormat( String& rFileName, String& rType, const String& rFilter ) + { + SaveResult eRet = SAVE_CANCELLED; ++ bool bSaveAs = ( rFilter.Len() > 0 ); ++ + SfxViewFrame* pTopViewFrm = mpBindings->GetDispatcher_Impl()->GetFrame()->GetTopViewFrame(); + SfxObjectShellRef xDocShell = pTopViewFrm->GetObjectShell(); + +@@ -256,7 +258,15 @@ SfxMailModel_Impl::SaveResult SfxMailMod + BOOL bModified = xDocShell->IsModified(); + + // detect filter +- const SfxFilter* pFilter = xDocShell->GetMedium()->GetFilter(); ++ String sFactoryShortName = String::CreateFromAscii(xDocShell->GetFactory().GetShortName()); ++ String sFactoryLongName = SfxObjectShell::GetServiceNameFromFactory(sFactoryShortName); ++ SfxFilterMatcher aMatcher( sFactoryShortName ); ++ ++ const SfxFilter* pFilter = NULL; ++ if ( bSaveAs ) ++ pFilter = aMatcher.GetFilter4FilterName( rFilter ); ++ else ++ pFilter = xDocShell->GetMedium()->GetFilter(); + sal_Bool bHasFilter = pFilter ? sal_True : sal_False; + if ( !pFilter ) + { +@@ -280,6 +290,8 @@ SfxMailModel_Impl::SaveResult SfxMailMod + String aName; + if ( aFileObj.hasExtension() ) + { +- pExt = new String( String::CreateFromAscii( "." ) + (OUString) aFileObj.getExtension() ); ++ if ( !bSaveAs ) // Only use extension in NOT save in another ++ // Format ++ pExt = new String( String::CreateFromAscii( "." ) + (OUString) aFileObj.getExtension() ); + aFileObj.removeExtension(); + aLeadingStr = aFileObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); +@@ -305,7 +313,7 @@ SfxMailModel_Impl::SaveResult SfxMailMod + + rFileName = aTempFile.GetURL(); + +- if ( bModified || !xDocShell->HasName() ) ++ if ( bModified || !xDocShell->HasName() || bSaveAs ) + { + // prepare for mail export + SfxDispatcher* pDisp = pTopViewFrm->GetDispatcher(); +@@ -488,92 +496,6 @@ const SfxFilter* impl_getPDFFilterForDoc + return 0; + } + +-SfxMailModel_Impl::SaveResult SfxMailModel_Impl::SaveDocAsPDF( String& rFileName, String& rType ) +-{ +- SaveResult eRet = SAVE_CANCELLED; +- SfxViewFrame* pTopViewFrm = mpBindings->GetDispatcher_Impl()->GetFrame()->GetTopViewFrame(); +- SfxObjectShellRef xDocShell = pTopViewFrm->GetObjectShell(); +- +- // save the document +- if ( xDocShell.Is() && xDocShell->GetMedium() ) +- { +- // save old settings +- BOOL bModified = xDocShell->IsModified(); +- // prepare for mail export +- SfxDispatcher* pDisp = pTopViewFrm->GetDispatcher(); +- pDisp->Execute( SID_MAIL_PREPAREEXPORT, SFX_CALLMODE_SYNCHRON ); +- +- // Get PDF Filter from document +- String sFactoryShortName = String::CreateFromAscii(xDocShell->GetFactory().GetShortName()); +- String sFactoryLongName = SfxObjectShell::GetServiceNameFromFactory(sFactoryShortName); +- SfxFilterMatcher aMatcher( sFactoryShortName ); +- String aPDFExtension = String::CreateFromAscii( "pdf" ); // Extension without dot! +- +- const SfxFilter* pFilter = impl_getPDFFilterForDoc( sFactoryLongName, aMatcher); +- sal_Bool bHasFilter = pFilter ? sal_True : sal_False; +- +- // create temp file name with leading chars and extension +- sal_Bool bHasName = xDocShell->HasName(); +- String aLeadingStr; +- String* pExt = NULL; +- +- if ( !bHasName ) +- aLeadingStr = String( DEFINE_CONST_UNICODE("noname") ); +- else +- { +- INetURLObject aFileObj = xDocShell->GetMedium()->GetURLObject(); +- String aName; +- if ( aFileObj.hasExtension() ) +- { +- pExt = new String( String::CreateFromAscii( "." ) + (OUString)aPDFExtension ); +- aFileObj.removeExtension(); +- aLeadingStr = aFileObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); +- aLeadingStr += String::CreateFromAscii( "_" ); +- } +- else +- { +- aLeadingStr = aFileObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); +- aLeadingStr += String::CreateFromAscii( "_" ); +- } +- } +- +- if ( pFilter && !pExt ) +- { +- pExt = new String( pFilter->GetWildcard()().GetToken(0) ); +- // erase the '*' from the extension (e.g. "*.sdw") +- pExt->Erase( 0, 1 ); +- } +- +- ::utl::TempFile aTempFile( aLeadingStr, pExt ); +- delete pExt; +- +- rFileName = aTempFile.GetURL(); +- +- // save document to temp file +- SfxStringItem aFileName( SID_FILE_NAME, rFileName ); +- const SfxBoolItem *pRet = (const SfxBoolItem*)pDisp->Execute( SID_EXPORTDOCASPDF, SFX_CALLMODE_SYNCHRON, &aFileName, 0L ); +- BOOL bRet = pRet ? pRet->GetValue() : FALSE; +- eRet = bRet ? SAVE_SUCCESSFULL : SAVE_CANCELLED; +- +- if ( pFilter ) +- { +- // detect content type and expand with the file name +- rType = pFilter->GetMimeType(); +- rType += DEFINE_CONST_UNICODE("; name =\""); +- INetURLObject aFileObj = xDocShell->GetMedium()->GetURLObject(); +- rType += String(aFileObj.getName( INetURLObject::LAST_SEGMENT, +- true, INetURLObject::DECODE_WITH_CHARSET )); +- rType += '\"'; +- } +- +- // restore old settings +- if ( !bModified && xDocShell->IsEnableSetModified() ) +- xDocShell->SetModified( FALSE ); +- } +- +- return eRet; +-} +- + IMPL_LINK_INLINE_START( SfxMailModel_Impl, DoneHdl, void*, EMPTYARG ) + { + mbLoadDone = sal_True; +@@ -644,17 +566,14 @@ void SfxMailModel_Impl::AddAddress( cons + } + } + +-SfxMailModel_Impl::SendMailResult SfxMailModel_Impl::Send( MailDocType eMailDocType ) ++SfxMailModel_Impl::SendMailResult SfxMailModel_Impl::Send( const String& rFilterName ) + { + SaveResult eSaveResult; + SendMailResult eResult = SEND_MAIL_ERROR; + String aFileName, aContentType; + + sal_Bool bSuccessfull = sal_False; +- if ( eMailDocType == TYPE_SELF ) +- eSaveResult = SaveDocument( aFileName, aContentType ); +- else +- eSaveResult = SaveDocAsPDF( aFileName, aContentType ); ++ eSaveResult = SaveDocumentAsFormat( aFileName, aContentType, rFilterName ); + + if ( eSaveResult == SAVE_SUCCESSFULL ) + { +Index: sfx2/source/view/viewsh.cxx +=================================================================== +RCS file: framework/sfx2/source/view/viewsh.cxx,v + +diff -u -p -r1.58 viewsh.cxx +--- sfx2/source/view/viewsh.cxx 7 Feb 2006 10:29:45 -0000 1.58 ++++ sfx2/source/view/viewsh.cxx 21 Feb 2006 12:31:04 -0000 +@@ -160,7 +160,6 @@ void SfxViewShell::ExecMisc_Impl( SfxReq + + // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +- case SID_MAIL_SENDDOCASPDF: case SID_MAIL_SENDDOC: -+ case SID_MAIL_SENDDOCASMSDOC: -+ case SID_MAIL_SENDDOCASMSPPT: -+ case SID_MAIL_SENDDOCASMSEXCEL: { SfxObjectShell* pDoc = GetObjectShell(); - if ( pDoc && pDoc->QueryHiddenInformation( -@@ -218,10 +221,18 @@ +@@ -192,10 +191,12 @@ void SfxViewShell::ExecMisc_Impl( SfxReq } SfxMailModel_Impl::SendMailResult eResult = SfxMailModel_Impl::SEND_MAIL_ERROR; @@ -18,400 +216,390 @@ - eResult = aModel.Send( SfxMailModel_Impl::TYPE_ASPDF ); - else - eResult = aModel.Send( SfxMailModel_Impl::TYPE_SELF ); -+ switch (nId) { -+ case SID_MAIL_SENDDOCASPDF: -+ eResult = aModel.Send( SfxMailModel_Impl::TYPE_ASPDF );break; -+ case SID_MAIL_SENDDOCASMSDOC: -+ eResult = aModel.Send( SfxMailModel_Impl::TYPE_ASMSDOC );break; -+ case SID_MAIL_SENDDOCASMSEXCEL: -+ eResult = aModel.Send( SfxMailModel_Impl::TYPE_ASMSEXCEL );break; -+ case SID_MAIL_SENDDOCASMSPPT: -+ eResult = aModel.Send( SfxMailModel_Impl::TYPE_ASMSPOWERPOINT );break; -+ default: -+ eResult = aModel.Send( SfxMailModel_Impl::TYPE_SELF ); -+ } ++ 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 ) { -@@ -302,6 +312,15 @@ +@@ -314,7 +316,6 @@ void SfxViewShell::GetState_Impl( SfxIte } - //-------------------------------------------------------------------- -+static const BOOL -+filterExsists(const char * aExtension, SfxObjectShellRef xDocShell) -+{ -+ if ( ! xDocShell.Is() ) -+ return false; -+ String aPDFExtension = String::CreateFromAscii( aExtension ); -+ return (SfxFilterMatcher( String::CreateFromAscii( xDocShell->GetFactory().GetShortName()) ).GetFilter4Extension( aPDFExtension, SFX_FILTER_EXPORT )) ? true : false ; -+ -+} - - void SfxViewShell::GetState_Impl( SfxItemSet &rSet ) - { -@@ -342,6 +362,9 @@ // Mail-Funktionen - case SID_MAIL_SENDDOCASPDF: +- case SID_MAIL_SENDDOCASPDF: case SID_MAIL_SENDDOC: -+ case SID_MAIL_SENDDOCASMSDOC: -+ case SID_MAIL_SENDDOCASMSPPT: -+ case SID_MAIL_SENDDOCASMSEXCEL: { BOOL bEnable = !GetViewFrame()->HasChildWindow( SID_MAIL_CHILDWIN ); - if ( !bEnable ) - ---- ./sfx2/sdi/viwslots.sdi.bakj 2005-02-17 16:48:16.000000000 +0530 -+++ ./sfx2/sdi/viwslots.sdi 2005-02-18 11:12:45.000000000 +0530 -@@ -22,6 +22,22 @@ - ExecMethod = ExecMisc_Impl ; - StateMethod = GetState_Impl ; - ] -+ SID_MAIL_SENDDOCASMSDOC // ole(no) api(todo) -+ [ -+ ExecMethod = ExecMisc_Impl ; -+ StateMethod = GetState_Impl ; -+ ] -+ SID_MAIL_SENDDOCASMSPPT // ole(no) api(todo) -+ [ -+ ExecMethod = ExecMisc_Impl ; -+ StateMethod = GetState_Impl ; -+ ] -+ SID_MAIL_SENDDOCASMSEXCEL // ole(no) api(todo) -+ [ -+ ExecMethod = ExecMisc_Impl ; -+ StateMethod = GetState_Impl ; -+ ] -+ - //--------------------------------------------------------------------- - SID_PRINTDOC // ole(no) api(play/rec) - [ ---- ./sfx2/inc/sfxsids.hrc.bakj 2005-02-17 16:56:30.000000000 +0530 -+++ ./sfx2/inc/sfxsids.hrc 2005-02-18 12:08:21.000000000 +0530 -@@ -148,7 +148,9 @@ - #define SID_MAIL_NOTIFY (SID_SFX_START + 330) - #define SID_MAIL_SENDDOC (SID_SFX_START + 331) - #define SID_MAIL_SENDDOCASPDF (SID_SFX_START + 1672) -- -+#define SID_MAIL_SENDDOCASMSPPT (SID_SFX_START + 1706) -+#define SID_MAIL_SENDDOCASMSEXCEL (SID_SFX_START + 1707) -+#define SID_MAIL_SENDDOCASMSDOC (SID_SFX_START + 1708) - - #define SID_MAIL_RECIPIENT (SID_SFX_START + 334) - #define SID_MAIL_TEXT (SID_SFX_START + 335) -@@ -566,7 +568,7 @@ - #define SID_MACRO_SIGNATURE (SID_SFX_START + 1704) - #define SID_ATTR_WARNALIENFORMAT (SID_SFX_START + 1705) - --#define SID_SFX_free_START (SID_SFX_START + 1706) -+#define SID_SFX_free_START (SID_SFX_START + 1709) - #define SID_SFX_free_END (SID_SFX_START + 3999) - - #define SID_OPEN_NEW_VIEW (SID_SFX_START + 520) ---- ./sfx2/sdi/sfx.sdi.bakj 2005-02-17 17:01:38.000000000 +0530 -+++ ./sfx2/sdi/sfx.sdi 2005-02-18 12:01:13.000000000 +0530 -@@ -6369,6 +6369,86 @@ - GroupId = GID_DOCUMENT; - ] - -+SfxBoolItem SendMailDocAsMSDoc SID_MAIL_SENDDOCASMSDOC -+(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, -+ Cachable = Cachable, -+ FastCall = FALSE, -+ HasCoreId = FALSE, -+ HasDialog = TRUE, -+ ReadOnlyDoc = TRUE, -+ Toggle = FALSE, -+ Container = FALSE, -+ RecordAbsolute = FALSE, -+ RecordPerSet; -+ Asynchron; -+ -+ /* status: */ -+ SlotType = SfxStringItem -+ -+ /* config: */ -+ AccelConfig = TRUE, -+ MenuConfig = TRUE, -+ StatusBarConfig = FALSE, -+ ToolBoxConfig = TRUE, -+ GroupId = GID_DOCUMENT; -+] -+ -+SfxBoolItem SendMailDocAsMSExcel SID_MAIL_SENDDOCASMSEXCEL -+(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, -+ Cachable = Cachable, -+ FastCall = FALSE, -+ HasCoreId = FALSE, -+ HasDialog = TRUE, -+ ReadOnlyDoc = TRUE, -+ Toggle = FALSE, -+ Container = FALSE, -+ RecordAbsolute = FALSE, -+ RecordPerSet; -+ Asynchron; -+ -+ /* status: */ -+ SlotType = SfxStringItem -+ -+ /* config: */ -+ AccelConfig = TRUE, -+ MenuConfig = TRUE, -+ StatusBarConfig = FALSE, -+ ToolBoxConfig = TRUE, -+ GroupId = GID_DOCUMENT; -+] -+SfxBoolItem SendMailDocAsMSPowerPoint SID_MAIL_SENDDOCASMSPPT -+(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, -+ Cachable = Cachable, -+ FastCall = FALSE, -+ HasCoreId = FALSE, -+ HasDialog = TRUE, -+ ReadOnlyDoc = TRUE, -+ Toggle = FALSE, -+ Container = FALSE, -+ 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) - [ ---- sfx2/source/inc/mailmodel.hxx.bakj 2005-02-18 11:49:05.000000000 +0530 -+++ sfx2/source/inc/mailmodel.hxx 2005-02-18 12:24:36.000000000 +0530 -@@ -90,6 +90,9 @@ - enum MailDocType - { - TYPE_SELF, -+ TYPE_ASMSDOC, -+ TYPE_ASMSEXCEL, -+ TYPE_ASMSPOWERPOINT, - TYPE_ASPDF - }; - -@@ -114,7 +117,7 @@ - void ClearList( AddressList_Impl* pList ); - void MakeValueList( AddressList_Impl* pList, String& rValueList ); - SaveResult SaveDocument( String& rFileName, String& rType ); -- SaveResult SaveDocAsPDF( String& rFileName, String& rType ); -+ SaveResult SaveDocAs( String& rFileName, String& rType,MailDocType mailDocType ); - - DECL_LINK( DoneHdl, void* ); - ---- sc/uiconfig/scalc/menubar/menubar.xml.bakj 2005-02-18 10:15:10.000000000 +0530 -+++ sc/uiconfig/scalc/menubar/menubar.xml 2005-02-18 16:41:41.175086541 +0530 -@@ -22,6 +22,7 @@ +Index: sc/uiconfig/scalc/menubar/menubar.xml +=================================================================== +RCS file: sc/sc/uiconfig/scalc/menubar/menubar.xml,v + +diff -u -p -r1.21 menubar.xml +--- sc/uiconfig/scalc/menubar/menubar.xml 16 Nov 2005 10:15:26 -0000 1.21 ++++ sc/uiconfig/scalc/menubar/menubar.xml 21 Feb 2006 12:34:02 -0000 +@@ -21,7 +21,8 @@ + <menu:menu menu:id=".uno:SendTo" menu:label="" > <menu:menupopup> <menu:menuitem menu:id=".uno:SendMail" menu:helpid="5331" menu:label="" /> - <menu:menuitem menu:id=".uno:SendMailDocAsPDF" menu:helpid="6672" menu:label="" /> -+ <menu:menuitem menu:id=".uno:SendMailDocAsMSExcel" menu:helpid="6707" menu:label="" /> +- <menu:menuitem menu:id=".uno:SendMailDocAsPDF" menu:helpid="6672" menu:label="" /> ++ <menu:menuitem menu:id=".uno:SendMail?FilterName:string=calc_pdf_Export" menu:helpid="6672" menu:label="" /> ++ <menu:menuitem menu:id=".uno:SendMail?FilterName:string=MS Excel 95" menu:helpid="6707" menu:label="" /> </menu:menupopup> </menu:menu> <menu:menuseparator/> ---- sw/uiconfig/swriter/menubar/menubar.xml.bakj 2005-02-17 16:38:52.000000000 +0530 -+++ sw/uiconfig/swriter/menubar/menubar.xml 2005-02-18 16:43:07.919222464 +0530 -@@ -22,6 +22,7 @@ +Index: sw/uiconfig/sglobal/menubar/menubar.xml +=================================================================== +RCS file: sw/sw/uiconfig/sglobal/menubar/menubar.xml,v + +diff -u -p -r1.19 menubar.xml +--- sw/uiconfig/sglobal/menubar/menubar.xml 16 Nov 2005 09:54:22 -0000 1.19 ++++ sw/uiconfig/sglobal/menubar/menubar.xml 21 Feb 2006 12:34:24 -0000 +@@ -21,7 +21,7 @@ + <menu:menu menu:id=".uno:SendToMenu" menu:label="" > <menu:menupopup> <menu:menuitem menu:id=".uno:SendMail" menu:helpid="5331" menu:label="" /> - <menu:menuitem menu:id=".uno:SendMailDocAsPDF" menu:helpid="6672" menu:label="" /> -+ <menu:menuitem menu:id=".uno:SendMailDocAsMSDoc" menu:helpid="6708" menu:label="" /> +- <menu:menuitem menu:id=".uno:SendMailDocAsPDF" menu:helpid="6672" menu:label="" /> ++ <menu:menuitem menu:id=".uno:SendMail?FilterName:string=writer_globaldocument_pdf_Export" menu:helpid="6672" menu:label="" /> <menu:menuseparator/> <menu:menuitem menu:id=".uno:NewGlobalDoc" menu:helpid="20004" menu:label="" /> <menu:menuitem menu:id=".uno:NewHtmlDoc" menu:helpid="20040" menu:label="" /> ---- sd/uiconfig/simpress/menubar/menubar.xml.bakj 2005-02-18 16:44:27.103479847 +0530 -+++ sd/uiconfig/simpress/menubar/menubar.xml 2005-02-18 16:47:02.584344135 +0530 -@@ -22,6 +22,7 @@ +Index: sw/uiconfig/sweb/menubar/menubar.xml +=================================================================== +RCS file: sw/sw/uiconfig/sweb/menubar/menubar.xml,v + +diff -u -p -r1.18 menubar.xml +--- sw/uiconfig/sweb/menubar/menubar.xml 16 Nov 2005 09:55:48 -0000 1.18 ++++ sw/uiconfig/sweb/menubar/menubar.xml 21 Feb 2006 12:34:39 -0000 +@@ -18,7 +18,7 @@ + <menu:menu menu:id=".uno:SendToMenu" menu:label="" > <menu:menupopup> <menu:menuitem menu:id=".uno:SendMail" menu:helpid="5331" menu:label="" /> - <menu:menuitem menu:id=".uno:SendMailDocAsPDF" menu:helpid="6672" menu:label="" /> -+ <menu:menuitem menu:id=".uno:SendMailDocAsMSPowerPoint" menu:helpid="6706" menu:label="" /> +- <menu:menuitem menu:id=".uno:SendMailDocAsPDF" menu:helpid="6672" menu:label="" /> ++ <menu:menuitem menu:id=".uno:SendMail?FilterName:string=writer_web_pdf_Export" menu:helpid="6672" menu:label="" /> </menu:menupopup> </menu:menu> <menu:menuseparator/> ---- officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu.bakj 2005-02-18 16:55:18.659537625 +0530 -+++ officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 2005-02-18 17:00:20.837598320 +0530 -@@ -809,6 +809,12 @@ - <value>1</value> +Index: sw/uiconfig/swriter/menubar/menubar.xml +=================================================================== +RCS file: sw/sw/uiconfig/swriter/menubar/menubar.xml,v + +diff -u -p -r1.20 menubar.xml +--- sw/uiconfig/swriter/menubar/menubar.xml 16 Nov 2005 09:57:09 -0000 1.20 ++++ sw/uiconfig/swriter/menubar/menubar.xml 21 Feb 2006 12:34:45 -0000 +@@ -21,7 +21,9 @@ + <menu:menu menu:id=".uno:SendToMenu" menu:label="" > + <menu:menupopup> + <menu:menuitem menu:id=".uno:SendMail" menu:helpid="5331" menu:label="" /> +- <menu:menuitem menu:id=".uno:SendMailDocAsPDF" menu:helpid="6672" menu:label="" /> ++ <menu:menuitem menu:id=".uno:SendMail?FilterName:string=writer_pdf_Export" menu:helpid="6672" menu:label="" /> ++ <menu:menuitem menu:id=".uno:SendMail?FilterName:string=MS WinWord 6.0" menu:helpid="6707" menu:label="" /> ++ + <menu:menuseparator/> + <menu:menuitem menu:id=".uno:NewGlobalDoc" menu:helpid="20004" menu:label="" /> + <menu:menuitem menu:id=".uno:NewHtmlDoc" menu:helpid="20040" menu:label="" /> +Index: sd/uiconfig/sdraw/menubar/menubar.xml +=================================================================== +RCS file: graphics/sd/uiconfig/sdraw/menubar/menubar.xml,v + +diff -u -p -r1.22 menubar.xml +--- sd/uiconfig/sdraw/menubar/menubar.xml 16 Nov 2005 09:23:48 -0000 1.22 ++++ sd/uiconfig/sdraw/menubar/menubar.xml 21 Feb 2006 12:35:10 -0000 +@@ -21,7 +21,7 @@ + <menu:menu menu:id=".uno:SendMenu" menu:label="" > + <menu:menupopup> + <menu:menuitem menu:id=".uno:SendMail" menu:helpid="5331" menu:label="" /> +- <menu:menuitem menu:id=".uno:SendMailDocAsPDF" menu:helpid="6672" menu:label="" /> ++ <menu:menuitem menu:id=".uno:SendMail?Filtername:string=draw_pdf_Export" menu:helpid="6672" menu:label="" /> + </menu:menupopup> + </menu:menu> + <menu:menuseparator/> +Index: sd/uiconfig/simpress/menubar/menubar.xml +=================================================================== +RCS file: graphics/sd/uiconfig/simpress/menubar/menubar.xml,v + +diff -u -p -r1.24 menubar.xml +--- sd/uiconfig/simpress/menubar/menubar.xml 16 Nov 2005 09:25:04 -0000 1.24 ++++ sd/uiconfig/simpress/menubar/menubar.xml 21 Feb 2006 12:35:18 -0000 +@@ -21,7 +21,8 @@ + <menu:menu menu:id=".uno:SendMenu" menu:label="" > + <menu:menupopup> + <menu:menuitem menu:id=".uno:SendMail" menu:helpid="5331" menu:label="" /> +- <menu:menuitem menu:id=".uno:SendMailDocAsPDF" menu:helpid="6672" menu:label="" /> ++ <menu:menuitem menu:id=".uno:SendMail?FilterName:string=impress_pdf_Export" menu:helpid="6672" menu:label="" /> ++ <menu:menuitem menu:id=".uno:SendMail?FilterName:string=MS PowerPoint 97" menu:helpid="6706" menu:label="" /> + </menu:menupopup> + </menu:menu> + <menu:menuseparator/> +Index: starmath/uiconfig/smath/menubar/menubar.xml +=================================================================== +RCS file: sw/starmath/uiconfig/smath/menubar/menubar.xml,v + +diff -u -p -r1.11 menubar.xml +--- starmath/uiconfig/smath/menubar/menubar.xml 9 Sep 2004 16:32:46 -0000 1.11 ++++ starmath/uiconfig/smath/menubar/menubar.xml 21 Feb 2006 12:35:47 -0000 +@@ -20,7 +20,7 @@ + <menu:menu menu:id=".uno:SendToMenu" menu:label="" > + <menu:menupopup> + <menu:menuitem menu:id=".uno:SendMail" menu:helpid="5331" menu:label="" /> +- <menu:menuitem menu:id=".uno:SendMailDocAsPDF" menu:helpid="6672" menu:label="" /> ++ <menu:menuitem menu:id=".uno:SendMail?FilterName:string=math_pdf_Export" menu:helpid="6672" menu:label="" /> + </menu:menupopup> + </menu:menu> + <menu:menuseparator/> +Index: officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu +=================================================================== +RCS file: util/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu,v + +diff -u -p -r1.14 CalcCommands.xcu +--- officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 15 Mar 2005 12:42:05 -0000 1.14 ++++ officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 21 Feb 2006 12:37:57 -0000 +@@ -1498,6 +1503,12 @@ + <value xml:lang="en-US">Sen~d</value> </prop> </node> -+ <node oor:name=".uno:SendMailDocAsMSDoc" oor:op="replace"> ++ <node oor:name=".uno:SendMail?FilterName:string=MS Excel 95" oor:op="replace"> + <prop oor:name="Label" oor:type="xs:string"> -+ <value xml:lang="de">Dokument als MS-~Doc-Anhang...</value> -+ <value xml:lang="en-US">Document as MS-~Doc Attachment...</value> ++ <value xml:lang="de">Dokument als MS-E~xcel-Anhang...</value> ++ <value xml:lang="en-US">Document as MS-E~xcel Attachment...</value> + </prop> + </node> - <node oor:name=".uno:SendOutlineToClipboard" oor:op="replace"> + <node oor:name=".uno:ProtectMenu" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="de">Gliederung zur Zwis~chenablage</value> ---- officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu.bakj 2005-02-18 16:58:17.271973105 +0530 -+++ officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu 2005-02-18 16:59:43.010223193 +0530 -@@ -1731,6 +1731,12 @@ - <value xml:lang="en-US">Sen~d</value> + <value xml:lang="de">Dokument sch~ützen</value> +Index: officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu +=================================================================== +RCS file: util/officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu,v + +diff -u -p -r1.16 DrawImpressCommands.xcu +--- officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu 21 Feb 2005 12:09:26 -0000 1.16 ++++ officecfg/registry/data/org/openoffice/Office/UI/DrawImpressCommands.xcu 21 Feb 2006 12:37:57 -0000 +@@ -1737,6 +1737,12 @@ + <value xml:lang="en-US">Styl~es</value> </prop> </node> -+ <node oor:name=".uno:SendMailDocAsMSPowerPoint" oor:op="replace"> ++ <node oor:name=".uno:SendMail?FilterName:string=MS PowerPoint 97" oor:op="replace"> + <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="de">Dokument als MS-~PPT-Anhang...</value> + <value xml:lang="en-US">Document as MS-~PPT Attachment...</value> + </prop> + </node> - <node oor:name=".uno:TemplatesMenu" oor:op="replace"> + <node oor:name=".uno:SnapLinesMenu" oor:op="replace"> <prop oor:name="Label" oor:type="xs:string"> - <value xml:lang="de">~Vorlagen</value> ---- svx/inc/globlmn_tmpl.hrc.bakj 2005-02-18 18:05:06.196343865 +0530 -+++ svx/inc/globlmn_tmpl.hrc 2005-02-18 18:07:51.216700899 +0530 -@@ -588,6 +588,27 @@ - Text [ en-US ] = "Document as ~E-mail..." ; \ - Text [ x-comment ] = " "; \ - -+#define ITEM_FILE_MAIL_SENDDOCASMSEXCEL \ -+ Identifier = SID_MAIL_SENDDOCASMSEXCEL ; \ -+ Command = ".uno:SendMailDocAsMSExcel" ; \ -+ HelpID = SID_MAIL_SENDDOCASMSEXCEL ; \ -+ Text [ de ] = "Dokument als MS-E~xcel-Anhang..." ; \ -+ Text [ en-US ] = "Document as MS-E~xcel Attachment..." ; \ -+ -+#define ITEM_FILE_MAIL_SENDDOCASMSDOC \ -+ Identifier = SID_MAIL_SENDDOCASMSDOC ; \ -+ Command = ".uno:SendMailDocAsMSDoc" ; \ -+ HelpID = SID_MAIL_SENDDOCASMSDOC ; \ -+ Text [ de ] = "Dokument als MS-~Doc-Anhang..." ; \ -+ Text [ en-US ] = "Document as MS-~Doc Attachment..." ; \ -+ -+#define ITEM_FILE_MAIL_SENDDOCASMSPPT \ -+ Identifier = SID_MAIL_SENDDOCASMSPPT ; \ -+ Command = ".uno:SendMailDocAsMSPowerPoint" ; \ -+ HelpID = SID_MAIL_SENDDOCASMSPPT ; \ -+ Text [ de ] = "Dokument als MS-~PPT-Anhang..." ; \ -+ Text [ en-US ] = "Document as MS-~PPT Attachment..." ; \ -+ - #define ITEM_FILE_MAIL_SENDDOCASPDF \ - Identifier = SID_MAIL_SENDDOCASPDF ; \ - Command = ".uno:SendMailDocAsPDF" ; \ - - ---- sfx2/source/dialog/mailmodel.cxx.bakj 2005-05-10 13:33:35.000000000 +0530 -+++ sfx2/source/dialog/mailmodel.cxx 2005-05-10 13:52:59.000000000 +0530 -@@ -509,7 +509,7 @@ - return 0; - } - --SfxMailModel_Impl::SaveResult SfxMailModel_Impl::SaveDocAsPDF( String& rFileName, String& rType ) -+SfxMailModel_Impl::SaveResult SfxMailModel_Impl::SaveDocAs( String& rFileName, String& rType,MailDocType mailDocType ) - { - SaveResult eRet = SAVE_CANCELLED; - SfxViewFrame* pTopViewFrm = mpBindings->GetDispatcher_Impl()->GetFrame()->GetTopViewFrame(); -@@ -528,9 +528,16 @@ - String sFactoryShortName = String::CreateFromAscii(xDocShell->GetFactory().GetShortName()); - String sFactoryLongName = SfxObjectShell::GetServiceNameFromFactory(sFactoryShortName); - SfxFilterMatcher aMatcher( sFactoryShortName ); -- String aPDFExtension = String::CreateFromAscii( "pdf" ); // Extension without dot! -- -- const SfxFilter* pFilter = impl_getPDFFilterForDoc( sFactoryLongName, aMatcher); -+ String aExtension; -+ switch (mailDocType) -+ { -+ case TYPE_ASPDF : aExtension = String::CreateFromAscii( "pdf" );break; -+ case TYPE_ASMSDOC : aExtension = String::CreateFromAscii( "doc" );break; -+ case TYPE_ASMSEXCEL : aExtension = String::CreateFromAscii( "xls" );break; -+ case TYPE_ASMSPOWERPOINT : aExtension = String::CreateFromAscii( "ppt" );break; -+ } -+ -+ const SfxFilter* pFilter = aMatcher.GetFilter4Extension( aExtension, SFX_FILTER_EXPORT ); - sal_Bool bHasFilter = pFilter ? sal_True : sal_False; - - // create temp file name with leading chars and extension -@@ -546,7 +553,7 @@ - String aName; - if ( aFileObj.hasExtension() ) - { -- pExt = new String( String::CreateFromAscii( "." ) + (OUString)aPDFExtension ); -+ pExt = new String( String::CreateFromAscii( "." ) + (OUString)aExtension ); - aFileObj.removeExtension(); - aLeadingStr = aFileObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); - } -@@ -567,10 +574,27 @@ - delete pExt; - - rFileName = aTempFile.GetURL(); -- -+ SfxBoolItem aPicklist( SID_PICKLIST, FALSE ); -+ SfxBoolItem aSaveTo( SID_SAVETO, TRUE ); -+ SfxStringItem* pFilterName = NULL; -+ if ( pFilter && bHasFilter ) -+ pFilterName = new SfxStringItem( SID_FILTER_NAME, pFilter->GetFilterName() ); -+ -+ SfxStringItem* pPassItem = NULL; -+ String aPasswd; -+ if ( GetPasswd_Impl( xDocShell->GetMedium()->GetItemSet(), aPasswd ) ) -+ pPassItem = new SfxStringItem( SID_PASSWORD, aPasswd ); -+ - // save document to temp file - SfxStringItem aFileName( SID_FILE_NAME, rFileName ); -- const SfxBoolItem *pRet = (const SfxBoolItem*)pDisp->Execute( SID_EXPORTDOCASPDF, SFX_CALLMODE_SYNCHRON, &aFileName, 0L ); -+ const SfxBoolItem *pRet = (const SfxBoolItem*)pDisp->Execute( SID_SAVEASDOC, -+ SFX_CALLMODE_SYNCHRON, -+ &aFileName, -+ &aPicklist, -+ &aSaveTo, -+ pFilterName ? pFilterName : pPassItem, -+ pFilterName ? pPassItem : 0L, 0L ); -+ - BOOL bRet = pRet ? pRet->GetValue() : FALSE; - eRet = bRet ? SAVE_SUCCESSFULL : SAVE_CANCELLED; - -@@ -670,10 +694,16 @@ - String aFileName, aContentType; - - sal_Bool bSuccessfull = sal_False; -- if ( eMailDocType == TYPE_SELF ) -- eSaveResult = SaveDocument( aFileName, aContentType ); -- else -- eSaveResult = SaveDocAsPDF( aFileName, aContentType ); -+ switch (eMailDocType){ -+ case TYPE_ASMSDOC: -+ case TYPE_ASMSPOWERPOINT: -+ case TYPE_ASPDF: -+ case TYPE_ASMSEXCEL: -+ eSaveResult = SaveDocAs( aFileName, aContentType,eMailDocType ); -+ break; -+ default: -+ eSaveResult = SaveDocument( aFileName, aContentType); -+ } - - if ( eSaveResult == SAVE_SUCCESSFULL ) - { ---- officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu.bakj 2005-05-10 13:59:29.000000000 +0530 -+++ officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu 2005-05-10 14:00:12.000000000 +0530 -@@ -1498,6 +1498,12 @@ - <value xml:lang="en-US">Sen~d</value> + <value xml:lang="de">Führungslinien</value> +Index: officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu +=================================================================== +RCS file: util/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu,v + +diff -u -p -r1.46 GenericCommands.xcu +--- officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 21 Dec 2005 16:12:15 -0000 1.46 ++++ officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 21 Feb 2006 12:37:58 -0000 +@@ -4516,12 +4516,6 @@ + <value xml:lang="en-US">Stop Recording</value> </prop> </node> -+ <node oor:name=".uno:SendMailDocAsMSExcel" oor:op="replace"> +- <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> +@@ -5241,6 +5235,42 @@ + <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 MS-E~xcel-Anhang...</value> -+ <value xml:lang="en-US">Document as MS-E~xcel Attachment...</value> ++ <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:ProtectMenu" oor:op="replace"> ++ <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 sch~ützen</value> + <value xml:lang="de">Dokument als ~E-Mail...</value> +Index: officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu +=================================================================== +RCS file: util/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu,v + +diff -u -p -r1.22 WriterCommands.xcu +--- officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 16 Nov 2005 09:16:29 -0000 1.22 ++++ officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu 21 Feb 2006 12:37:59 -0000 +@@ -791,6 +791,12 @@ + <value>1</value> + </prop> + </node> ++ <node oor:name=".uno:SendMail?FilterName:string=MS WinWord 6.0" oor:op="replace"> ++ <prop oor:name="Label" oor:type="xs:string"> ++ <value xml:lang="de">Dokument als MS-~Doc-Anhang...</value> ++ <value xml:lang="en-US">Document as MS-~Doc Attachment...</value> ++ </prop> ++ </node> + <node oor:name=".uno:SendOutlineToClipboard" oor:op="replace"> + <prop oor:name="Label" oor:type="xs:string"> + <value xml:lang="de">Gliederung zur Zwis~chenablage</value> +Index: sfx2/sdi/sfx.sdi +=================================================================== +RCS file: framework/sfx2/sdi/sfx.sdi,v + +diff -u -p -r1.69 sfx.sdi +--- sfx2/sdi/sfx.sdi 3 Nov 2005 12:05:03 -0000 1.69 ++++ sfx2/sdi/sfx.sdi 21 Feb 2006 12:53:09 -0000 +@@ -6369,34 +6369,7 @@ SfxVoidItem SendFax FN_FAX + + //-------------------------------------------------------------------------- + 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) +-[ +- /* 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) ++(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, +Index: sfx2/sdi/viwslots.sdi +=================================================================== +RCS file: framework/sfx2/sdi/viwslots.sdi,v + +diff -u -p -r1.4 viwslots.sdi +--- sfx2/sdi/viwslots.sdi 26 Aug 2002 07:32:06 -0000 1.4 ++++ sfx2/sdi/viwslots.sdi 21 Feb 2006 12:53:09 -0000 +@@ -17,11 +17,6 @@ interface View : Object + ExecMethod = ExecMisc_Impl ; + StateMethod = GetState_Impl ; + ] +- SID_MAIL_SENDDOCASPDF // ole(no) api(todo) +- [ +- ExecMethod = ExecMisc_Impl ; +- StateMethod = GetState_Impl ; +- ] + //--------------------------------------------------------------------- + SID_PRINTDOC // ole(no) api(play/rec) + [ +Index: sfx2/inc/sfxsids.hrc +=================================================================== +RCS file: framework/sfx2/inc/sfxsids.hrc,v + +diff -u -p -r1.83 sfxsids.hrc +--- sfx2/inc/sfxsids.hrc 23 Sep 2005 15:13:44 -0000 1.83 ++++ sfx2/inc/sfxsids.hrc 21 Feb 2006 12:57:21 -0000 +@@ -122,7 +122,6 @@ + #define SID_MAIL_OPEN (SID_SFX_START + 329) + #define SID_MAIL_NOTIFY (SID_SFX_START + 330) + #define SID_MAIL_SENDDOC (SID_SFX_START + 331) +-#define SID_MAIL_SENDDOCASPDF (SID_SFX_START + 1672) + + + #define SID_MAIL_RECIPIENT (SID_SFX_START + 334) +--- svx/inc/globlmn_tmpl.hrc 2006-02-21 14:32:33.000000000 +0000 ++++ svx.patch/inc/globlmn_tmpl.hrc 2006-02-21 21:06:12.000000000 +0000 +@@ -555,14 +555,6 @@ + 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" ; \ +--- sd/source/ui/app/menuids2_tmpl.src 2006-02-21 21:38:21.000000000 +0000 ++++ sd.patch/source/ui/app/menuids2_tmpl.src 2006-02-21 21:39:30.000000000 +0000 +@@ -102,11 +102,6 @@ + Text [ en-US ] = "Sen~d" ; \ + SubMenu = Menu\ + {\ +- ItemList = \ +- {\ +- MI ( ITEM_FILE_MAIL_SENDDOC ) \ +- MI ( ITEM_FILE_MAIL_SENDDOCASPDF ) \ +- };\ + };\ + }; + +--- sw/sdi/wviewsh.sdi 2005-09-09 03:44:55.000000000 +0100 ++++ sw.patched/sdi/wviewsh.sdi 2006-02-22 09:34:32.000000000 +0000 +@@ -176,10 +176,6 @@ interface WebSourceView : View + [ + StateMethod = GetState ; + ] +- SID_MAIL_SENDDOCASPDF +- [ +- StateMethod = GetState ; +- ] + SID_EXPORTDOC + [ + StateMethod = GetState ; +--- sw/source/ui/uiview/srcview.cxx 2006-02-10 14:53:13.000000000 +0000 ++++ sw.patched/source/ui/uiview/srcview.cxx 2006-02-22 09:39:58.000000000 +0000 +@@ -710,7 +710,6 @@ void SwSrcView::GetState(SfxItemSet& rSe + } + } + break; +- case SID_MAIL_SENDDOCASPDF: + case SID_MAIL_SENDDOC : + case SID_EXPORTDOCASPDF: + case SID_DIRECTEXPORTDOCASPDF: --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
