diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2019-04-30 10:38:38 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-05-02 08:40:10 +0200 |
| commit | c61e7b9940cb30800d6f1000727f9cfd5de9fa5e (patch) | |
| tree | b27094b0ae4bf5d9ab306d92d8478c69a739b4e4 /desktop/source/app | |
| parent | 19976f079800ec4c1d0d5d7e226986cb41f834c2 (diff) | |
Support "Preview in Web Browser" in Flatpak mode
...by storing the temporary HTML document in a location that can be accessed by
the browser running outside the Flatpak sandbox. This reuses and extends the
mechanism already in place for the new HTML-based help in Flatpak mode (see
72b936d70b7eaa6d9f5f911b27e3c955382de967 "Enable --help=html for flatpak").
This fixes <https://github.com/flathub/org.libreoffice.LibreOffice/issues/85>
"“Preview in Web Browser” does not work in Flatpak version".
Change-Id: I5f73fd89139ffe6b8ab0dc501154b4f054a0ae5c
Reviewed-on: https://gerrit.libreoffice.org/71570
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'desktop/source/app')
| -rw-r--r-- | desktop/source/app/app.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx index e584858b3191..c516d19a6862 100644 --- a/desktop/source/app/app.cxx +++ b/desktop/source/app/app.cxx @@ -110,7 +110,7 @@ #include <vcl/help.hxx> #include <vcl/weld.hxx> #include <vcl/settings.hxx> -#include <sfx2/sfxhelp.hxx> +#include <sfx2/flatpak.hxx> #include <sfx2/sfxsids.hrc> #include <sfx2/app.hxx> #include <sfx2/safemode.hxx> @@ -1696,7 +1696,7 @@ int Desktop::doShutdown() // remove temp directory RemoveTemporaryDirectory(); - SfxHelp::removeFlatpakHelpTemporaryDirectory(); + flatpak::removeTemporaryHtmlDirectory(); // flush evtl. configuration changes so that all config files in user // dir are written |