diff options
| author | Tor Lillqvist <tml@iki.fi> | 2013-03-23 19:06:58 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-03-26 18:45:04 +0200 |
| commit | 5a5c8e253abbef5626dab70f8978275ac3c742f8 (patch) | |
| tree | 86c65cdfbff8ea0140937dee1311f65619f9aaf7 /sw | |
| parent | 3ee3e7946c4a772fd13eada4b235479581190dce (diff) | |
Check feature test macros instead of ANDROID and/or IOS
Pass -DLIBO_FEATURE_FOO to compiler for some elements in BUILD_TYPE.
BUILD_TYPE has at least two kinds of elements: Those that indicate
building a bundled copy of some 3rd-party library, and those that
indicate some specific feature of the LibreOffice platform or
build-time configuration choice. This is for the latter kind.
Change many of the checks for Android and/or iOS in the source code to
check LIBO_FEATURE_DESKTOP, LIBO_FEATURE_HELP or DISABLE_EXTENSIONS
instead, in cases where that is what is meant, not Android or iOS
specifically.
Change-Id: I2cd3f3bb99e953c7754dcea76a426f8f9d61e4db
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/ui/uiview/viewport.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sw/source/ui/uiview/viewport.cxx b/sw/source/ui/uiview/viewport.cxx index 0a8ea0d19ff6..f488c652ccf8 100644 --- a/sw/source/ui/uiview/viewport.cxx +++ b/sw/source/ui/uiview/viewport.cxx @@ -1056,7 +1056,7 @@ void SwView::OuterResizePixel( const Point &rOfst, const Size &rSize ) return; m_bInOuterResizePixel = sal_True; -#if !defined(ANDROID) && !defined(IOS) +#ifdef LIBO_FEATURE_DESKTOP // feststellen, ob Scrollbars angezeigt werden duerfen sal_Bool bShowH = sal_True, bShowV = sal_True, @@ -1203,7 +1203,7 @@ void SwView::SetZoomFactor( const Fraction &rX, const Fraction &rY ) sal_Bool SwView::UpdateScrollbars() { -#if defined(ANDROID) || defined(IOS) +#ifndef LIBO_FEATURE_DESKTOP return sal_True; #else sal_Bool bRet = sal_False; |