diff options
| author | Tor Lillqvist <tml@collabora.com> | 2022-03-09 11:33:16 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2022-04-13 12:54:04 +0200 |
| commit | 5de22d1e559cd0f1f5fa4e247f0ce153710fbeab (patch) | |
| tree | cc66f4a16c0060868d37590593c77dda43db2d08 /include | |
| parent | 64c61aeb6be78bcfe458e72054bcea4792eb40e0 (diff) | |
Handle "addfont" from Collabora Online
We use the AddTempDevFont() API to add a new font. Sadly there is no
corresponding way to remove such a temporarily added font.
Change-Id: I6fe61919daa5af29e964cec1caf7293aefa8ea4f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132948
Tested-by: Tor Lillqvist <tml@collabora.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/LibreOfficeKit/LibreOfficeKit.hxx | 4 | ||||
| -rw-r--r-- | include/LibreOfficeKit/LibreOfficeKitInit.h | 2 | ||||
| -rw-r--r-- | include/sal/log-areas.dox | 1 | ||||
| -rw-r--r-- | include/vcl/outdev.hxx | 4 |
4 files changed, 9 insertions, 2 deletions
diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx b/include/LibreOfficeKit/LibreOfficeKit.hxx index 064caae2729b..912b3e0d2203 100644 --- a/include/LibreOfficeKit/LibreOfficeKit.hxx +++ b/include/LibreOfficeKit/LibreOfficeKit.hxx @@ -1036,6 +1036,10 @@ public: * environment variable SAL_LOG is again used as by default. You * can switch back and forth as you like. * + * "addfont": "<string>" + * + * Adds the font at the URL given. + * * @param pOption the option name * @param pValue its value */ diff --git a/include/LibreOfficeKit/LibreOfficeKitInit.h b/include/LibreOfficeKit/LibreOfficeKitInit.h index ccd42863ba25..5bbb722b5b18 100644 --- a/include/LibreOfficeKit/LibreOfficeKitInit.h +++ b/include/LibreOfficeKit/LibreOfficeKitInit.h @@ -255,6 +255,8 @@ typedef LibreOfficeKit *(LokHookFunction2)( const char *install_path, const char typedef int (LokHookPreInit) ( const char *install_path, const char *user_profile_url ); +typedef int (LokHookPreInit2) ( const char *install_path, const char *user_profile_url, LibreOfficeKit** kit); + #if defined(IOS) || defined(ANDROID) LibreOfficeKit *libreofficekit_hook_2(const char* install_path, const char* user_profile_path); #endif diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox index b00d1c1c8236..4e9c3105c844 100644 --- a/include/sal/log-areas.dox +++ b/include/sal/log-areas.dox @@ -509,6 +509,7 @@ certain functionality. @li @c vcl.uitest - The UI testing framework code @li @c vcl.unity @li @c vcl.unx.dtrans +@li @c vcl.unx.freetype @li @c vcl.unx.print @li @c vcl.virdev @li @c vcl.watchdog diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx index d244638e5127..7dacb68d55ad 100644 --- a/include/vcl/outdev.hxx +++ b/include/vcl/outdev.hxx @@ -1180,10 +1180,10 @@ public: //drop font data for all outputdevices. //If bNewFontLists is true then empty lists of system fonts - SAL_DLLPRIVATE static void ImplClearAllFontData( bool bNewFontLists ); + static void ImplClearAllFontData( bool bNewFontLists ); //fetch font data for all outputdevices //If bNewFontLists is true then fetch lists of system fonts - SAL_DLLPRIVATE static void ImplRefreshAllFontData( bool bNewFontLists ); + static void ImplRefreshAllFontData( bool bNewFontLists ); //drop and fetch font data for all outputdevices //If bNewFontLists is true then drop and refetch lists of system fonts SAL_DLLPRIVATE static void ImplUpdateAllFontData( bool bNewFontLists ); |