diff options
| -rw-r--r-- | cui/uiconfig/ui/hyperlinkdialog.ui | 2 | ||||
| -rw-r--r-- | cui/uiconfig/ui/opthtmlpage.ui | 2 | ||||
| -rw-r--r-- | officecfg/registry/schema/org/openoffice/Office/Common.xcs | 2 | ||||
| -rw-r--r-- | sc/source/filter/html/htmlexp.cxx | 13 | ||||
| -rw-r--r-- | sw/source/filter/writer/writer.cxx | 14 |
5 files changed, 21 insertions, 12 deletions
diff --git a/cui/uiconfig/ui/hyperlinkdialog.ui b/cui/uiconfig/ui/hyperlinkdialog.ui index 57b9f665f606..c598e02093e4 100644 --- a/cui/uiconfig/ui/hyperlinkdialog.ui +++ b/cui/uiconfig/ui/hyperlinkdialog.ui @@ -166,7 +166,7 @@ <object class="GtkImage"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes" context="hyperlinkdialog|RID_SVXSTR_HYPERDLG_HLINETTP_HELP">This is where you create a hyperlink to a Web page or FTP server connection.</property> + <property name="tooltip_text" translatable="yes" context="hyperlinkdialog|RID_SVXSTR_HYPERDLG_HLINETTP_HELP">This is where you create a hyperlink to a Web page.</property> <property name="icon_name">res/hlinettp.png</property> <property name="icon_size">6</property> </object> diff --git a/cui/uiconfig/ui/opthtmlpage.ui b/cui/uiconfig/ui/opthtmlpage.ui index 30ffc5a78a20..8c0f88436570 100644 --- a/cui/uiconfig/ui/opthtmlpage.ui +++ b/cui/uiconfig/ui/opthtmlpage.ui @@ -574,7 +574,7 @@ <property name="draw-indicator">True</property> <child internal-child="accessible"> <object class="AtkObject" id="savegrflocal-atkobject"> - <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|savegrflocal">Mark this check box to automatically upload the embedded pictures to the Internet server when uploading using FTP. Use the Save As dialog to save the document and enter a complete FTP URL as the file name in the Internet.</property> + <property name="AtkObject::accessible-description" translatable="yes" context="extended_tip|savegrflocal">Mark this check box to automatically upload the embedded pictures to the Internet server when uploading using a network protocol. Use the Save As dialog to save the document and enter a complete URL as the file name in the Internet.</property> </object> </child> </object> diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs index c551044a350d..cba034e33fae 100644 --- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs +++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs @@ -4475,7 +4475,7 @@ <!-- UIHints: Tools Options - Browser HTML [Section] Export --> <info> <desc>Specifies whether images are copied to the Internet server when - uploading via FTP.</desc> + uploading via a network protocol.</desc> <label>Copy local images to Internet</label> </info> <value>true</value> diff --git a/sc/source/filter/html/htmlexp.cxx b/sc/source/filter/html/htmlexp.cxx index 9ef9c555da91..8f06c93f5bbf 100644 --- a/sc/source/filter/html/htmlexp.cxx +++ b/sc/source/filter/html/htmlexp.cxx @@ -1339,11 +1339,16 @@ void ScHTMLExport::CopyLocalFileToINet( OUString& rFileNm, INetURLObject aFileUrl, aTargetUrl; aFileUrl.SetSmartURL( rFileNm ); aTargetUrl.SetSmartURL( rTargetNm ); - if( !(INetProtocol::File == aFileUrl.GetProtocol() && - ( INetProtocol::File != aTargetUrl.GetProtocol() && - INetProtocol::Ftp <= aTargetUrl.GetProtocol() && - INetProtocol::Javascript >= 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; + } if( pFileNameMap ) { 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 ); |