diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2023-11-16 11:31:53 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2023-11-16 19:15:09 +0100 |
| commit | 4c40fe59893709f87e72f0dd36e859591d253189 (patch) | |
| tree | f35ab9d694f4a5de9091ae195185a2493ae91920 /sw | |
| parent | 764e2a5a3e6cfba8cf463796aca1451859a52b6e (diff) | |
tdf#146386 cui,sc,sw: Office::Common::Filter::HTML::Export::LocalGraphic
Adapt its usage to removal of FTP UCP; the target protocol check in sc
and sw was particularly silly.
Change-Id: Ib94501ebcc589e257e9b882a340e18ef1a791584
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159499
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/writer/writer.cxx | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/sw/source/filter/writer/writer.cxx b/sw/source/filter/writer/writer.cxx index 448a64a2f2a5..1671f27e0b4a 100644 --- a/sw/source/filter/writer/writer.cxx +++ b/sw/source/filter/writer/writer.cxx @@ -269,12 +269,16 @@ bool Writer::CopyLocalFileToINet( OUString& rFileNm ) bool bRet = false; INetURLObject aFileUrl( rFileNm ), aTargetUrl( *m_pOrigFileName ); -// this is our old without the Mail-Export - if( ! ( INetProtocol::File == aFileUrl.GetProtocol() && - INetProtocol::File != aTargetUrl.GetProtocol() && - INetProtocol::Ftp <= aTargetUrl.GetProtocol() && - INetProtocol::VndSunStarWebdav >= aTargetUrl.GetProtocol() ) ) + if (!(INetProtocol::File == aFileUrl.GetProtocol() + && (INetProtocol::Http == aTargetUrl.GetProtocol() + || INetProtocol::Https == aTargetUrl.GetProtocol() + || INetProtocol::VndSunStarWebdav == aTargetUrl.GetProtocol() + || INetProtocol::Smb == aTargetUrl.GetProtocol() + || INetProtocol::Sftp == aTargetUrl.GetProtocol() + || INetProtocol::Cmis == aTargetUrl.GetProtocol()))) + { return bRet; + } // has the file been moved? std::map<OUString, OUString>::iterator it = m_pImpl->maFileNameMap.find( rFileNm ); |