avmedia/Module_avmedia.mk | 2 ++ extensions/source/macosx/spotlight/OOoContentDataParser.m | 6 +++--- extensions/source/macosx/spotlight/OOoMetaDataParser.m | 6 +++--- 3 files changed, 8 insertions(+), 6 deletions(-)
New commits: commit 7b7c28f9bd39551211e44b601eccf93e82e1ff8a Author: Tor Lillqvist <[email protected]> Date: Fri Sep 21 09:39:40 2012 +0300 WaE: format (64-bit) Change-Id: Idc7179f393da9e97a86ca910eff15697f094ece1 diff --git a/extensions/source/macosx/spotlight/OOoContentDataParser.m b/extensions/source/macosx/spotlight/OOoContentDataParser.m index 9d957c3..558653f 100644 --- a/extensions/source/macosx/spotlight/OOoContentDataParser.m +++ b/extensions/source/macosx/spotlight/OOoContentDataParser.m @@ -135,9 +135,9 @@ typedef int NSColorRenderingIntent; - (void)parser:(NSXMLParser *)parser parseErrorOccurred:(NSError *)parseError { //NSLog(@"parsing finished with error"); - NSLog(@"An error occurred parsing the document. (Error %i, Description: %@, Line: %i, Column: %i)", [parseError code], - [[parser parserError] localizedDescription], [parser lineNumber], - [parser columnNumber]); + NSLog(@"An error occurred parsing the document. (Error %li, Description: %@, Line: %li, Column: %li)", (long) [parseError code], + [[parser parserError] localizedDescription], (long) [parser lineNumber], + (long) [parser columnNumber]); if (runningTextContent != nil) { [runningTextContent release]; diff --git a/extensions/source/macosx/spotlight/OOoMetaDataParser.m b/extensions/source/macosx/spotlight/OOoMetaDataParser.m index d878f80..ae4f166 100644 --- a/extensions/source/macosx/spotlight/OOoMetaDataParser.m +++ b/extensions/source/macosx/spotlight/OOoMetaDataParser.m @@ -215,9 +215,9 @@ static NSDictionary *metaXML2MDIKeys; - (void)parser:(NSXMLParser *)parser parseErrorOccurred:(NSError *)parseError { //NSLog(@"parsing finished with error"); - NSLog(@"Error %i, Description: %@, Line: %i, Column: %i", [parseError code], - [[parser parserError] localizedDescription], [parser lineNumber], - [parser columnNumber]); + NSLog(@"Error %li, Description: %@, Line: %li, Column: %li", (long) [parseError code], + [[parser parserError] localizedDescription], (long) [parser lineNumber], + (long) [parser columnNumber]); } @end commit ff4f54eed2549eb65e9dbc9b7253dee298fec345 Author: Tor Lillqvist <[email protected]> Date: Fri Sep 21 08:13:52 2012 +0300 No 64-bit Quicktime framework Change-Id: Ie0b9ae2a908814eed43b351f15436a2b9c5ad484 diff --git a/avmedia/Module_avmedia.mk b/avmedia/Module_avmedia.mk index ef50457..115ee13 100644 --- a/avmedia/Module_avmedia.mk +++ b/avmedia/Module_avmedia.mk @@ -47,10 +47,12 @@ $(eval $(call gb_Module_add_targets,avmedia,\ endif ifeq ($(GUIBASE),aqua) +ifneq ($(BITNESS_OVERRIDE),64) $(eval $(call gb_Module_add_targets,avmedia,\ Library_avmediaQuickTime \ )) endif +endif ifeq ($(OS),WNT) ifneq ($(ENABLE_DIRECTX),) _______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
