summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--desktop/source/lib/init.cxx1
-rw-r--r--drawinglayer/source/processor2d/vclpixelprocessor2d.cxx1
-rw-r--r--i18npool/source/calendar/calendar_hijri.cxx2
-rw-r--r--include/android/compatibility.hxx2
-rw-r--r--include/sal/config.h3
-rw-r--r--oox/source/drawingml/textparagraph.cxx1
-rw-r--r--oox/source/drawingml/textparagraphpropertiescontext.cxx2
-rw-r--r--oox/source/export/drawingml.cxx1
-rw-r--r--sal/rtl/math.cxx1
-rw-r--r--sc/source/core/data/attrib.cxx1
-rw-r--r--sc/source/filter/excel/xetable.cxx1
-rw-r--r--sc/source/ui/unoobj/dapiuno.cxx1
-rw-r--r--vcl/source/gdi/CommonSalLayout.cxx1
-rw-r--r--vcl/unx/generic/gdi/cairotextrender.cxx1
-rw-r--r--writerfilter/source/rtftok/rtfsdrimport.cxx1
15 files changed, 4 insertions, 16 deletions
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 126861d7877a..468a145f31c6 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -95,7 +95,6 @@
#include <sfx2/sfxbasemodel.hxx>
#include <svl/undo.hxx>
#include <unotools/datetime.hxx>
-#include <android/compatibility.hxx>
#include <app.hxx>
diff --git a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
index 11b40ce4d56b..5d44610fef8d 100644
--- a/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclpixelprocessor2d.cxx
@@ -55,7 +55,6 @@
#include <vcl/window.hxx>
#include <svtools/borderhelper.hxx>
#include <editeng/borderline.hxx>
-#include <android/compatibility.hxx>
#include <com/sun/star/table/BorderLineStyle.hpp>
diff --git a/i18npool/source/calendar/calendar_hijri.cxx b/i18npool/source/calendar/calendar_hijri.cxx
index ad337d397ae0..bee72af7e7e3 100644
--- a/i18npool/source/calendar/calendar_hijri.cxx
+++ b/i18npool/source/calendar/calendar_hijri.cxx
@@ -23,8 +23,6 @@
#include <stdlib.h>
#include <math.h>
-#include <android/compatibility.hxx>
-
#include <calendar_hijri.hxx>
using namespace ::com::sun::star::uno;
diff --git a/include/android/compatibility.hxx b/include/android/compatibility.hxx
index 27c99f4f2604..a3fdb0d256b4 100644
--- a/include/android/compatibility.hxx
+++ b/include/android/compatibility.hxx
@@ -19,7 +19,7 @@
#include <math.h>
-#if defined(ANDROID) && defined(ARM)
+#if defined(ARM)
#include <string>
#include <sstream>
diff --git a/include/sal/config.h b/include/sal/config.h
index 31c19a34a18b..7fcdbfab45ad 100644
--- a/include/sal/config.h
+++ b/include/sal/config.h
@@ -22,6 +22,9 @@
#if defined LIBO_INTERNAL_ONLY
#include "config_global.h"
+#if defined ANDROID && defined __cplusplus
+#include <android/compatibility.hxx>
+#endif
#endif
#include <stdlib.h>
diff --git a/oox/source/drawingml/textparagraph.cxx b/oox/source/drawingml/textparagraph.cxx
index f63b73024824..8f1e5d1b061c 100644
--- a/oox/source/drawingml/textparagraph.cxx
+++ b/oox/source/drawingml/textparagraph.cxx
@@ -29,7 +29,6 @@
#include <com/sun/star/text/XTextCursor.hpp>
#include <com/sun/star/text/ControlCharacter.hpp>
#include <oox/token/properties.hxx>
-#include <android/compatibility.hxx>
using namespace ::com::sun::star::text;
using namespace ::com::sun::star::uno;
diff --git a/oox/source/drawingml/textparagraphpropertiescontext.cxx b/oox/source/drawingml/textparagraphpropertiescontext.cxx
index 5b7477a39a0c..fdc9c3f210a9 100644
--- a/oox/source/drawingml/textparagraphpropertiescontext.cxx
+++ b/oox/source/drawingml/textparagraphpropertiescontext.cxx
@@ -34,8 +34,6 @@
#include <oox/token/properties.hxx>
#include <oox/token/tokens.hxx>
-#include <android/compatibility.hxx>
-
using namespace ::oox::core;
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::xml::sax;
diff --git a/oox/source/export/drawingml.cxx b/oox/source/export/drawingml.cxx
index 3da6ad4f357e..5af5dce2d12f 100644
--- a/oox/source/export/drawingml.cxx
+++ b/oox/source/export/drawingml.cxx
@@ -101,7 +101,6 @@
#include <svx/unoapi.hxx>
#include <svx/unoshape.hxx>
#include <svx/EnhancedCustomShape2d.hxx>
-#include <android/compatibility.hxx>
using namespace ::css;
using namespace ::css::beans;
diff --git a/sal/rtl/math.cxx b/sal/rtl/math.cxx
index 18ece939e8d4..387ae3b2b4aa 100644
--- a/sal/rtl/math.cxx
+++ b/sal/rtl/math.cxx
@@ -30,7 +30,6 @@
#include <rtl/ustring.h>
#include <sal/mathconf.h>
#include <sal/types.h>
-#include <android/compatibility.hxx>
#include <algorithm>
#include <cassert>
diff --git a/sc/source/core/data/attrib.cxx b/sc/source/core/data/attrib.cxx
index cc614b28dbb6..29b1d92fd317 100644
--- a/sc/source/core/data/attrib.cxx
+++ b/sc/source/core/data/attrib.cxx
@@ -20,7 +20,6 @@
#include <com/sun/star/util/CellProtection.hpp>
#include <scitems.hxx>
-#include <android/compatibility.hxx>
#include <editeng/eeitem.hxx>
diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx
index 98127479cf95..7ca907dff18f 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -38,7 +38,6 @@
#include <thread>
#include <comphelper/threadpool.hxx>
#include <oox/export/utils.hxx>
-#include <android/compatibility.hxx>
using namespace ::oox;
diff --git a/sc/source/ui/unoobj/dapiuno.cxx b/sc/source/ui/unoobj/dapiuno.cxx
index 8a746ddbdc13..645d5f416e74 100644
--- a/sc/source/ui/unoobj/dapiuno.cxx
+++ b/sc/source/ui/unoobj/dapiuno.cxx
@@ -20,7 +20,6 @@
#include <algorithm>
#include <cmath>
-#include <android/compatibility.hxx>
#include <svl/hint.hxx>
#include <vcl/svapp.hxx>
diff --git a/vcl/source/gdi/CommonSalLayout.cxx b/vcl/source/gdi/CommonSalLayout.cxx
index ee3dceeeaa00..a8d57af26bf1 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -27,7 +27,6 @@
#include <limits>
#include <salgdi.hxx>
#include <unicode/uchar.h>
-#include <android/compatibility.hxx>
#if ENABLE_QT5
#include <qt5/Qt5Font.hxx>
diff --git a/vcl/unx/generic/gdi/cairotextrender.cxx b/vcl/unx/generic/gdi/cairotextrender.cxx
index e4314ea41243..86b700f7aa58 100644
--- a/vcl/unx/generic/gdi/cairotextrender.cxx
+++ b/vcl/unx/generic/gdi/cairotextrender.cxx
@@ -25,7 +25,6 @@
#include <vcl/sysdata.hxx>
#include <vcl/svapp.hxx>
#include <vcl/fontcharmap.hxx>
-#include <android/compatibility.hxx>
#include <unx/printergfx.hxx>
#include <unx/genpspgraphics.h>
diff --git a/writerfilter/source/rtftok/rtfsdrimport.cxx b/writerfilter/source/rtftok/rtfsdrimport.cxx
index c2037600e7be..89b587012ff3 100644
--- a/writerfilter/source/rtftok/rtfsdrimport.cxx
+++ b/writerfilter/source/rtftok/rtfsdrimport.cxx
@@ -42,7 +42,6 @@
#include <oox/helper/propertyset.hxx>
#include <boost/logic/tribool.hpp>
#include <basegfx/matrix/b2dhommatrix.hxx>
-#include <android/compatibility.hxx>
#include <dmapper/GraphicZOrderHelper.hxx>
#include "rtfdocumentimpl.hxx"
generated by cgit (git 2.34.1) at 2024-12-26 09:33:50 +0000