[Libreoffice-commits] core.git: chart2/source configure.ac sfx2/source

[Sarper Akdemir (via logerrit)]

 chart2/source/controller/main/ChartController.cxx |    6 ++++++
 configure.ac                                      |    2 +-
 sfx2/source/control/thumbnailview.cxx             |    6 ++++++
 3 files changed, 13 insertions(+), 1 deletion(-)

New commits:
commit 971425f9b7613183a565e9b4ec5792b3f67bb133
Author:     Sarper Akdemir <sarper.akdemir.ext...@allotropia.de>
AuthorDate: Fri Sep 15 23:30:42 2023 +0300
Commit:     Sarper Akdemir <sarper.akdemir.ext...@allotropia.de>
CommitDate: Mon Sep 18 19:56:50 2023 +0200

    fix emscripten build
    
    Change-Id: I15df992e410f741a22d1f140b85e57a97195a5f6
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157020
    Tested-by: Jenkins
    Reviewed-by: Sarper Akdemir <sarper.akdemir.ext...@allotropia.de>

diff --git a/chart2/source/controller/main/ChartController.cxx 
b/chart2/source/controller/main/ChartController.cxx
index 7e33f4b0ccef..b4be568b5133 100644
--- a/chart2/source/controller/main/ChartController.cxx
+++ b/chart2/source/controller/main/ChartController.cxx
@@ -1528,6 +1528,7 @@ uno::Reference< XAccessible > 
ChartController::CreateAccessible()
 
 void ChartController::impl_invalidateAccessible()
 {
+#if !ENABLE_WASM_STRIP_ACCESSIBILITY
     SolarMutexGuard aGuard;
     auto pChartWindow(GetChartWindow());
     if( pChartWindow )
@@ -1539,9 +1540,11 @@ void ChartController::impl_invalidateAccessible()
             dynamic_cast<AccessibleChartView&>(*xInit).initialize();
         }
     }
+#endif
 }
 void ChartController::impl_initializeAccessible()
 {
+#if !ENABLE_WASM_STRIP_ACCESSIBILITY
     SolarMutexGuard aGuard;
     auto pChartWindow(GetChartWindow());
     if( !pChartWindow )
@@ -1549,9 +1552,11 @@ void ChartController::impl_initializeAccessible()
     Reference< XInterface > xInit( pChartWindow->GetAccessible(false) );
     if(xInit.is())
         impl_initializeAccessible( dynamic_cast<AccessibleChartView&>(*xInit) 
);
+#endif
 }
 void ChartController::impl_initializeAccessible( AccessibleChartView& 
rAccChartView )
 {
+#if !ENABLE_WASM_STRIP_ACCESSIBILITY
     uno::Reference< XAccessible > xParent;
     {
         SolarMutexGuard aGuard;
@@ -1565,6 +1570,7 @@ void ChartController::impl_initializeAccessible( 
AccessibleChartView& rAccChartV
     }
 
     rAccChartView.initialize(*this, getChartModel(), m_xChartView, xParent, 
m_xViewWindow);
+#endif
 }
 
 const o3tl::sorted_vector< OUString >& 
ChartController::impl_getAvailableCommands()
diff --git a/configure.ac b/configure.ac
index 899724df2547..0cebc8b88925 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3048,7 +3048,7 @@ fi
 # also work with the default gtk3 plugin.
 if test "$enable_wasm_strip" = "yes"; then
     enable_avmedia=no
-    enable_cmis=no
+    enable_libcmis=no
     enable_coinmp=no
     enable_cups=no
     test "$_os" = Emscripten && enable_curl=no
diff --git a/sfx2/source/control/thumbnailview.cxx 
b/sfx2/source/control/thumbnailview.cxx
index 65bc3d878df0..2d4e8bb57611 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include <config_wasm_strip.h>
+
 #include <sfx2/thumbnailview.hxx>
 #include <sfx2/thumbnailviewitem.hxx>
 
@@ -40,7 +42,9 @@
 #include <com/sun/star/embed/XStorage.hpp>
 
 #include <memory>
+#if !ENABLE_WASM_STRIP_RECENT
 #include "recentdocsviewitem.hxx"
+#endif
 
 using namespace basegfx;
 using namespace basegfx::utils;
@@ -416,6 +420,7 @@ void ThumbnailView::CalculateItemPositions(bool 
bScrollBarUsed)
     {
         ThumbnailViewItem *const pItem = mFilteredItemList[i];
 
+#if !ENABLE_WASM_STRIP_RECENT
         // tdf#38742 - show pinned items in a separate line
         if (auto const pRecentDocsItem = 
dynamic_cast<RecentDocsViewItem*>(pItem))
         {
@@ -431,6 +436,7 @@ void ThumbnailView::CalculateItemPositions(bool 
bScrollBarUsed)
                 nCurCount = 0;
             }
         }
+#endif
 
         if ((nCurCount >= nFirstItem) && (nCurCount < nLastItem))
         {