diff options
| author | Tor Lillqvist <tml@collabora.com> | 2020-03-24 09:12:07 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2020-03-24 10:10:04 +0100 |
| commit | 8a30ff491d562129097ff231267729316fda5b7a (patch) | |
| tree | e0963264f42b8ee69621a44635d95f091b8417fe /comphelper | |
| parent | 288e02549bed317730eff0d169f6bdb75c8f40ce (diff) | |
Simplify the LibreOfficeKit mobile phone and tablet API
There is not need to ever change the kind of device a view is for, so
why bother with the bool parameter to setMobilePhone() and
setTablet(). Also, make sure just either of them is called, at most
once, for a view.
Change-Id: I9ac872f0ab4772e4a7c40c49f62b32fa7b1e47f6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/90968
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'comphelper')
| -rw-r--r-- | comphelper/source/misc/lok.cxx | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/comphelper/source/misc/lok.cxx b/comphelper/source/misc/lok.cxx index 292de13effe3..ff8c40798f22 100644 --- a/comphelper/source/misc/lok.cxx +++ b/comphelper/source/misc/lok.cxx @@ -104,9 +104,11 @@ bool isActive() return g_bActive; } -void setMobilePhone(int nViewId, bool bIsMobilePhone) +void setMobilePhone(int nViewId) { - g_vIsViewMobilePhone[nViewId] = bIsMobilePhone; + assert(!isMobilePhone(nViewId)); + assert(!isTablet(nViewId)); + g_vIsViewMobilePhone[nViewId] = true; } bool isMobilePhone(int nViewId) @@ -117,9 +119,11 @@ bool isMobilePhone(int nViewId) return false; } -void setTablet(int nViewId, bool bIsTablet) +void setTablet(int nViewId) { - g_vIsViewTablet[nViewId] = bIsTablet; + assert(!isMobilePhone(nViewId)); + assert(!isTablet(nViewId)); + g_vIsViewTablet[nViewId] = true; } bool isTablet(int nViewId) |