diff options
| -rw-r--r-- | sw/source/core/crsr/crsrsh.cxx | 6 | ||||
| -rw-r--r-- | sw/source/core/crsr/viscrs.cxx | 7 | ||||
| -rw-r--r-- | vcl/source/window/dialog.cxx | 24 |
3 files changed, 13 insertions, 24 deletions
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx index 980c278afdf6..73ed40eec1f0 100644 --- a/sw/source/core/crsr/crsrsh.cxx +++ b/sw/source/core/crsr/crsrsh.cxx @@ -2115,7 +2115,8 @@ void SwCrsrShell::ShowCrsr() m_bSVCrsrVis = true; m_pCurCrsr->SetShowTxtInputFldOverlay( true ); #if defined(ANDROID) || defined(IOS) - touch_ui_show_keyboard(); + // This was dummied out both for Android and for TiledLibreOffice (iOS) anyway + // touch_ui_show_keyboard(); #endif UpdateCrsr(); } @@ -2131,7 +2132,8 @@ void SwCrsrShell::HideCrsr() m_pCurCrsr->SetShowTxtInputFldOverlay( false ); m_pVisCrsr->Hide(); #if defined(ANDROID) || defined(IOS) - touch_ui_hide_keyboard(); + // This was dummied out both for Android and for TiledLibreOffice (iOS) anyway + // touch_ui_hide_keyboard(); #endif } } diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx index 9489cba6fc04..35b60a3a5ead 100644 --- a/sw/source/core/crsr/viscrs.cxx +++ b/sw/source/core/crsr/viscrs.cxx @@ -331,12 +331,15 @@ void SwSelPaintRects::Show() #endif } // GetShell returns a SwCrsrShell which actually is a SwWrtShell - touch_ui_selection_start(MLOSelectionText, pWrtShell, rects, size(), NULL); + + // touch_ui_selection_start() was dummy both in TiledLibreOffice (iOS) and for Android + // touch_ui_selection_start(MLOSelectionText, pWrtShell, rects, size(), NULL); } } else { - touch_ui_selection_none(); + // touch_ui_selection_none was dummy both in TiledLibreOffice (iOS) and for Android + // touch_ui_selection_none(); } #endif } 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 } |