Bring outline view branch up to date with trunk (r3203:r3224).

1 files changed, 4 insertions, 4 deletions

diff --git a/Source/SPCopyTable.m b/Source/SPCopyTable.m
index 3b84d867..b69f23a1 100644
--- a/Source/SPCopyTable.m
+++ b/Source/SPCopyTable.m
@@ -23,6 +23,7 @@
 //  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 #import <MCPKit/MCPKit.h>
+#import "MCPGeometryData.h"
 
 #import "SPCopyTable.h"
 #import "SPTableContent.h"
@@ -35,6 +36,8 @@
 #import "SPAlertSheets.h"
 #import "SPBundleHTMLOutputController.h"
 #import "SPGeometryDataView.h"
+#import "SPBundleEditorController.h"
+#import "SPAppController.h"
 
 NSInteger MENU_EDIT_COPY             = 2001;
 NSInteger MENU_EDIT_COPY_WITH_COLUMN = 2002;
@@ -157,7 +160,6 @@ NSInteger kBlobAsImageFile = 4;
 	// Loop through the rows, adding their descriptive contents
 	NSUInteger rowIndex = [selectedRows firstIndex];
 	NSString *nullString = [prefs objectForKey:SPNullValue];
-	NSStringEncoding connectionEncoding = [mySQLConnection encoding];
 	Class mcpGeometryData = [MCPGeometryData class];
 	NSUInteger rowCounter = 0;
 
@@ -296,7 +298,6 @@ NSInteger kBlobAsImageFile = 4;
 	// Loop through the rows, adding their descriptive contents
 	NSUInteger rowIndex = [selectedRows firstIndex];
 	NSString *nullString = [prefs objectForKey:SPNullValue];
-	NSStringEncoding connectionEncoding = [mySQLConnection encoding];
 	Class mcpGeometryData = [MCPGeometryData class];
 
 	NSUInteger rowCounter = 0;
@@ -699,7 +700,7 @@ NSInteger kBlobAsImageFile = 4;
 	NSUInteger allColumnWidths = 0;
 
 	// Determine the available size
-	NSScrollView *parentScrollView = [[self superview] superview];
+	NSScrollView *parentScrollView = (NSScrollView*)[[self superview] superview];
  	CGFloat visibleTableWidth = [parentScrollView bounds].size.width - [NSScroller scrollerWidth] - [columnDefinitions count] * 3.5;
 
 	for (NSDictionary *columnDefinition in columnDefinitions) {
@@ -1147,7 +1148,6 @@ NSInteger kBlobAsImageFile = 4;
 			NSString *cmd = [cmdData objectForKey:SPBundleFileCommandKey];
 			NSString *inputAction = @"";
 			NSString *inputFallBackAction = @"";
-			NSString *withBlobHandling = @"";
 			NSError *err = nil;
 			NSString *uuid = [NSString stringWithNewUUID];
 			NSString *bundleInputFilePath = [NSString stringWithFormat:@"%@_%@", SPBundleTaskInputFilePath, uuid];