[Libreoffice-commits] core.git: 3 commits - extensions/source

[Tor Lillqvist]

 extensions/source/macosx/spotlight/OOoContentDataParser.m |    1 -
 extensions/source/macosx/spotlight/OOoMetaDataParser.m    |    3 +--
 extensions/source/macosx/spotlight/OOoSpotlightImporter.m |    8 ++++----
 3 files changed, 5 insertions(+), 7 deletions(-)

New commits:
commit 62d8fea76ed4f0c97c6ef2bb78228e5904b72be1
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Jan 14 13:58:42 2014 +0200

    Fix indentation
    
    Change-Id: I93309674ef50e8ca7438874378fb01484bb7f9f3

diff --git a/extensions/source/macosx/spotlight/OOoSpotlightImporter.m b/extensions/source/macosx/spotlight/OOoSpotlightImporter.m
index 6302e95..dd599fb 100644
--- a/extensions/source/macosx/spotlight/OOoSpotlightImporter.m
+++ b/extensions/source/macosx/spotlight/OOoSpotlightImporter.m
@@ -405,8 +405,8 @@ NSData *getUncompressedData(NSFileHandle *file, NSString *name)
     
     OOoMetaDataParser *parser = [OOoMetaDataParser new];
     if (parser != nil) {
-	//parse and extract the data
-	[parser parseXML:metaData intoDictionary:attributes];
+        //parse and extract the data
+        [parser parseXML:metaData intoDictionary:attributes];
     }
 
     [metaData release];
@@ -423,8 +423,8 @@ NSData *getUncompressedData(NSFileHandle *file, NSString *name)
     
     OOoContentDataParser *parser2 = [OOoContentDataParser new];
     if (parser2 != nil) {
-	//parse and extract the data
-	[parser2 parseXML:contentData intoDictionary:attributes];
+        //parse and extract the data
+        [parser2 parseXML:contentData intoDictionary:attributes];
     }
 
     [contentData release];
commit c0796dfe213fe5be8abaf8f102b8e925c55a5cda
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Jan 14 13:57:11 2014 +0200

    Avoid use of nonexistent variable evem in commented-out code
    
    Change-Id: Icc9def55a814fc1309ce143a84effc140a90a92b

diff --git a/extensions/source/macosx/spotlight/OOoContentDataParser.m b/extensions/source/macosx/spotlight/OOoContentDataParser.m
index 8c8d81f..07368ae 100644
--- a/extensions/source/macosx/spotlight/OOoContentDataParser.m
+++ b/extensions/source/macosx/spotlight/OOoContentDataParser.m
@@ -112,7 +112,6 @@
     
     [runningTextContent appendString:string];
     
-    //NSLog(@"currentElement: %@", currentElement);
     //NSLog(@"read: %@", string);
     
 }
diff --git a/extensions/source/macosx/spotlight/OOoMetaDataParser.m b/extensions/source/macosx/spotlight/OOoMetaDataParser.m
index 0f1bad9..34e3652 100644
--- a/extensions/source/macosx/spotlight/OOoMetaDataParser.m
+++ b/extensions/source/macosx/spotlight/OOoMetaDataParser.m
@@ -72,7 +72,6 @@ static NSDictionary *metaXML2MDIKeys;
 {
     if ((self = [super init]) != nil) {
         shouldReadCharacters = NO;
-//        currentElement = nil;
         textCurrentElement = nil;
         
         return self;
commit 9e5695543498b71780e73fcf5c18e93487fbd100
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Jan 14 13:53:03 2014 +0200

    fdo#47689: Avoid crashing mdworker: Don't use uninitialized variable
    
    It's the isCustom field that should be checked to see whether the
    customAttribute field has been assigned or not.
    
    Change-Id: I5d2af26b675ab0cbc0e1844eb98ebaf5145eb73d

diff --git a/extensions/source/macosx/spotlight/OOoMetaDataParser.m b/extensions/source/macosx/spotlight/OOoMetaDataParser.m
index a6ce40a..0f1bad9 100644
--- a/extensions/source/macosx/spotlight/OOoMetaDataParser.m
+++ b/extensions/source/macosx/spotlight/OOoMetaDataParser.m
@@ -172,7 +172,7 @@ static NSDictionary *metaXML2MDIKeys;
         }
         // cleanup part 1
         [textCurrentElement release];
-        if (customAttribute != nil) {
+        if (isCustom == YES) {
             [customAttribute release];
         }
     }