Blame SOURCES/0004-Don-t-do-any-magic-LO-OS-X-application-stuff-in-a-LO.patch
|
 |
f325b2 |
From afd423f49c86a0360510433302b545cfc97f3cbc Mon Sep 17 00:00:00 2001
|
|
|
f325b2 |
From: Tor Lillqvist <tml@collabora.com>
|
|
|
f325b2 |
Date: Sat, 23 May 2015 10:56:30 +0100
|
|
|
f325b2 |
Subject: [PATCH 004/398] Don't do any magic LO OS X application stuff in a
|
|
|
f325b2 |
LOKit client
|
|
|
f325b2 |
|
|
|
f325b2 |
Change-Id: If6b6c3e48c7d0681958ff0e2afe0b0be5f6ee1ab
|
|
|
f325b2 |
(cherry picked from commit 20c9ceb708e4720205a303bf2d41274b1311e36b)
|
|
|
f325b2 |
---
|
|
|
f325b2 |
vcl/osx/salinst.cxx | 5 +++++
|
|
|
f325b2 |
1 file changed, 5 insertions(+)
|
|
|
f325b2 |
|
|
|
f325b2 |
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
|
|
|
f325b2 |
index 58a52d58accf..f57f8f4b45c5 100644
|
|
|
f325b2 |
--- a/vcl/osx/salinst.cxx
|
|
|
f325b2 |
+++ b/vcl/osx/salinst.cxx
|
|
|
f325b2 |
@@ -23,6 +23,8 @@
|
|
|
f325b2 |
|
|
|
f325b2 |
#include <tools/solarmutex.hxx>
|
|
|
f325b2 |
|
|
|
f325b2 |
+#include "comphelper/lok.hxx"
|
|
|
f325b2 |
+
|
|
|
f325b2 |
#include "osl/process.h"
|
|
|
f325b2 |
|
|
|
f325b2 |
#include "rtl/ustrbuf.hxx"
|
|
|
f325b2 |
@@ -182,6 +184,9 @@ static void initNSApp()
|
|
|
f325b2 |
|
|
|
f325b2 |
bool ImplSVMainHook( int * pnInit )
|
|
|
f325b2 |
{
|
|
|
f325b2 |
+ if (comphelper::LibreOfficeKit::isActive())
|
|
|
f325b2 |
+ return false;
|
|
|
f325b2 |
+
|
|
|
f325b2 |
unlink([[NSString stringWithFormat:@"%@/Library/Saved Application State/%s.savedState/restorecount.plist", NSHomeDirectory(), MACOSX_BUNDLE_IDENTIFIER] UTF8String]);
|
|
|
f325b2 |
unlink([[NSString stringWithFormat:@"%@/Library/Saved Application State/%s.savedState/restorecount.txt", NSHomeDirectory(), MACOSX_BUNDLE_IDENTIFIER] UTF8String]);
|
|
|
f325b2 |
|
|
|
f325b2 |
--
|
|
|
f325b2 |
2.12.0
|
|
|
f325b2 |
|