diff options
author | Michael Stahl <michael.stahl@allotropia.de> | 2023-11-16 12:55:48 +0100 |
---|---|---|
committer | Michael Stahl <michael.stahl@allotropia.de> | 2023-11-16 19:15:26 +0100 |
commit | d343a2b6393aec2eba0d25d7f4f390f12d1515f6 (patch) | |
tree | 382202d861eee7a2a1909c627c400e5bfee7b173 /sysui | |
parent | 4c40fe59893709f87e72f0dd36e859591d253189 (diff) |
tdf#146386 deprecate, remove usage of Inet::Settings::ooInetFTPProxyName
* officecfg: deprecate Inet::Settings::ooInetFTPProxyName/Port
* ucbhelper: stop handling these settings
* sfx2: remove SID_INET_FTP_PROXY_NAME and SID_INET_FTP_PROXY_PORT
and usage from SfxApplication::GetOptions()
* shell: remove proxy config code from backends
* stoc: the JavaVM would have its "ftp.proxyHost" properties set based
on officecfg values; remove that
* sysui,vcl: remove protocol from KDE desktop files and file picker
Change-Id: Iba02676cf6e519e2fa60ba925209436d38e75f49
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159500
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'sysui')
-rw-r--r-- | sysui/desktop/menus/base.desktop | 2 | ||||
-rw-r--r-- | sysui/desktop/menus/calc.desktop | 2 | ||||
-rw-r--r-- | sysui/desktop/menus/draw.desktop | 2 | ||||
-rw-r--r-- | sysui/desktop/menus/impress.desktop | 2 | ||||
-rw-r--r-- | sysui/desktop/menus/math.desktop | 2 | ||||
-rw-r--r-- | sysui/desktop/menus/startcenter.desktop | 2 | ||||
-rw-r--r-- | sysui/desktop/menus/writer.desktop | 2 | ||||
-rw-r--r-- | sysui/desktop/menus/xsltfilter.desktop | 2 |
8 files changed, 8 insertions, 8 deletions
diff --git a/sysui/desktop/menus/base.desktop b/sysui/desktop/menus/base.desktop index 7a678ca6bc18..89e3d6175028 100644 --- a/sysui/desktop/menus/base.desktop +++ b/sysui/desktop/menus/base.desktop @@ -31,7 +31,7 @@ X-GIO-NoFuse=true Keywords=Data;SQL; InitialPreference=5 StartupWMClass=libreoffice-base -X-KDE-Protocols=file,http,ftp,webdav,webdavs +X-KDE-Protocols=file,http,webdav,webdavs Actions=NewDocument; [Desktop Action NewDocument] diff --git a/sysui/desktop/menus/calc.desktop b/sysui/desktop/menus/calc.desktop index a6a06fa04ff6..9550d0889570 100644 --- a/sysui/desktop/menus/calc.desktop +++ b/sysui/desktop/menus/calc.desktop @@ -31,7 +31,7 @@ X-GIO-NoFuse=true Keywords=Accounting;Stats;OpenDocument Spreadsheet;Chart;Microsoft Excel;Microsoft Works;OpenOffice Calc;ods;xls;xlsx; InitialPreference=5 StartupWMClass=libreoffice-calc -X-KDE-Protocols=file,http,ftp,webdav,webdavs +X-KDE-Protocols=file,http,webdav,webdavs Actions=NewDocument; [Desktop Action NewDocument] diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop index f2827b95b7d1..9713167ef124 100644 --- a/sysui/desktop/menus/draw.desktop +++ b/sysui/desktop/menus/draw.desktop @@ -31,7 +31,7 @@ X-GIO-NoFuse=true Keywords=Vector;Schema;Diagram;Layout;OpenDocument Graphics;Microsoft Publisher;Microsoft Visio;Corel Draw;cdr;odg;svg;pdf;vsd; InitialPreference=5 StartupWMClass=libreoffice-draw -X-KDE-Protocols=file,http,ftp,webdav,webdavs +X-KDE-Protocols=file,http,webdav,webdavs Actions=NewDocument; [Desktop Action NewDocument] diff --git a/sysui/desktop/menus/impress.desktop b/sysui/desktop/menus/impress.desktop index ad228990aa62..29fe14c91703 100644 --- a/sysui/desktop/menus/impress.desktop +++ b/sysui/desktop/menus/impress.desktop @@ -31,7 +31,7 @@ X-GIO-NoFuse=true Keywords=Slideshow;Slides;OpenDocument Presentation;Microsoft PowerPoint;Microsoft Works;OpenOffice Impress;odp;ppt;pptx; InitialPreference=5 StartupWMClass=libreoffice-impress -X-KDE-Protocols=file,http,ftp,webdav,webdavs +X-KDE-Protocols=file,http,webdav,webdavs Actions=NewDocument; [Desktop Action NewDocument] diff --git a/sysui/desktop/menus/math.desktop b/sysui/desktop/menus/math.desktop index 4f3fbce6b04e..6a99c625064c 100644 --- a/sysui/desktop/menus/math.desktop +++ b/sysui/desktop/menus/math.desktop @@ -32,7 +32,7 @@ X-GIO-NoFuse=true Keywords=Equation;OpenDocument Formula;Formula;odf;MathML; InitialPreference=5 StartupWMClass=libreoffice-math -X-KDE-Protocols=file,http,ftp,webdav,webdavs +X-KDE-Protocols=file,http,webdav,webdavs Actions=NewDocument; [Desktop Action NewDocument] diff --git a/sysui/desktop/menus/startcenter.desktop b/sysui/desktop/menus/startcenter.desktop index 4732568e3fde..2077dd0fbf9b 100644 --- a/sysui/desktop/menus/startcenter.desktop +++ b/sysui/desktop/menus/startcenter.desktop @@ -30,7 +30,7 @@ Comment=Launch applications to create text documents, spreadsheets, presentation StartupNotify=true X-GIO-NoFuse=true StartupWMClass=libreoffice-startcenter -X-KDE-Protocols=file,http,ftp,webdav,webdavs +X-KDE-Protocols=file,http,webdav,webdavs ##Define Actions Actions=Writer;Calc;Impress;Draw;Base;Math; diff --git a/sysui/desktop/menus/writer.desktop b/sysui/desktop/menus/writer.desktop index ec9f316a726a..2cd555a436bf 100644 --- a/sysui/desktop/menus/writer.desktop +++ b/sysui/desktop/menus/writer.desktop @@ -31,7 +31,7 @@ X-GIO-NoFuse=true Keywords=Text;Letter;Fax;Document;OpenDocument Text;Microsoft Word;Microsoft Works;Lotus WordPro;OpenOffice Writer;CV;odt;doc;docx;rtf; InitialPreference=5 StartupWMClass=libreoffice-writer -X-KDE-Protocols=file,http,ftp,webdav,webdavs +X-KDE-Protocols=file,http,webdav,webdavs Actions=NewDocument; [Desktop Action NewDocument] diff --git a/sysui/desktop/menus/xsltfilter.desktop b/sysui/desktop/menus/xsltfilter.desktop index 89a9eab98c2c..5ebd55143d2b 100644 --- a/sysui/desktop/menus/xsltfilter.desktop +++ b/sysui/desktop/menus/xsltfilter.desktop @@ -9,4 +9,4 @@ GenericName=XSLT based filters NoDisplay=true StartupNotify=true X-GIO-NoFuse=true -X-KDE-Protocols=file,http,ftp,webdav,webdavs +X-KDE-Protocols=file,http,webdav,webdavs |