diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-03-09 09:07:06 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2015-03-09 10:16:21 +0100 |
| commit | 8c7a68ef4201dac712ef489762a119b745f64988 (patch) | |
| tree | 2e38a320a0d670dcf08bd753a8910a46e84375ee /desktop/source/deployment/misc | |
| parent | 8f73bb4d8e12cc1458a2c4e7054f1af508d48e97 (diff) | |
Fix Linux baseline build
1) One more place in desktop that missed the LOK_TEST check.
2) One testcase currently fails on baseline, disabled for now, need to
check later.
Change-Id: I8c8bcf2cec1618e39e8453120755dffd3feb79ce
Diffstat (limited to 'desktop/source/deployment/misc')
| -rw-r--r-- | desktop/source/deployment/misc/dp_misc.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/desktop/source/deployment/misc/dp_misc.cxx b/desktop/source/deployment/misc/dp_misc.cxx index 28783296681c..60a06582120f 100644 --- a/desktop/source/deployment/misc/dp_misc.cxx +++ b/desktop/source/deployment/misc/dp_misc.cxx @@ -558,7 +558,8 @@ void syncRepositories( } } #if !HAVE_FEATURE_MACOSX_SANDBOX - if (bModified) + // getenv is a hack to detect if we're running in a LOK unit test + if (bModified && !getenv("LOK_TEST")) { Reference<task::XRestartManager> restarter(task::OfficeRestartManager::get(comphelper::getProcessComponentContext())); if (restarter.is()) |