From f70467ab48397e31db39daf946f092f9aec732cd Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Tue, 3 Feb 2015 10:18:01 +0100 Subject: Don't call touch_ui_*() API that are no-ops anyway Theiry implementations were empty both for iOS (well, TiledLibreOffice, our iOS test viewer app, anyway) and Android. Part of work to make TiledLibreOffice use LibreOffieKit instead of and the older Writer-specific tiled rendering API. Change-Id: I602a1ebd58ec2c8d6b2d170d65e157d91e0bf521 --- vcl/source/window/dialog.cxx | 24 ++++-------------------- 1 file changed, 4 insertions(+), 20 deletions(-) (limited to 'vcl/source/window/dialog.cxx') diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index a5b9b8fcf312..78a95f09305b 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -868,26 +868,10 @@ short Dialog::Execute() break; } - MLODialogResult result = touch_ui_dialog_modal(kind, ImplGetDialogText(this).getStr()); - - switch (result) - { - case MLODialogOK: - return RET_OK; - case MLODialogCancel: - return RET_CANCEL; - case MLODialogNo: - return RET_NO; - case MLODialogYes: - return RET_YES; - case MLODialogRetry: - return RET_RETRY; - case MLODialogIgnore: - return RET_IGNORE; - default: - SAL_WARN("vcl", "Dialog::Execute: Unhandled dialog result %d" << result); - return RET_OK; - } + // touch_ui_dialog_modal was dummied out both for Android and iOS (well, TiledLibreOffice anyway) + // For Android it returned MLODialogOK always, for iOS Cancel. Let's go with OK. + // MLODialogResult result = touch_ui_dialog_modal(kind, ImplGetDialogText(this).getStr()); + return RET_OK; #endif } -- cgit