sysui/desktop/menus/base.desktop | 2 +- sysui/desktop/menus/calc.desktop | 2 +- sysui/desktop/menus/draw.desktop | 2 +- sysui/desktop/menus/impress.desktop | 2 +- sysui/desktop/menus/math.desktop | 2 +- sysui/desktop/menus/startcenter.desktop | 2 +- sysui/desktop/menus/writer.desktop | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-)
New commits: commit 47cb40ffae5662df259207a7ca0b54dae1b1314c Author: Gabor Kelemen <gabor.kelemen.ext...@allotropia.de> AuthorDate: Sat Jul 15 10:32:05 2023 +0200 Commit: Thorsten Behrens <thorsten.behr...@allotropia.de> CommitDate: Sun Jul 16 11:58:18 2023 +0200 Opt out of using global menu on old OS version Change-Id: Ic1700261e31b4cf8cfed7fe4eb4dac4856afe93e Reviewed-on: https://gerrit.libreoffice.org/c/core/+/154476 Tested-by: Gabor Kelemen <kelem...@ubuntu.com> Tested-by: Thorsten Behrens <thorsten.behr...@allotropia.de> Reviewed-by: Thorsten Behrens <thorsten.behr...@allotropia.de> diff --git a/sysui/desktop/menus/base.desktop b/sysui/desktop/menus/base.desktop index 36a36ecb6fe5..f332c39a3412 100644 --- a/sysui/desktop/menus/base.desktop +++ b/sysui/desktop/menus/base.desktop @@ -21,7 +21,7 @@ Terminal=false Icon=base Type=Application Categories=Office;Database;X-Red-Hat-Base;X-MandrivaLinux-MoreApplications-Databases; -Exec=${UNIXBASISROOTNAME} --base %%FILE%% +Exec=env UBUNTU_MENUPROXY=0 ${UNIXBASISROOTNAME} --base %%FILE%% MimeType=application/vnd.oasis.opendocument.database;application/vnd.sun.xml.base; Name=%PRODUCTNAME Base GenericName=Database Development diff --git a/sysui/desktop/menus/calc.desktop b/sysui/desktop/menus/calc.desktop index 643687946d1a..bd54f4c83402 100644 --- a/sysui/desktop/menus/calc.desktop +++ b/sysui/desktop/menus/calc.desktop @@ -21,7 +21,7 @@ Terminal=false Icon=calc Type=Application Categories=Office;Spreadsheet;X-Red-Hat-Base;X-MandrivaLinux-Office-Spreadsheets; -Exec=${UNIXBASISROOTNAME} --calc %%FILE%% +Exec=env UBUNTU_MENUPROXY=0 ${UNIXBASISROOTNAME} --calc %%FILE%% MimeType=application/vnd.oasis.opendocument.spreadsheet;application/vnd.oasis.opendocument.spreadsheet-template;application/vnd.sun.xml.calc;application/vnd.sun.xml.calc.template;application/msexcel;application/vnd.ms-excel;application/vnd.openxmlformats-officedocument.spreadsheetml.sheet;application/vnd.ms-excel.sheet.macroEnabled.12;application/vnd.openxmlformats-officedocument.spreadsheetml.template;application/vnd.ms-excel.template.macroEnabled.12;application/vnd.ms-excel.sheet.binary.macroEnabled.12;text/csv;application/x-dbf;text/spreadsheet;application/csv;application/excel;application/tab-separated-values;application/vnd.lotus-1-2-3;application/vnd.oasis.opendocument.chart;application/vnd.oasis.opendocument.chart-template;application/x-dbase;application/x-dos_ms_excel;application/x-excel;application/x-msexcel;application/x-ms-excel;application/x-quattropro;application/x-123;text/comma-separated-values;text/tab-separated-values;text/x-comma-separated-values;text/x-csv;applica tion/vnd.oasis.opendocument.spreadsheet-flat-xml;application/vnd.ms-works;application/clarisworks;application/x-iwork-numbers-sffnumbers;application/x-starcalc; Name=%PRODUCTNAME Calc GenericName=Spreadsheet diff --git a/sysui/desktop/menus/draw.desktop b/sysui/desktop/menus/draw.desktop index ff9fa53084ed..054b0a2b46f2 100644 --- a/sysui/desktop/menus/draw.desktop +++ b/sysui/desktop/menus/draw.desktop @@ -21,7 +21,7 @@ Terminal=false Icon=draw Type=Application Categories=Office;FlowChart;Graphics;2DGraphics;VectorGraphics;X-Red-Hat-Base;X-MandrivaLinux-Office-Drawing; -Exec=${UNIXBASISROOTNAME} --draw %%FILE%% +Exec=env UBUNTU_MENUPROXY=0 ${UNIXBASISROOTNAME} --draw %%FILE%% MimeType=application/vnd.oasis.opendocument.graphics;application/vnd.oasis.opendocument.graphics-flat-xml;application/vnd.oasis.opendocument.graphics-template;application/vnd.sun.xml.draw;application/vnd.sun.xml.draw.template;application/vnd.visio;application/x-wpg;application/vnd.corel-draw;application/vnd.ms-publisher;image/x-freehand;application/clarisworks;application/x-pagemaker;application/pdf;application/x-stardraw;image/x-emf;image/x-wmf; Name=%PRODUCTNAME Draw GenericName=Drawing Program diff --git a/sysui/desktop/menus/impress.desktop b/sysui/desktop/menus/impress.desktop index 0af5e121d371..bd7534b92e28 100644 --- a/sysui/desktop/menus/impress.desktop +++ b/sysui/desktop/menus/impress.desktop @@ -21,7 +21,7 @@ Terminal=false Icon=impress Type=Application Categories=Office;Presentation;X-Red-Hat-Base;X-MandrivaLinux-Office-Presentations; -Exec=${UNIXBASISROOTNAME} --impress %%FILE%% +Exec=env UBUNTU_MENUPROXY=0 ${UNIXBASISROOTNAME} --impress %%FILE%% MimeType=application/vnd.oasis.opendocument.presentation;application/vnd.oasis.opendocument.presentation-template;application/vnd.sun.xml.impress;application/vnd.sun.xml.impress.template;application/mspowerpoint;application/vnd.ms-powerpoint;application/vnd.openxmlformats-officedocument.presentationml.presentation;application/vnd.ms-powerpoint.presentation.macroEnabled.12;application/vnd.openxmlformats-officedocument.presentationml.template;application/vnd.ms-powerpoint.template.macroEnabled.12;application/vnd.openxmlformats-officedocument.presentationml.slide;application/vnd.openxmlformats-officedocument.presentationml.slideshow;application/vnd.ms-powerpoint.slideshow.macroEnabled.12;application/vnd.oasis.opendocument.presentation-flat-xml;application/x-iwork-keynote-sffkey; Name=%PRODUCTNAME Impress GenericName=Presentation diff --git a/sysui/desktop/menus/math.desktop b/sysui/desktop/menus/math.desktop index 5a8192ae4abc..8a6ed1a5ee25 100644 --- a/sysui/desktop/menus/math.desktop +++ b/sysui/desktop/menus/math.desktop @@ -22,7 +22,7 @@ NoDisplay=false Icon=math Type=Application Categories=Office;Education;Science;Math;X-Red-Hat-Base;X-MandrivaLinux-Office-Other; -Exec=${UNIXBASISROOTNAME} --math %%FILE%% +Exec=env UBUNTU_MENUPROXY=0 ${UNIXBASISROOTNAME} --math %%FILE%% MimeType=application/vnd.oasis.opendocument.formula;application/vnd.sun.xml.math;application/vnd.oasis.opendocument.formula-template;text/mathml;application/mathml+xml; Name=%PRODUCTNAME Math GenericName=Formula Editor diff --git a/sysui/desktop/menus/startcenter.desktop b/sysui/desktop/menus/startcenter.desktop index 6bb33e58266d..e6c941370038 100644 --- a/sysui/desktop/menus/startcenter.desktop +++ b/sysui/desktop/menus/startcenter.desktop @@ -22,7 +22,7 @@ NoDisplay=false Icon=startcenter Type=Application Categories=Office;X-Red-Hat-Base;X-SuSE-Core-Office;X-MandrivaLinux-Office-Other; -Exec=${UNIXBASISROOTNAME} %%FILE%% +Exec=env UBUNTU_MENUPROXY=0 ${UNIXBASISROOTNAME} %%FILE%% MimeType=application/vnd.openofficeorg.extension;x-scheme-handler/vnd.libreoffice.cmis;x-scheme-handler/vnd.sun.star.webdav;x-scheme-handler/vnd.sun.star.webdavs;x-scheme-handler/vnd.libreoffice.command;x-scheme-handler/ms-word;x-scheme-handler/ms-powerpoint;x-scheme-handler/ms-excel;x-scheme-handler/ms-visio;x-scheme-handler/ms-access; Name=%PRODUCTNAME GenericName=Office diff --git a/sysui/desktop/menus/writer.desktop b/sysui/desktop/menus/writer.desktop index e751073eedb5..6837f5e28742 100644 --- a/sysui/desktop/menus/writer.desktop +++ b/sysui/desktop/menus/writer.desktop @@ -21,7 +21,7 @@ Terminal=false Icon=writer Type=Application Categories=Office;WordProcessor;X-Red-Hat-Base;X-MandrivaLinux-Office-Wordprocessors; -Exec=${UNIXBASISROOTNAME} --writer %%FILE%% +Exec=env UBUNTU_MENUPROXY=0 ${UNIXBASISROOTNAME} --writer %%FILE%% MimeType=application/vnd.oasis.opendocument.text;application/vnd.oasis.opendocument.text-template;application/vnd.oasis.opendocument.text-web;application/vnd.oasis.opendocument.text-master;application/vnd.oasis.opendocument.text-master-template;application/vnd.sun.xml.writer;application/vnd.sun.xml.writer.template;application/vnd.sun.xml.writer.global;application/msword;application/vnd.ms-word;application/x-doc;application/x-hwp;application/rtf;text/rtf;application/vnd.wordperfect;application/wordperfect;application/vnd.lotus-wordpro;application/vnd.openxmlformats-officedocument.wordprocessingml.document;application/vnd.ms-word.document.macroEnabled.12;application/vnd.openxmlformats-officedocument.wordprocessingml.template;application/vnd.ms-word.template.macroEnabled.12;application/vnd.ms-works;application/vnd.stardivision.writer-global;application/x-extension-txt;application/x-t602;text/plain;application/vnd.oasis.opendocument.text-flat-xml;application/x-fictionbook+xml;applicatio n/macwriteii;application/x-aportisdoc;application/prs.plucker;application/vnd.palm;application/clarisworks;application/x-sony-bbeb;application/x-abiword;application/x-iwork-pages-sffpages;application/x-mswrite;application/x-starwriter; Name=%PRODUCTNAME Writer GenericName=Word Processor