diff --git a/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx b/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx
index 62e0feece40b..3c3b46bfd6eb 100644
--- a/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_arm/share.hxx
@@ -67,7 +67,7 @@ namespace __cxxabiv1 {
         std::type_info *exceptionType;
         void (*exceptionDestructor)(void *);
 
-        std::unexpected_handler unexpectedHandler;
+        void (*unexpectedHandler)(); // std::unexpected_handler dropped from C++17
         std::terminate_handler terminateHandler;
 
         __cxa_exception *nextException;
diff --git a/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx b/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx
index 7b0743eec32c..307f12a8a922 100644
--- a/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx
+++ b/bridges/source/cpp_uno/gcc3_linux_intel/share.hxx
@@ -45,7 +45,7 @@ struct __cxa_exception
     std::type_info *exceptionType;
     void (*exceptionDestructor)(void *);
 
-    std::unexpected_handler unexpectedHandler;
+    void (*unexpectedHandler)(); // std::unexpected_handler dropped from C++17
     std::terminate_handler terminateHandler;
 
     __cxa_exception *nextException;
diff --git a/distro-configs/LibreOfficeAndroid.conf b/distro-configs/LibreOfficeAndroid.conf
index 2e6d4e6382a9..9cc574909d66 100644
--- a/distro-configs/LibreOfficeAndroid.conf
+++ b/distro-configs/LibreOfficeAndroid.conf
@@ -8,5 +8,4 @@
 --without-export-validation
 --without-helppack-integration
 --without-junit
---disable-c++17
 --disable-largefile
diff --git a/distro-configs/LibreOfficeAndroidX86.conf b/distro-configs/LibreOfficeAndroidX86.conf
index 4e25bc58b0bd..7a2586989391 100644
--- a/distro-configs/LibreOfficeAndroidX86.conf
+++ b/distro-configs/LibreOfficeAndroidX86.conf
@@ -8,5 +8,4 @@
 --without-export-validation
 --without-helppack-integration
 --without-junit
---disable-c++17
 --disable-largefile