diff options
| author | Thorsten Behrens <tbehrens@novell.com> | 2010-11-05 16:14:29 +0100 |
|---|---|---|
| committer | Thorsten Behrens <tbehrens@novell.com> | 2010-11-05 16:16:58 +0100 |
| commit | 3f03c66d0d480afb21b69694599f8c45361147bf (patch) | |
| tree | 42ab0fcb40c94f423ca7d675283664eb9cc9be82 | |
| parent | 06beaacf3d80d37d37570314642973b8f7673936 (diff) | |
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.
| -rw-r--r-- | fpicker/source/aqua/SalAquaConstants.h | 2 | ||||
| -rw-r--r-- | sysui/desktop/macosx/Info.plist | 2 | ||||
| -rw-r--r-- | sysui/desktop/macosx/makefile.mk | 7 |
3 files changed, 3 insertions, 8 deletions
diff --git a/fpicker/source/aqua/SalAquaConstants.h b/fpicker/source/aqua/SalAquaConstants.h index 7610e13363e5..7a1ecd353abe 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 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 |