From 6d3f21336846d7745e795202c99390832c4220c8 Mon Sep 17 00:00:00 2001 From: stuconnolly Date: Sat, 19 Mar 2011 15:05:23 +0000 Subject: Bring outline view branch up to date with trunk (r3235:r3245), which should resolve all warnings. --- Source/SPExportController.m | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) (limited to 'Source/SPExportController.m') diff --git a/Source/SPExportController.m b/Source/SPExportController.m index 04138c75..2780df54 100644 --- a/Source/SPExportController.m +++ b/Source/SPExportController.m @@ -246,29 +246,29 @@ static const NSString *SPTableViewDropColumnID = @"drop"; */ - (IBAction)export:(id)sender { - SPExportType exportType = SPSQLExport; - SPExportSource exportSource = SPTableExport; + SPExportType selectedExportType = SPSQLExport; + SPExportSource selectedExportSource = SPTableExport; - NSArray *tables = [tablesListInstance selectedTableItems]; + NSArray *selectedTables = [tablesListInstance selectedTableItems]; BOOL isCustomQuerySelected = ([tableDocumentInstance isCustomQuerySelected] && ([[customQueryInstance currentResult] count] > 1)); BOOL isContentSelected = ([[tableDocumentInstance selectedToolbarItemIdentifier] isEqualToString:SPMainToolbarTableContent] && ([[tableContentInstance currentResult] count] > 1)); if (isContentSelected) { - tables = nil; - exportType = SPCSVExport; - exportSource = SPFilteredExport; + selectedTables = nil; + selectedExportType = SPCSVExport; + selectedExportSource = SPFilteredExport; } else if (isCustomQuerySelected) { - tables = nil; - exportType = SPCSVExport; - exportSource = SPQueryExport; + selectedTables = nil; + selectedExportType = SPCSVExport; + selectedExportSource = SPQueryExport; } else { - tables = ([tables count]) ? tables : nil; + selectedTables = ([selectedTables count]) ? selectedTables : nil; } - [self exportTables:tables asFormat:exportType usingSource:exportSource]; + [self exportTables:selectedTables asFormat:selectedExportType usingSource:selectedExportSource]; // Ensure UI validation [self switchInput:exportInputPopUpButton]; -- cgit v1.2.3