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 /include | |
| 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 'include')
| -rw-r--r-- | include/sfx2/flatpak.hxx | 34 | ||||
| -rw-r--r-- | include/sfx2/sfxhelp.hxx | 2 |
2 files changed, 34 insertions, 2 deletions
diff --git a/include/sfx2/flatpak.hxx b/include/sfx2/flatpak.hxx new file mode 100644 index 000000000000..cb5d758b51fe --- /dev/null +++ b/include/sfx2/flatpak.hxx @@ -0,0 +1,34 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ + +#ifndef INCLUDED_INCLUDE_SFX2_FLATPAK_HXX +#define INCLUDED_INCLUDE_SFX2_FLATPAK_HXX + +#include <sal/config.h> + +#include <rtl/ustring.hxx> +#include <sfx2/dllapi.h> + +// Functionality related to the Flatpak version of LibreOffice. + +namespace flatpak { + +bool isFlatpak(); + +// Must only be called with SolarMutex locked: +bool createTemporaryHtmlDirectory(OUString ** url); + +// Must only be called with SolarMutex locked: +SFX2_DLLPUBLIC void removeTemporaryHtmlDirectory(); + +} + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */ diff --git a/include/sfx2/sfxhelp.hxx b/include/sfx2/sfxhelp.hxx index 5dd0a81fc1e9..e76872f3f201 100644 --- a/include/sfx2/sfxhelp.hxx +++ b/include/sfx2/sfxhelp.hxx @@ -50,8 +50,6 @@ public: static OUString GetCurrentModuleIdentifier(); // Check for built-in help static bool IsHelpInstalled(); - - static void removeFlatpakHelpTemporaryDirectory(); }; #endif // INCLUDED_SFX2_SFXHELP_HXX |