Kaydet (Commit) f70467ab authored tarafından Tor Lillqvist's avatar Tor Lillqvist

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
<touch/touch.h> and the older Writer-specific tiled rendering API.

Change-Id: I602a1ebd58ec2c8d6b2d170d65e157d91e0bf521
üst 607cc768
...@@ -2115,7 +2115,8 @@ void SwCrsrShell::ShowCrsr() ...@@ -2115,7 +2115,8 @@ void SwCrsrShell::ShowCrsr()
m_bSVCrsrVis = true; m_bSVCrsrVis = true;
m_pCurCrsr->SetShowTxtInputFldOverlay( true ); m_pCurCrsr->SetShowTxtInputFldOverlay( true );
#if defined(ANDROID) || defined(IOS) #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 #endif
UpdateCrsr(); UpdateCrsr();
} }
...@@ -2131,7 +2132,8 @@ void SwCrsrShell::HideCrsr() ...@@ -2131,7 +2132,8 @@ void SwCrsrShell::HideCrsr()
m_pCurCrsr->SetShowTxtInputFldOverlay( false ); m_pCurCrsr->SetShowTxtInputFldOverlay( false );
m_pVisCrsr->Hide(); m_pVisCrsr->Hide();
#if defined(ANDROID) || defined(IOS) #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 #endif
} }
} }
......
...@@ -331,12 +331,15 @@ void SwSelPaintRects::Show() ...@@ -331,12 +331,15 @@ void SwSelPaintRects::Show()
#endif #endif
} }
// GetShell returns a SwCrsrShell which actually is a SwWrtShell // 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 else
{ {
touch_ui_selection_none(); // touch_ui_selection_none was dummy both in TiledLibreOffice (iOS) and for Android
// touch_ui_selection_none();
} }
#endif #endif
} }
......
...@@ -868,26 +868,10 @@ short Dialog::Execute() ...@@ -868,26 +868,10 @@ short Dialog::Execute()
break; break;
} }
MLODialogResult result = touch_ui_dialog_modal(kind, ImplGetDialogText(this).getStr()); // 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.
switch (result) // MLODialogResult result = touch_ui_dialog_modal(kind, ImplGetDialogText(this).getStr());
{ return RET_OK;
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;
}
#endif #endif
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment