[Libreoffice-commits] .: Branch 'libreoffice-3-3' - fpicker/source sysui/desktop

[Thorsten Behrens]

 fpicker/source/aqua/SalAquaConstants.h |    2 +-
 sysui/desktop/macosx/Info.plist        |    2 +-
 sysui/desktop/macosx/makefile.mk       |    7 +------
 3 files changed, 3 insertions(+), 8 deletions(-)

New commits:
commit b8ff3cec54df8358e6ee7ff77c8bfc260ca5c938
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Fri Nov 5 16:14:29 2010 +0100

    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.
    (cherry picked from commit 5e0f68b58ba958dedf2ead621c9632b806155ee1)

diff --git a/fpicker/source/aqua/SalAquaConstants.h b/fpicker/source/aqua/SalAquaConstants.h
index d986c91..30db99b 100644
--- a/fpicker/source/aqua/SalAquaConstants.h
+++ b/fpicker/source/aqua/SalAquaConstants.h
@@ -29,7 +29,7 @@
 #ifndef _SALAQUACONSTANTS_H_
 #define _SALAQUACONSTANTS_H_
 
-#define kAppFourCharCode 'OOo2'
+#define kAppFourCharCode 'LibO'
 #define kControlPropertyTracking 'Trck'
 #define kControlPropertyLastPartCode 'LsPc'
 #define kControlPropertySubType 'SuTy'
diff --git a/sysui/desktop/macosx/Info.plist b/sysui/desktop/macosx/Info.plist
index 6a3b27f..8100df2 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 059b3b8..9d55160 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