From 3f03c66d0d480afb21b69694599f8c45361147bf Mon Sep 17 00:00:00 2001
From: Thorsten Behrens <tbehrens@novell.com>
Date: Fri, 5 Nov 2010 16:14:29 +0100
Subject: Have Info.plist use LibO instead of OOo2 as creator

This fixed fdo#30569. There were several places where mac-specific
platform files had 'OOo2' hardcoded. Changed this to LibO.
---
 sysui/desktop/macosx/Info.plist  | 2 +-
 sysui/desktop/macosx/makefile.mk | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

(limited to 'sysui/desktop/macosx')

diff --git a/sysui/desktop/macosx/Info.plist b/sysui/desktop/macosx/Info.plist
index 6a3b27f07601..8100df25d2a1 100644
--- a/sysui/desktop/macosx/Info.plist
+++ b/sysui/desktop/macosx/Info.plist
@@ -1398,7 +1398,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleSignature</key>
-	<string>OOo2</string>
+	<string>LibO</string>
 	<key>LSRequiresCarbon</key>
 	<string>1</string>
 	<key>NSPrincipalClass</key>
diff --git a/sysui/desktop/macosx/makefile.mk b/sysui/desktop/macosx/makefile.mk
index 059b3b87bb46..9d551600d7d2 100644
--- a/sysui/desktop/macosx/makefile.mk
+++ b/sysui/desktop/macosx/makefile.mk
@@ -46,13 +46,8 @@ ZIP1TARGET = osxicons
 ZIP1DIR = ../icons
 ZIP1LIST := $(shell $(PERL) -w list_icons.pl < Info.plist)
 
-.IF "$(GUIBASE)"!="aqua"
-CREATOR_TYPE=OOo2
-EXECUTABLE=droplet
-.ELSE
-CREATOR_TYPE=OOO2
+CREATOR_TYPE=LIBO
 EXECUTABLE=soffice
-.ENDIF
 
 .IF "$(WITH_LANG)"!=""
 ULFDIR:=$(COMMONMISC)$/desktopshare
-- 
cgit v1.2.3