diff options
Diffstat (limited to 'sfx2/source/dialog/mailmodelapi.cxx')
| -rw-r--r-- | sfx2/source/dialog/mailmodelapi.cxx | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/sfx2/source/dialog/mailmodelapi.cxx b/sfx2/source/dialog/mailmodelapi.cxx index d2158c3dad..3abfb114a8 100644 --- a/sfx2/source/dialog/mailmodelapi.cxx +++ b/sfx2/source/dialog/mailmodelapi.cxx @@ -1,7 +1,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -73,9 +73,9 @@ #include <unotools/tempfile.hxx> #include <vcl/svapp.hxx> -#include <svtools/stritem.hxx> -#include <svtools/eitem.hxx> -#include <svtools/useroptions.hxx> +#include <svl/stritem.hxx> +#include <svl/eitem.hxx> +#include <unotools/useroptions.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/extract.hxx> #include <ucbhelper/content.hxx> @@ -284,7 +284,7 @@ namespace String aLeadingStr; if ( xStor.is() ) { - sal_Bool bHasName = xStor->hasLocation(); + sal_Bool bHasName = xStor->hasLocation(); if ( !bHasName ) { @@ -342,12 +342,12 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocument( const ::rtl::OUString& _sAt // detect filter const SfxFilter* pFilter = SfxFilter::GetDefaultFilter(lcl_getFactoryName(_xModel)); // sal_Bool bHasFilter = pFilter != NULL; - + sal_Bool bRet = sal_False; // create temp file name with leading chars and extension Reference < XStorable > xStor( _xModel, UNO_QUERY ); if ( xStor.is() ) - { + { String* pExt = NULL; INetURLObject aFileObj(_xModel->getURL()); if ( aFileObj.hasExtension() ) @@ -363,12 +363,12 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocument( const ::rtl::OUString& _sAt } { - ::utl::TempFile aTempFile( aLeadingStr, pExt ); + ::utl::TempFile aTempFile( aLeadingStr, pExt ); rFileName = aTempFile.GetURL(); } delete pExt; // save document to temp file - + // save document to temp file Sequence < PropertyValue > aArgs( _xModel->getArgs() ); ::comphelper::MediaDescriptor aMedia(aArgs); @@ -392,8 +392,8 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocument( const ::rtl::OUString& _sAt ::rtl::OUString sReadOnly(RTL_CONSTASCII_USTRINGPARAM("ReadOnly")); if ( !aMedia.createItemIfMissing(sReadOnly,sal_False) ) aMedia[sReadOnly] <<= sal_False; - - aMedia >> aArgs; + + aMedia >> aArgs; try { @@ -407,7 +407,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocument( const ::rtl::OUString& _sAt { } } - + // restore old settings /* TODO if ( !bModified && xDocShell->IsEnableSetModified() ) @@ -460,7 +460,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocAsPDF( const ::rtl::OUString& _sAt // save document to temp file Sequence < PropertyValue > aArgs( _xModel->getArgs() ); ::comphelper::MediaDescriptor aMedia(aArgs); - + ::rtl::OUString sMediaType(RTL_CONSTASCII_USTRINGPARAM("MediaType")); if ( !aMedia.createItemIfMissing(sMediaType,sPDFMediaType) ) aMedia[sMediaType] <<= sPDFMediaType; @@ -468,7 +468,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocAsPDF( const ::rtl::OUString& _sAt ::rtl::OUString sURL(RTL_CONSTASCII_USTRINGPARAM("URL")); if ( !aMedia.createItemIfMissing(sURL,::rtl::OUString(rFileName)) ) aMedia[sURL] <<= ::rtl::OUString(rFileName); - aMedia >> aArgs; + aMedia >> aArgs; try { @@ -596,7 +596,7 @@ SfxMailModel::SendMailResult SfxMailModel::Send( ) SendMailResult eResult = SEND_MAIL_ERROR; if ( !maAttachedDocuments.empty() ) { - + Reference < XMultiServiceFactory > xMgr = ::comphelper::getProcessServiceFactory(); if ( xMgr.is() ) { @@ -606,7 +606,7 @@ SfxMailModel::SendMailResult SfxMailModel::Send( ) xSimpleMailClientSupplier = Reference< XSimpleMailClientSupplier >( xMgr->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.system.SimpleSystemMail" ))), UNO_QUERY ); - + if ( ! xSimpleMailClientSupplier.is() ) { xSimpleMailClientSupplier = Reference< XSimpleMailClientSupplier >( |