Merge Wave39's changes

mochidev · Jan 21, 2015 · 699dbec · 699dbec
2 parents 1f740e9 + c78bde2
commit 699dbec
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/Classes/MDSpreadView.h b/Classes/MDSpreadView.h
@@ -175,8 +175,8 @@ extern NSString *MDSpreadViewSelectionDidChangeNotification __attribute__((unava
     NSMutableArray *columnSections;
     NSMutableArray *rowSections;
 
-    UIView *dummyView;
-    UIView *dummyViewB;
+//    UIView *dummyView;
+//    UIView *dummyViewB;
 
     CGSize dequeuedCellSizeHint;
     MDIndexPath *dequeuedCellRowIndexHint;

diff --git a/Classes/MDSpreadView.m b/Classes/MDSpreadView.m
@@ -3922,12 +3922,10 @@ - (void)_touchesEndedInCell:(MDSpreadViewCell *)cell
 
     MDSpreadViewSelectionMode resolvedSelectionMode = MDSpreadViewSelectionModeAutomatic;
 
-    BOOL override = NO;
     MDSortDescriptor *sortDescriptorPrototype = nil;
     if (_autoAllowSortableHeaderSelection) {
         if ([(MDSpreadViewHeaderCell *)cell respondsToSelector:@selector(sortDescriptorPrototype)] && [(MDSpreadViewHeaderCell *)cell sortDescriptorPrototype]) {
             sortDescriptorPrototype = [(MDSpreadViewHeaderCell *)cell sortDescriptorPrototype];
-            override = YES;
 
             resolvedSelectionMode = MDSpreadViewSelectionModeCell + sortDescriptorPrototype.sortAxis;
         }