INTEGRATION: CWS wae4extensions (1.2.30); FILE MERGED

2007/12/25 23:06:09 ericb 1.2.30.3: #i81612# respect style
2007/12/25 23:05:11 ericb 1.2.30.2: #i81612# indent correctly
2007/12/25 22:56:15 ericb 1.2.30.1: #i81612# fix spotlight warnings, added in meantime

1 files changed, 12 insertions, 8 deletions

diff --git a/extensions/source/macosx/spotlight/OOoSpotlightImporter.m b/extensions/source/macosx/spotlight/OOoSpotlightImporter.m
index cba67b71f327..79efa346c1eb 100644
--- a/extensions/source/macosx/spotlight/OOoSpotlightImporter.m
+++ b/extensions/source/macosx/spotlight/OOoSpotlightImporter.m
@@ -4,9 +4,9 @@
 *
 *   $RCSfile: OOoSpotlightImporter.m,v $
 *
-*   $Revision: 1.2 $
+*   $Revision: 1.3 $
 *
-*   last change: $Author: kz $ $Date: 2007-10-09 15:05:20 $
+*   last change: $Author: ihi $ $Date: 2008-01-14 14:44:15 $
 *
 *   The Contents of this file are made available subject to
 *   the terms of GNU Lesser General Public License Version 2.1.
@@ -111,9 +111,11 @@ static NSDictionary *uti2kind;
     [metaData retain];
     
     OOoMetaDataParser *parser = [OOoMetaDataParser new];
-    //parse and extract the data
-    [parser parseXML:metaData into:attributes];
-    
+    if (parser != nil) {
+	//parse and extract the data
+	[parser parseXML:metaData intoDictionary:attributes];
+    }
+
     [metaData release];
     [parser release];
     
@@ -127,9 +129,11 @@ static NSDictionary *uti2kind;
     [contentData retain];
     
     OOoContentDataParser *parser2 = [OOoContentDataParser new];
-    //parse and extract the data
-    [parser2 parseXML:contentData into:attributes];
-    
+    if (parser2 != nil) {
+	//parse and extract the data
+	[parser2 parseXML:contentData intoDictionary:attributes];
+    }
+
     [contentData release];
     [parser2 release];