diff options
| author | Tor Lillqvist <tml@collabora.com> | 2015-05-23 10:56:30 +0100 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2015-05-23 11:21:54 +0100 |
| commit | 20c9ceb708e4720205a303bf2d41274b1311e36b (patch) | |
| tree | b3346fb5a02b406d39589a038511edc497d45a3b /vcl | |
| parent | 490365b2452cb6fa96749475d996c6033b0d6407 (diff) | |
Don't do any magic LO OS X application stuff in a LOKit client
Change-Id: If6b6c3e48c7d0681958ff0e2afe0b0be5f6ee1ab
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/osx/salinst.cxx | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx index cec89e8a05db..2d8f5c53f59a 100644 --- a/vcl/osx/salinst.cxx +++ b/vcl/osx/salinst.cxx @@ -23,6 +23,8 @@ #include <tools/solarmutex.hxx> +#include "comphelper/lok.hxx" + #include "osl/process.h" #include "rtl/ustrbuf.hxx" @@ -182,6 +184,9 @@ static void initNSApp() bool ImplSVMainHook( int * pnInit ) { + if (comphelper::LibreOfficeKit::isActive()) + return false; + unlink([[NSString stringWithFormat:@"%@/Library/Saved Application State/%s.savedState/restorecount.plist", NSHomeDirectory(), MACOSX_BUNDLE_IDENTIFIER] UTF8String]); unlink([[NSString stringWithFormat:@"%@/Library/Saved Application State/%s.savedState/restorecount.txt", NSHomeDirectory(), MACOSX_BUNDLE_IDENTIFIER] UTF8String]); |