Skip to content

Commit 01824fd

Browse files
krkkalimpfard
authored andcommitted
Spreadsheet: Use TRY() on file load and save
1 parent ca42da2 commit 01824fd

File tree

2 files changed

+4
-12
lines changed

2 files changed

+4
-12
lines changed

Userland/Applications/Spreadsheet/Workbook.cpp

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,11 +57,7 @@ Result<bool, String> Workbook::open_file(Core::File& file)
5757
auto mime = Core::guess_mime_type_based_on_filename(file.filename());
5858

5959
// Make an import dialog, we might need to import it.
60-
auto result = ImportDialog::make_and_run_for(m_parent_window, mime, file, *this);
61-
if (result.is_error())
62-
return result.error();
63-
64-
m_sheets = result.release_value();
60+
m_sheets = TRY(ImportDialog::make_and_run_for(m_parent_window, mime, file, *this));
6561

6662
set_filename(file.filename());
6763

@@ -99,9 +95,7 @@ Result<bool, String> Workbook::save(StringView filename)
9995
}
10096

10197
// Make an export dialog, we might need to import it.
102-
auto result = ExportDialog::make_and_run_for(mime, *file, *this);
103-
if (result.is_error())
104-
return result.error();
98+
TRY(ExportDialog::make_and_run_for(mime, *file, *this));
10599

106100
set_filename(filename);
107101
set_dirty(false);

Userland/Applications/Spreadsheet/main.cpp

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
7171
window->show();
7272

7373
if (filename) {
74-
auto response = FileSystemAccessClient::Client::the().try_request_file_read_only_approved(window, filename);
75-
if (response.is_error())
76-
return 1;
77-
spreadsheet_widget.load_file(*response.value());
74+
auto file = TRY(FileSystemAccessClient::Client::the().try_request_file_read_only_approved(window, filename));
75+
spreadsheet_widget.load_file(file);
7876
}
7977

8078
return app->exec();

0 commit comments

Comments
 (0)