diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-06-16 16:45:21 +0200 |
|---|---|---|
| committer | Ashod Nakashian <ashod.nakashian@collabora.co.uk> | 2016-07-20 01:26:09 -0400 |
| commit | 82bb3b84594d4eadaa062cdb8381360dbc7cf3b6 (patch) | |
| tree | 9f9096183c2f6b54371305721168db637d8766ff /desktop | |
| parent | 2e6fd3dca0d1ab7dd03f6dca2574c926462daaf0 (diff) | |
comphelper: enable LibreOfficeKit::isViewCallback() by default
This requires porting the sw/sd/sc_tiledrendering test code to the new
internal API, as only the public LOK API is unchanged.
Reviewed-on: https://gerrit.libreoffice.org/26379
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
(cherry picked from commit 5bf3ae663a2189e37959235cda8c6a4051e10a1a)
Change-Id: Ic6a2f96421da4a16bdee7d0cbb3f6e35bc6ddff9
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/README.vars | 2 | ||||
| -rw-r--r-- | desktop/source/lib/init.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/desktop/README.vars b/desktop/README.vars index b84a2700c710..39e3aaa20436 100644 --- a/desktop/README.vars +++ b/desktop/README.vars @@ -13,4 +13,4 @@ LibreOfficeKit -------------- LOK_DEBUG - Draw a small red rectangle in the top left corner so that it's easy to see where a new tile begins. -LOK_VIEW_CALLBACK - Use incomplete per-view callbacks instead of a single one. +LOK_MODEL_CALLBACK - Use old document-global callback instead of multiple per-view ones. diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 70573ed64944..8a1a2f780093 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -2239,7 +2239,7 @@ static int lo_initialize(LibreOfficeKit* pThis, const char* pAppPath, const char if (eStage != SECOND_INIT) comphelper::LibreOfficeKit::setActive(); - static bool bViewCallback = getenv("LOK_VIEW_CALLBACK"); + static bool bViewCallback = !getenv("LOK_MODEL_CALLBACK"); comphelper::LibreOfficeKit::setViewCallback(bViewCallback); if (eStage != PRE_INIT) |