[Libreoffice-commits] core.git: Branch 'feature/wasm' - basctl/Library_basctl.mk chart2/Library_chartcontroller.mk config_host.mk.in desktop/Module_desktop.mk editeng/Library_editeng.mk filter/source include/svx postprocess/Rdb_services.mk RepositoryExternal.mk Repository.mk RepositoryModule_host.mk sd/Library_sd.mk sfx2/Library_sfx.mk solenv/gbuild static/Library_components.mk svx/Library_svx.mk svx/source sw/inc sw/Library_sw.mk sw/source toolkit/source unotools/Library_utl.mk vcl/source
Armin Le Grand (Allotropia) (via logerrit)
logerrit at kemper.freedesktop.org
Thu May 13 13:15:03 UTC 2021
Repository.mk | 16 +++++++++-
RepositoryExternal.mk | 8 ++---
RepositoryModule_host.mk | 7 ++++
basctl/Library_basctl.mk | 5 +++
chart2/Library_chartcontroller.mk | 5 +++
config_host.mk.in | 2 +
desktop/Module_desktop.mk | 2 +
editeng/Library_editeng.mk | 5 +++
filter/source/pdf/impdialog.cxx | 4 ++
include/svx/charmap.hxx | 8 ++++-
include/svx/dlgctrl.hxx | 8 +++++
include/svx/frmsel.hxx | 6 ++--
include/svx/graphctl.hxx | 4 ++
include/svx/searchcharmap.hxx | 2 +
include/svx/weldeditview.hxx | 7 +++-
postprocess/Rdb_services.mk | 9 +++++-
sd/Library_sd.mk | 29 +++++++++++--------
sfx2/Library_sfx.mk | 5 +++
solenv/gbuild/gbuild.mk | 1
static/Library_components.mk | 33 +++++++++++++++++++++-
svx/Library_svx.mk | 7 ++++
svx/source/dialog/charmap.cxx | 8 +++++
svx/source/dialog/dlgctrl.cxx | 20 +++++++++++++
svx/source/dialog/frmsel.cxx | 22 +++++++++++++--
svx/source/dialog/graphctl.cxx | 7 ++++
svx/source/dialog/searchcharmap.cxx | 2 +
svx/source/dialog/weldeditview.cxx | 12 ++++++++
svx/source/inc/frmselimpl.hxx | 2 +
sw/Library_sw.mk | 11 +++++--
sw/inc/AnnotationWin.hxx | 2 +
sw/inc/PostItMgr.hxx | 2 +
sw/inc/docsh.hxx | 2 +
sw/inc/view.hxx | 3 ++
sw/inc/viewsh.hxx | 5 ++-
sw/source/core/crsr/crsrsh.cxx | 6 ++++
sw/source/core/docnode/ndsect.cxx | 4 ++
sw/source/core/docnode/ndtbl.cxx | 4 ++
sw/source/core/docnode/node.cxx | 4 ++
sw/source/core/draw/dview.cxx | 10 ++++++
sw/source/core/inc/viewimp.hxx | 11 ++++++-
sw/source/core/layout/anchoreddrawobject.cxx | 2 +
sw/source/core/layout/fly.cxx | 24 +++++++++++++---
sw/source/core/layout/flylay.cxx | 8 +++++
sw/source/core/layout/frmtool.cxx | 10 ++++++
sw/source/core/layout/layact.cxx | 2 +
sw/source/core/layout/pagechg.cxx | 6 ++--
sw/source/core/layout/sectfrm.cxx | 4 ++
sw/source/core/layout/ssfrm.cxx | 2 +
sw/source/core/layout/tabfrm.cxx | 15 ++++++++--
sw/source/core/layout/wsfrm.cxx | 12 ++++++++
sw/source/core/text/frmform.cxx | 5 +++
sw/source/core/text/txtfrm.cxx | 6 ++++
sw/source/core/txtnode/txtedt.cxx | 2 +
sw/source/core/view/pagepreviewlayout.cxx | 2 +
sw/source/core/view/viewimp.cxx | 4 ++
sw/source/core/view/viewpg.cxx | 4 ++
sw/source/core/view/viewsh.cxx | 10 ++++++
sw/source/filter/ww8/docxexport.cxx | 2 +
sw/source/uibase/app/apphdl.cxx | 38 ++++++++++++++++++--------
sw/source/uibase/app/docst.cxx | 2 +
sw/source/uibase/docvw/AnnotationWin.cxx | 4 ++
sw/source/uibase/docvw/AnnotationWin2.cxx | 6 ++++
sw/source/uibase/docvw/PostItMgr.cxx | 2 +
sw/source/uibase/docvw/SidebarTxtControl.cxx | 2 +
sw/source/uibase/docvw/edtwin.cxx | 6 ++++
sw/source/uibase/inc/edtwin.hxx | 2 +
sw/source/uibase/inc/pview.hxx | 4 ++
sw/source/uibase/shells/basesh.cxx | 2 +
sw/source/uibase/uiview/pview.cxx | 4 ++
sw/source/uibase/uiview/view.cxx | 2 +
sw/source/uibase/uiview/view0.cxx | 2 +
toolkit/source/helper/accessibilityclient.cxx | 6 ++++
unotools/Library_utl.mk | 7 +++-
vcl/source/helper/svtaccessiblefactory.cxx | 6 ++++
74 files changed, 464 insertions(+), 61 deletions(-)
New commits:
commit eeebc1383df75c174adddb4d91c4c63d1e24302b
Author: Armin Le Grand (Allotropia) <Armin.Le.Grand at me.com>
AuthorDate: Thu May 13 15:11:25 2021 +0200
Commit: Armin Le Grand (Allotropia) <Armin.Le.Grand at me.com>
CommitDate: Thu May 13 15:11:25 2021 +0200
Wasm optional accessibility removal
Using flag ENABLE_WASM_STRIP_ACCESSIBILITY. Had some problems
with linking against UNO API loader ($(gb_CPPU_ENV)_uno)
used for target unoapploader/CPPU_ENV_uno_ext_getMapping,
see comment at static/CustomTarget_components.mk
Change-Id: I87dfaeac440fd2fcf251bc2de0863d384b38d5c4
diff --git a/Repository.mk b/Repository.mk
index de51ed78db35..b49195566d6b 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -92,6 +92,12 @@ $(eval $(call gb_Helper_register_executables_for_install,SDK,sdk, \
$(if $(filter ODK,$(BUILD_TYPE)),uno-skeletonmaker) \
))
+ifneq ($(ENABLE_WASM_STRIP_ACCESSIBILITY),TRUE)
+$(eval $(call gb_Helper_register_executables_for_install,OOO,brand, \
+ $(if $(filter-out ANDROID HAIKU iOS MACOSX WNT,$(OS)),oosplash) \
+))
+endif
+
$(eval $(call gb_Helper_register_executables_for_install,OOO,brand, \
$(if $(ENABLE_ONLINE_UPDATE_MAR),\
mar \
@@ -145,7 +151,6 @@ $(eval $(call gb_Helper_register_executables_for_install,OOO,brand, \
$(call gb_Helper_optional,FUZZERS,mtpfuzzer) \
$(call gb_Helper_optional,FUZZERS,htmlfuzzer) \
$(call gb_Helper_optional,FUZZERS,sftfuzzer) \
- $(if $(filter-out ANDROID HAIKU iOS MACOSX WNT,$(OS)),oosplash) \
soffice_bin \
$(if $(filter DESKTOP,$(BUILD_TYPE)),unopkg_bin) \
$(if $(filter WNT,$(OS)), \
@@ -619,6 +624,14 @@ $(eval $(call gb_Helper_register_plugins_for_install,PRIVATELIBS_URE,ure, \
sal_textenc \
))
+ifneq ($(ENABLE_WASM_STRIP_ACCESSIBILITY),TRUE)
+$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
+ $(if $(filter WNT,$(OS)), \
+ winaccessibility \
+ ) \
+))
+endif
+
$(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
$(if $(ENABLE_GSTREAMER_1_0),avmediagst) \
$(if $(filter WNT,$(OS)),avmediawin) \
@@ -670,7 +683,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo, \
fps \
inprocserv \
UAccCOM \
- winaccessibility \
) \
))
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 03210fb3bb7a..8cfd50971a0e 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -2862,6 +2862,8 @@ endif # SYSTEM_POPPLER
endif # ENABLE_POPPLER
+ifneq ($(ENABLE_WASM_STRIP_CLUCENE),TRUE)
+
ifneq ($(SYSTEM_CLUCENE),)
define gb_LinkTarget__use_clucene
@@ -2874,11 +2876,9 @@ $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
)
-ifneq ($(ENABLE_WASM_STRIP_CLUCENE),TRUE)
$(call gb_LinkTarget_add_libs,$(1),\
$(CLUCENE_LIBS) \
)
-endif
endef
@@ -2892,11 +2892,9 @@ $(call gb_LinkTarget_set_include,$(1),\
$$(INCLUDE) \
)
-ifneq ($(ENABLE_WASM_STRIP_CLUCENE),TRUE)
$(call gb_LinkTarget_use_libraries,$(1),\
clucene \
)
-endif
endef
@@ -2906,6 +2904,8 @@ $(eval $(call gb_Helper_register_libraries_for_install,PLAINLIBS_OOO,ooo,\
endif # SYSTEM_CLUCENE
+endif # ENABLE_WASM_STRIP_CLUCENE
+
define gb_LinkTarget__use_gobject
$(call gb_LinkTarget_add_libs,$(1),\
$(GOBJECT_LIBS) \
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 817d6e077503..b2060ab23305 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -48,8 +48,14 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
))
endif
+ifneq ($(ENABLE_WASM_STRIP_ACCESSIBILITY),TRUE)
$(eval $(call gb_Module_add_moduledirs,libreoffice,\
accessibility \
+ winaccessibility \
+))
+endif
+
+$(eval $(call gb_Module_add_moduledirs,libreoffice,\
android \
animations \
apple_remote \
@@ -165,7 +171,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
vbahelper \
vcl \
wasm-qt \
- winaccessibility \
wizards \
writerfilter \
writerperfect \
diff --git a/basctl/Library_basctl.mk b/basctl/Library_basctl.mk
index f874dfe9cc54..122ae4a909a3 100644
--- a/basctl/Library_basctl.mk
+++ b/basctl/Library_basctl.mk
@@ -62,9 +62,14 @@ $(eval $(call gb_Library_use_libraries,basctl,\
xmlscript \
))
+ifneq ($(ENABLE_WASM_STRIP_ACCESSIBILITY),TRUE)
$(eval $(call gb_Library_add_exception_objects,basctl,\
basctl/source/accessibility/accessibledialogcontrolshape \
basctl/source/accessibility/accessibledialogwindow \
+))
+endif
+
+$(eval $(call gb_Library_add_exception_objects,basctl,\
basctl/source/basicide/basdoc \
basctl/source/basicide/IDEComboBox \
basctl/source/basicide/basicrenderable \
diff --git a/chart2/Library_chartcontroller.mk b/chart2/Library_chartcontroller.mk
index 05f031415213..7eddba17f348 100644
--- a/chart2/Library_chartcontroller.mk
+++ b/chart2/Library_chartcontroller.mk
@@ -52,6 +52,7 @@ $(eval $(call gb_Library_use_libraries,chartcontroller,\
$(eval $(call gb_Library_set_componentfile,chartcontroller,chart2/source/controller/chartcontroller))
+ifneq ($(ENABLE_WASM_STRIP_ACCESSIBILITY),TRUE)
$(eval $(call gb_Library_add_exception_objects,chartcontroller,\
chart2/source/controller/accessibility/AccessibleBase \
chart2/source/controller/accessibility/AccessibleChartElement \
@@ -60,6 +61,10 @@ $(eval $(call gb_Library_add_exception_objects,chartcontroller,\
chart2/source/controller/accessibility/AccessibleTextHelper \
chart2/source/controller/accessibility/AccessibleViewForwarder \
chart2/source/controller/accessibility/ChartElementFactory \
+))
+endif
+
+$(eval $(call gb_Library_add_exception_objects,chartcontroller,\
chart2/source/controller/chartapiwrapper/AreaWrapper \
chart2/source/controller/chartapiwrapper/AxisWrapper \
chart2/source/controller/chartapiwrapper/Chart2ModelContact \
diff --git a/config_host.mk.in b/config_host.mk.in
index 8f8b62790639..39ed1b11e259 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -208,7 +208,9 @@ export ENABLE_WASM_STRIP_PINGUSER=@ENABLE_WASM_STRIP@
export ENABLE_WASM_STRIP_RECENT=@ENABLE_WASM_STRIP@
export ENABLE_WASM_STRIP_CHART=@ENABLE_WASM_STRIP@
export ENABLE_WASM_STRIP_CANVAS=@ENABLE_WASM_STRIP@
+export ENABLE_WASM_STRIP_CLUCENE=@ENABLE_WASM_STRIP@
export ENABLE_WASM_STRIP_DBACCESS=@ENABLE_WASM_STRIP@
+export ENABLE_WASM_STRIP_ACCESSIBILITY=@ENABLE_WASM_STRIP@
export ENABLE_WERROR=@ENABLE_WERROR@
export ENDIANNESS=@ENDIANNESS@
export EPM=@EPM@
diff --git a/desktop/Module_desktop.mk b/desktop/Module_desktop.mk
index 64717578b26f..f7663c8af552 100644
--- a/desktop/Module_desktop.mk
+++ b/desktop/Module_desktop.mk
@@ -106,9 +106,11 @@ else ifeq ($(OS),EMSCRIPTEN)
else
+ifneq ($(ENABLE_WASM_STRIP_ACCESSIBILITY),TRUE)
$(eval $(call gb_Module_add_targets,desktop,\
Executable_oosplash \
))
+endif # ENABLE_WASM_STRIP_ACCESSIBILITY
endif
diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk
index 1237954ad6e9..6602793e3e02 100644
--- a/editeng/Library_editeng.mk
+++ b/editeng/Library_editeng.mk
@@ -35,6 +35,7 @@ $(eval $(call gb_Library_add_defs,editeng,\
$(eval $(call gb_Library_use_sdk_api,editeng))
+ifneq ($(ENABLE_WASM_STRIP_ACCESSIBILITY),TRUE)
$(eval $(call gb_Library_add_exception_objects,editeng,\
editeng/source/accessibility/AccessibleComponentBase \
editeng/source/accessibility/AccessibleContextBase \
@@ -45,6 +46,10 @@ $(eval $(call gb_Library_add_exception_objects,editeng,\
editeng/source/accessibility/AccessibleSelectionBase \
editeng/source/accessibility/AccessibleStaticTextBase \
editeng/source/accessibility/AccessibleStringWrap \
+))
+endif
+
+$(eval $(call gb_Library_add_exception_objects,editeng,\
editeng/source/editeng/editattr \
editeng/source/editeng/editdata \
editeng/source/editeng/editdbg \
diff --git a/filter/source/pdf/impdialog.cxx b/filter/source/pdf/impdialog.cxx
index 050c1aa4d5cc..60ae0268d9a7 100644
--- a/filter/source/pdf/impdialog.cxx
+++ b/filter/source/pdf/impdialog.cxx
@@ -349,7 +349,7 @@ short ImpPDFTabDialog::Ok( )
{
// here the whole mechanism of the base class is not used
// when Ok is hit, the user means 'convert to PDF', so simply close with ok
-
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
if (getGeneralPage()->IsPdfUaSelected())
{
SfxObjectShell* pShell = SfxObjectShell::GetShellFromComponent(mrDoc);
@@ -363,6 +363,8 @@ short ImpPDFTabDialog::Ok( )
}
}
}
+#endif
+
return RET_OK;
}
diff --git a/include/svx/charmap.hxx b/include/svx/charmap.hxx
index 5ea7b1f2e0be..7cce1cfbd9ef 100644
--- a/include/svx/charmap.hxx
+++ b/include/svx/charmap.hxx
@@ -81,7 +81,6 @@ public:
void getFavCharacterList(); //gets both Fav char and Fav char font list
void updateFavCharacterList(const OUString& rChar, const OUString& rFont);
- virtual svx::SvxShowCharSetItem* ImplGetItem( int _nPos );
int FirstInView() const;
virtual int LastInView() const;
int PixelToMapIndex( const Point&) const;
@@ -99,7 +98,11 @@ public:
virtual void Show() override { mxScrollArea->show(); }
virtual void Hide() override { mxScrollArea->hide(); }
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
+ virtual svx::SvxShowCharSetItem* ImplGetItem( int _nPos );
uno::Reference<css::accessibility::XAccessible> getAccessibleParent() const { return GetDrawingArea()->get_accessible_parent(); }
+ virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override;
+#endif
private:
virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override;
@@ -112,7 +115,6 @@ private:
virtual void LoseFocus() override;
virtual bool KeyInput(const KeyEvent&) override;
- virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override;
virtual FactoryFunction GetUITestFactory() const override;
protected:
@@ -127,7 +129,9 @@ protected:
std::deque<OUString> maFavCharList;
std::deque<OUString> maFavCharFontList;
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
rtl::Reference<svx::SvxShowCharSetAcc> m_xAccessible;
+#endif
uno::Reference< uno::XComponentContext > mxContext;
tools::Long nX;
tools::Long nY;
diff --git a/include/svx/dlgctrl.hxx b/include/svx/dlgctrl.hxx
index 9787e025f915..257277c75942 100644
--- a/include/svx/dlgctrl.hxx
+++ b/include/svx/dlgctrl.hxx
@@ -84,7 +84,9 @@ private:
SvxRectCtl& operator=(const SvxRectCtl&) = delete;
protected:
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
rtl::Reference<SvxRectCtlAccessibleContext> pAccContext;
+#endif
sal_uInt16 nBorderWidth;
Point aPtLT, aPtMT, aPtRT;
Point aPtLM, aPtMM, aPtRM;
@@ -127,9 +129,11 @@ public:
tools::Rectangle CalculateFocusRectangle() const;
tools::Rectangle CalculateFocusRectangle( RectPoint eRectPoint ) const;
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
css::uno::Reference<css::accessibility::XAccessible> getAccessibleParent() const { return GetDrawingArea()->get_accessible_parent(); }
virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override;
a11yrelationset get_accessible_relation_set() const { return GetDrawingArea()->get_accessible_relation_set(); }
+#endif
RectPoint GetApproxRPFromPixPt( const css::awt::Point& rPixelPoint ) const;
@@ -156,7 +160,9 @@ private:
bool bPaintable;
//Add member identifying position
Point aFocusPosition;
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
rtl::Reference<SvxPixelCtlAccessible> m_xAccess;
+#endif
tools::Rectangle implCalFocusRect( const Point& aPosition );
void ChangePixel( sal_uInt16 nPixel );
@@ -190,9 +196,11 @@ public:
void SetPaintable( bool bTmp ) { bPaintable = bTmp; }
void Reset();
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
css::uno::Reference<css::accessibility::XAccessible> getAccessibleParent() const { return GetDrawingArea()->get_accessible_parent(); }
virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override;
a11yrelationset get_accessible_relation_set() const { return GetDrawingArea()->get_accessible_relation_set(); }
+#endif
static tools::Long GetSquares() { return nSquares ; }
tools::Long GetWidth() const { return aRectSize.getWidth() ; }
diff --git a/include/svx/frmsel.hxx b/include/svx/frmsel.hxx
index 498b4857c352..15756ef81cf3 100644
--- a/include/svx/frmsel.hxx
+++ b/include/svx/frmsel.hxx
@@ -156,7 +156,7 @@ public:
SvxBorderLineStyle getCurrentStyleLineStyle() const;
// accessibility
-
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
css::uno::Reference<css::accessibility::XAccessible> getAccessibleParent() const { return GetDrawingArea()->get_accessible_parent(); }
virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override;
a11yrelationset get_accessible_relation_set() const { return GetDrawingArea()->get_accessible_relation_set(); }
@@ -170,7 +170,7 @@ public:
/** Returns the accessibility child object at the specified position (relative to control). */
css::uno::Reference< css::accessibility::XAccessible >
GetChildAccessible( const Point& rPos );
-
+#endif
/** Returns the bounding rectangle of the specified frame border (if enabled). */
tools::Rectangle GetClickBoundRect( FrameBorderType eBorder ) const;
@@ -183,7 +183,9 @@ private:
virtual void StyleUpdated() override;
virtual void Resize() override;
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
rtl::Reference<a11y::AccFrameSelector> mxAccess; /// Pointer to accessibility object of the control.
+#endif
std::unique_ptr< FrameSelectorImpl > mxImpl;
};
diff --git a/include/svx/graphctl.hxx b/include/svx/graphctl.hxx
index 11a5854eebd3..1dbf5fdc8a2c 100644
--- a/include/svx/graphctl.hxx
+++ b/include/svx/graphctl.hxx
@@ -67,7 +67,9 @@ class SVX_DLLPUBLIC GraphCtrl : public weld::CustomWidgetController
DECL_LINK( UpdateHdl, Timer*, void );
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
rtl::Reference<SvxGraphCtrlAccessibleContext> mpAccContext;
+#endif
protected:
@@ -125,7 +127,9 @@ public:
void SetSdrMode(bool b);
Point GetPositionInDialog() const;
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override;
+#endif
};
class GraphCtrlView : public SdrView
diff --git a/include/svx/searchcharmap.hxx b/include/svx/searchcharmap.hxx
index 33d7432096d8..6e6fa9c20152 100644
--- a/include/svx/searchcharmap.hxx
+++ b/include/svx/searchcharmap.hxx
@@ -45,7 +45,9 @@ public:
void SelectCharacter( const Subset* sub);
virtual sal_UCS4 GetSelectCharacter() const override;
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
virtual svx::SvxShowCharSetItem* ImplGetItem( int _nPos ) override;
+#endif
virtual int LastInView() const override;
virtual void SelectIndex( int index, bool bFocus = false ) override;
void AppendCharToList(sal_UCS4 cChar);
diff --git a/include/svx/weldeditview.hxx b/include/svx/weldeditview.hxx
index d3697ad3ffb0..482d40eded3e 100644
--- a/include/svx/weldeditview.hxx
+++ b/include/svx/weldeditview.hxx
@@ -49,11 +49,16 @@ public:
protected:
std::unique_ptr<EditEngine> m_xEditEngine;
std::unique_ptr<EditView> m_xEditView;
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
rtl::Reference<WeldEditAccessible> m_xAccessible;
+#endif
virtual void makeEditEngine();
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
void InitAccessible();
+ virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override;
+#endif
void DoPaint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect);
@@ -67,8 +72,6 @@ protected:
virtual void LoseFocus() override;
virtual void Resize() override;
- virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override;
-
virtual void EditViewInvalidate(const tools::Rectangle& rRect) override { Invalidate(rRect); }
virtual void EditViewSelectionChange() override { Invalidate(); }
diff --git a/postprocess/Rdb_services.mk b/postprocess/Rdb_services.mk
index babd617e867d..85cf66a93073 100644
--- a/postprocess/Rdb_services.mk
+++ b/postprocess/Rdb_services.mk
@@ -89,6 +89,14 @@ $(eval $(call gb_Rdb_add_components,services,\
))
endif
+ifneq ($(ENABLE_WASM_STRIP_ACCESSIBILITY),TRUE)
+$(eval $(call gb_Rdb_add_components,services,\
+ $(if $(filter WNT,$(OS)), \
+ winaccessibility/source/service/winaccessibility \
+ ) \
+))
+endif
+
$(eval $(call gb_Rdb_add_components,services,\
animations/source/animcore/animcore \
cui/util/cui \
@@ -173,7 +181,6 @@ $(eval $(call gb_Rdb_add_components,services,\
embeddedobj/source/msole/emboleobj.windows \
embedserv/util/emser \
extensions/source/ole/oleautobridge \
- winaccessibility/source/service/winaccessibility \
) \
$(if $(WITH_WEBDAV), \
ucb/source/ucp/webdav-neon/ucpdav1 \
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index 092dc70da1ef..5053b8354a95 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -127,6 +127,23 @@ endif
$(eval $(call gb_Library_set_componentfile,sd,sd/util/sd))
+ifneq ($(ENABLE_WASM_STRIP_ACCESSIBILITY),TRUE)
+$(eval $(call gb_Library_add_exception_objects,sd,\
+ sd/source/ui/accessibility/AccessibleDocumentViewBase \
+ sd/source/ui/accessibility/AccessibleDrawDocumentView \
+ sd/source/ui/accessibility/AccessibleOutlineEditSource \
+ sd/source/ui/accessibility/AccessibleOutlineView \
+ sd/source/ui/accessibility/AccessiblePageShape \
+ sd/source/ui/accessibility/AccessiblePresentationGraphicShape \
+ sd/source/ui/accessibility/AccessiblePresentationOLEShape \
+ sd/source/ui/accessibility/AccessiblePresentationShape \
+ sd/source/ui/accessibility/AccessibleSlideSorterObject \
+ sd/source/ui/accessibility/AccessibleSlideSorterView \
+ sd/source/ui/accessibility/AccessibleViewForwarder \
+ sd/source/ui/accessibility/SdShapeTypes \
+))
+endif
+
$(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/core/CustomAnimationCloner \
sd/source/core/CustomAnimationEffect \
@@ -170,18 +187,6 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/filter/xml/sdtransform \
sd/source/filter/xml/sdxmlwrp \
sd/source/helper/simplereferencecomponent \
- sd/source/ui/accessibility/AccessibleDocumentViewBase \
- sd/source/ui/accessibility/AccessibleDrawDocumentView \
- sd/source/ui/accessibility/AccessibleOutlineEditSource \
- sd/source/ui/accessibility/AccessibleOutlineView \
- sd/source/ui/accessibility/AccessiblePageShape \
- sd/source/ui/accessibility/AccessiblePresentationGraphicShape \
- sd/source/ui/accessibility/AccessiblePresentationOLEShape \
- sd/source/ui/accessibility/AccessiblePresentationShape \
- sd/source/ui/accessibility/AccessibleSlideSorterObject \
- sd/source/ui/accessibility/AccessibleSlideSorterView \
- sd/source/ui/accessibility/AccessibleViewForwarder \
- sd/source/ui/accessibility/SdShapeTypes \
sd/source/ui/animations/CustomAnimationDialog \
sd/source/ui/animations/CustomAnimationList \
sd/source/ui/animations/CustomAnimationPane \
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index b0e90330e367..71bedf9f375f 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -90,9 +90,14 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\
))
endif
+ifneq ($(ENABLE_WASM_STRIP_ACCESSIBILITY),TRUE)
$(eval $(call gb_Library_add_exception_objects,sfx,\
sfx2/source/accessibility/AccessibilityCheck \
sfx2/source/accessibility/AccessibilityIssue \
+))
+endif
+
+$(eval $(call gb_Library_add_exception_objects,sfx,\
sfx2/source/appl/app \
sfx2/source/appl/appbas \
sfx2/source/appl/appbaslib \
diff --git a/solenv/gbuild/gbuild.mk b/solenv/gbuild/gbuild.mk
index 2ad5bf875485..376048a06399 100644
--- a/solenv/gbuild/gbuild.mk
+++ b/solenv/gbuild/gbuild.mk
@@ -231,6 +231,7 @@ gb_GLOBALDEFS += -DENABLE_WASM_STRIP_CHART
gb_GLOBALDEFS += -DENABLE_WASM_STRIP_CANVAS
gb_GLOBALDEFS += -DENABLE_WASM_STRIP_CLUCENE
gb_GLOBALDEFS += -DENABLE_WASM_STRIP_DBACCESS
+gb_GLOBALDEFS += -DENABLE_WASM_STRIP_ACCESSIBILITY
endif
ifeq ($(gb_ENABLE_DBGUTIL),$(true))
diff --git a/static/Library_components.mk b/static/Library_components.mk
index d3e7a0d149c1..1284e41cf489 100644
--- a/static/Library_components.mk
+++ b/static/Library_components.mk
@@ -15,7 +15,38 @@ $(eval $(call gb_Library_add_generated_exception_objects,components,\
CustomTarget/static/component_maps \
))
-$(eval $(call gb_Library_use_libraries,acc,\
+# ENABLE_WASM_STRIP_ACCESSIBILITY:
+#
+# This little block (without comments) makes the UNO API unoapploader
+# component to be linked into the executables - not by being added
+# to those single executables individually, but by using
+# - originally - the lines
+# $(eval $(call gb_Library_use_libraries,acc,\
+# $(gb_CPPU_ENV)_uno \
+# ))
+# to do that. This extends the sources added to the accessibility
+# module - so everything linked *against* accessibility *will*
+# also be linked against the needed $(gb_CPPU_ENV)_uno statically.
+#
+# This is a nice *trick*, but has some caveats:
+# - You *need to know* that acc <-> accessibility is used in the
+# build system for accessibility defines (as shortcut?)
+# - Any executable/target that does *not* link against 'acc'
+# will fail (happr searching for why that is..)
+# - If you remove accessibility - as I did - you get cryptic
+# messages and link errors - not a single executable will link
+# anymore - sigh
+# - you *need to know* enough about the build system - e.g. that
+# you *can* add modules to any lib at *any* place, here. for
+# example
+#
+# I think for the futue and for an universally usable static
+# linking the lib would need to be adfded to *each* target
+# individually.
+#
+# For now, I have just identified another commonly linked-against
+# libray to use for this 'trick', the framework one...
+$(eval $(call gb_Library_use_libraries,fwk,\
$(gb_CPPU_ENV)_uno \
))
diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index 8d26ac382b9e..12fce3da6b81 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -90,6 +90,7 @@ $(eval $(call gb_Library_add_exception_objects,svx,\
))
endif
+ifneq ($(ENABLE_WASM_STRIP_ACCESSIBILITY),TRUE)
$(eval $(call gb_Library_add_exception_objects,svx,\
svx/source/accessibility/AccessibleControlShape \
svx/source/accessibility/AccessibleEmptyEditSource \
@@ -111,11 +112,15 @@ $(eval $(call gb_Library_add_exception_objects,svx,\
svx/source/accessibility/lookupcolorname \
svx/source/accessibility/svxpixelctlaccessiblecontext \
svx/source/accessibility/svxrectctaccessiblecontext \
+ svx/source/dialog/AccessibilityCheckDialog \
+))
+endif
+
+$(eval $(call gb_Library_add_exception_objects,svx,\
svx/source/customshapes/EnhancedCustomShape3d \
svx/source/customshapes/EnhancedCustomShapeEngine \
svx/source/customshapes/EnhancedCustomShapeFontWork \
svx/source/customshapes/EnhancedCustomShapeHandle \
- svx/source/dialog/AccessibilityCheckDialog \
svx/source/dialog/_bmpmask \
svx/source/dialog/charmap \
svx/source/dialog/searchcharmap \
diff --git a/svx/source/dialog/charmap.cxx b/svx/source/dialog/charmap.cxx
index a31c1fff1b68..1f99035e0935 100644
--- a/svx/source/dialog/charmap.cxx
+++ b/svx/source/dialog/charmap.cxx
@@ -728,6 +728,7 @@ void SvxShowCharSet::SelectIndex(int nNewIndex, bool bFocus)
if( nSelectedIndex >= 0 )
{
getSelectedChar() = mxFontCharMap->GetCharFromIndex( nSelectedIndex );
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
if( m_xAccessible.is() )
{
svx::SvxShowCharSetItem* pItem = ImplGetItem(nSelectedIndex);
@@ -747,6 +748,7 @@ void SvxShowCharSet::SelectIndex(int nNewIndex, bool bFocus)
aNewAny <<= AccessibleStateType::SELECTED;
pItem->m_xItem->fireEvent( AccessibleEventId::STATE_CHANGED, aOldAny, aNewAny );
}
+#endif
}
aHighHdl.Call( this );
}
@@ -781,6 +783,7 @@ IMPL_LINK_NOARG(SvxShowCharSet, VscrollHdl, weld::ScrolledWindow&, void)
}
else if( nSelectedIndex > LastInView() )
{
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
if( m_xAccessible.is() )
{
css::uno::Any aOldAny, aNewAny;
@@ -791,6 +794,7 @@ IMPL_LINK_NOARG(SvxShowCharSet, VscrollHdl, weld::ScrolledWindow&, void)
m_xAccessible ->fireEvent( AccessibleEventId::CHILD, aOldAny, aNewAny );
}
}
+#endif
SelectIndex( (LastInView() - COLUMN_COUNT + 1) + (nSelectedIndex % COLUMN_COUNT) );
}
@@ -799,14 +803,17 @@ IMPL_LINK_NOARG(SvxShowCharSet, VscrollHdl, weld::ScrolledWindow&, void)
SvxShowCharSet::~SvxShowCharSet()
{
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
if (m_xAccessible.is())
{
m_aItems.clear();
m_xAccessible->clearCharSetControl();
m_xAccessible.clear();
}
+#endif
}
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
css::uno::Reference< XAccessible > SvxShowCharSet::CreateAccessible()
{
OSL_ENSURE(!m_xAccessible.is(),"Accessible already created!");
@@ -832,6 +839,7 @@ svx::SvxShowCharSetItem* SvxShowCharSet::ImplGetItem( int _nPos )
return aFind->second.get();
}
+#endif // ENABLE_WASM_STRIP_ACCESSIBILITY
sal_Int32 SvxShowCharSet::getMaxCharCount() const
{
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index bf5ca03e7747..3843638bc447 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -89,7 +89,9 @@ void SvxRectCtl::SetControlSettings(RectPoint eRpt, sal_uInt16 nBorder)
SvxRectCtl::~SvxRectCtl()
{
pBitmap.reset();
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
pAccContext.clear();
+#endif
}
void SvxRectCtl::Resize()
@@ -415,11 +417,13 @@ void SvxRectCtl::GetFocus()
{
Invalidate();
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
// Send accessibility event.
if (pAccContext.is())
{
pAccContext->FireChildFocus(GetActualRP());
}
+#endif
}
void SvxRectCtl::LoseFocus()
@@ -499,9 +503,11 @@ void SvxRectCtl::SetActualRP( RectPoint eNewRP )
Invalidate();
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
// notify accessibility object about change
if (pAccContext.is())
pAccContext->selectChild( eNewRP /* MT, bFireFocus */ );
+#endif
}
void SvxRectCtl::SetState( CTL_STATE nState )
@@ -550,11 +556,13 @@ tools::Rectangle SvxRectCtl::CalculateFocusRectangle( RectPoint eRectPoint ) con
return aRet;
}
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
Reference< XAccessible > SvxRectCtl::CreateAccessible()
{
pAccContext = new SvxRectCtlAccessibleContext(this);
return pAccContext;
}
+#endif
RectPoint SvxRectCtl::GetApproxRPFromPixPt( const css::awt::Point& r ) const
{
@@ -570,12 +578,14 @@ void SvxRectCtl::DoCompletelyDisable(bool bNew)
// Control for editing bitmaps
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
css::uno::Reference< css::accessibility::XAccessible > SvxPixelCtl::CreateAccessible()
{
if (!m_xAccess.is())
m_xAccess = new SvxPixelCtlAccessible(this);
return m_xAccess;
}
+#endif
tools::Long SvxPixelCtl::PointToIndex(const Point &aPt) const
{
@@ -673,10 +683,14 @@ bool SvxPixelCtl::MouseButtonDown( const MouseEvent& rMEvt )
tools::Long nIndex = ShowPosition(rMEvt.GetPosPixel());
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
if(m_xAccess.is())
{
m_xAccess->NotifyChild(nIndex,true, true);
}
+#else
+ (void)nIndex;
+#endif
return true;
}
@@ -816,6 +830,7 @@ bool SvxPixelCtl::KeyInput( const KeyEvent& rKEvt )
default:
return CustomWidgetController::KeyInput( rKEvt );
}
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
if(m_xAccess.is())
{
tools::Long nIndex = GetFocusPosIndex();
@@ -837,6 +852,9 @@ bool SvxPixelCtl::KeyInput( const KeyEvent& rKEvt )
break;
}
}
+#else
+ (void)bFocusPosChanged;
+#endif
return true;
}
else
@@ -850,10 +868,12 @@ void SvxPixelCtl::GetFocus()
{
Invalidate(implCalFocusRect(aFocusPosition));
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
if (m_xAccess.is())
{
m_xAccess->NotifyChild(GetFocusPosIndex(),true,false);
}
+#endif
}
void SvxPixelCtl::LoseFocus()
diff --git a/svx/source/dialog/frmsel.cxx b/svx/source/dialog/frmsel.cxx
index c3abf1875481..688ae555b9d6 100644
--- a/svx/source/dialog/frmsel.cxx
+++ b/svx/source/dialog/frmsel.cxx
@@ -235,8 +235,10 @@ FrameSelectorImpl::FrameSelectorImpl( FrameSelector& rFrameSel ) :
mbBLTR( false ),
mbFullRepaint( true ),
mbAutoSelect( true ),
- mbHCMode( false ),
- maChildVec( 8 )
+ mbHCMode( false )
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
+ ,maChildVec( 8 )
+#endif
{
maAllBorders.resize( FRAMEBORDERTYPE_COUNT, nullptr );
maAllBorders[ GetIndexFromFrameBorderType( FrameBorderType::Left ) ] = &maLeft;
@@ -268,11 +270,12 @@ FrameSelectorImpl::FrameSelectorImpl( FrameSelector& rFrameSel ) :
}
FrameSelectorImpl::~FrameSelectorImpl()
-
{
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
for( auto& rpChild : maChildVec )
if( rpChild.is() )
rpChild->Invalidate();
+#endif
}
// initialization
@@ -756,17 +759,24 @@ void FrameSelectorImpl::SetBorderState( FrameBorder& rBorder, FrameBorderState e
Any aNew;
Any& rMod = eState == FrameBorderState::Show ? aNew : aOld;
rMod <<= AccessibleStateType::CHECKED;
+
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
rtl::Reference< a11y::AccFrameSelectorChild > xRet;
size_t nVecIdx = static_cast< size_t >( rBorder.GetType() );
if( GetBorder(rBorder.GetType()).IsEnabled() && (1 <= nVecIdx) && (nVecIdx <= maChildVec.size()) )
xRet = maChildVec[ --nVecIdx ].get();
+#endif
if( eState == FrameBorderState::Show )
SetBorderCoreStyle( rBorder, &maCurrStyle );
else
rBorder.SetState( eState );
+
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
if (xRet.is())
xRet->NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOld, aNew );
+#endif
+
DoInvalidate( true );
}
@@ -840,8 +850,10 @@ void FrameSelector::SetDrawingArea(weld::DrawingArea* pDrawingArea)
FrameSelector::~FrameSelector()
{
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
if( mxAccess.is() )
mxAccess->Invalidate();
+#endif
}
void FrameSelector::Initialize( FrameSelFlags nFlags )
@@ -974,6 +986,7 @@ bool FrameSelector::IsBorderSelected( FrameBorderType eBorder ) const
void FrameSelector::SelectBorder( FrameBorderType eBorder )
{
mxImpl->SelectBorder( mxImpl->GetBorderAccess( eBorder ), true/*bSelect*/ );
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
// MT: bFireFox as API parameter is ugly...
// if (bFocus)
{
@@ -985,6 +998,7 @@ void FrameSelector::SelectBorder( FrameBorderType eBorder )
xRet->NotifyAccessibleEvent( AccessibleEventId::STATE_CHANGED, aOldValue, aNewValue );
}
}
+#endif
}
bool FrameSelector::IsAnyBorderSelected() const
@@ -1026,6 +1040,7 @@ SvxBorderLineStyle FrameSelector::getCurrentStyleLineStyle() const
}
// accessibility
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
Reference< XAccessible > FrameSelector::CreateAccessible()
{
if( !mxAccess.is() )
@@ -1060,6 +1075,7 @@ Reference< XAccessible > FrameSelector::GetChildAccessible( const Point& rPos )
xRet = GetChildAccessible( (*aIt)->GetType() ).get();
return xRet;
}
+#endif // ENABLE_WASM_STRIP_ACCESSIBILITY
tools::Rectangle FrameSelector::GetClickBoundRect( FrameBorderType eBorder ) const
{
diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx
index f73e316cfa18..2ee33b20a611 100644
--- a/svx/source/dialog/graphctl.cxx
+++ b/svx/source/dialog/graphctl.cxx
@@ -74,11 +74,14 @@ GraphCtrl::~GraphCtrl()
{
aUpdateIdle.Stop();
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
if( mpAccContext.is() )
{
mpAccContext->disposing();
mpAccContext.clear();
}
+#endif
+
pView.reset();
pModel.reset();
pUserCall.reset();
@@ -142,9 +145,11 @@ void GraphCtrl::InitSdrModel()
pView->SetBufferedOutputAllowed(true);
pView->SetBufferedOverlayAllowed(true);
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
// Tell the accessibility object about the changes.
if (mpAccContext.is())
mpAccContext->setModelAndView (pModel.get(), pView.get());
+#endif
}
void GraphCtrl::SetGraphic( const Graphic& rGraphic, bool bNewModel )
@@ -827,6 +832,7 @@ Point GraphCtrl::GetPositionInDialog() const
return Point();
}
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
css::uno::Reference< css::accessibility::XAccessible > GraphCtrl::CreateAccessible()
{
if(mpAccContext == nullptr )
@@ -837,5 +843,6 @@ css::uno::Reference< css::accessibility::XAccessible > GraphCtrl::CreateAccessib
}
return mpAccContext;
}
+#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/dialog/searchcharmap.cxx b/svx/source/dialog/searchcharmap.cxx
index 1cdb3cfc082a..8e62f749b2a3 100644
--- a/svx/source/dialog/searchcharmap.cxx
+++ b/svx/source/dialog/searchcharmap.cxx
@@ -389,6 +389,7 @@ SvxSearchCharSet::~SvxSearchCharSet()
{
}
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
svx::SvxShowCharSetItem* SvxSearchCharSet::ImplGetItem( int _nPos )
{
ItemsMap::iterator aFind = m_aItems.find(_nPos);
@@ -409,6 +410,7 @@ svx::SvxShowCharSetItem* SvxSearchCharSet::ImplGetItem( int _nPos )
return aFind->second.get();
}
+#endif
sal_Int32 SvxSearchCharSet::getMaxCharCount() const
{
diff --git a/svx/source/dialog/weldeditview.cxx b/svx/source/dialog/weldeditview.cxx
index 5cab041bae76..16f31e58eec5 100644
--- a/svx/source/dialog/weldeditview.cxx
+++ b/svx/source/dialog/weldeditview.cxx
@@ -762,20 +762,24 @@ public:
}
};
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
css::uno::Reference<css::accessibility::XAccessible> WeldEditView::CreateAccessible()
{
if (!m_xAccessible.is())
m_xAccessible.set(new WeldEditAccessible(this));
return m_xAccessible;
}
+#endif
WeldEditView::~WeldEditView()
{
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
if (m_xAccessible.is())
{
m_xAccessible->ClearWin(); // make Accessible nonfunctional
m_xAccessible.clear();
}
+#endif
}
bool WeldViewForwarder::IsValid() const { return m_rEditAcc.GetEditView() != nullptr; }
@@ -1487,14 +1491,18 @@ void WeldEditView::SetDrawingArea(weld::DrawingArea* pDrawingArea)
pDrawingArea->set_cursor(PointerStyle::Text);
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
InitAccessible();
+#endif
}
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
void WeldEditView::InitAccessible()
{
if (m_xAccessible.is())
m_xAccessible->Init(GetEditEngine(), GetEditView());
}
+#endif
int WeldEditView::GetSurroundingText(OUString& rSurrounding)
{
@@ -1521,6 +1529,7 @@ void WeldEditView::GetFocus()
weld::CustomWidgetController::GetFocus();
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
if (m_xAccessible.is())
{
// Note: will implicitly send the AccessibleStateType::FOCUSED event
@@ -1528,6 +1537,7 @@ void WeldEditView::GetFocus()
if (pHelper)
pHelper->SetFocus();
}
+#endif
}
void WeldEditView::LoseFocus()
@@ -1535,6 +1545,7 @@ void WeldEditView::LoseFocus()
weld::CustomWidgetController::LoseFocus();
Invalidate(); // redraw without cursor
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
if (m_xAccessible.is())
{
// Note: will implicitly send the AccessibleStateType::FOCUSED event
@@ -1542,6 +1553,7 @@ void WeldEditView::LoseFocus()
if (pHelper)
pHelper->SetFocus(false);
}
+#endif
}
namespace
diff --git a/svx/source/inc/frmselimpl.hxx b/svx/source/inc/frmselimpl.hxx
index 79df99cfb150..9dd7190b5dc4 100644
--- a/svx/source/inc/frmselimpl.hxx
+++ b/svx/source/inc/frmselimpl.hxx
@@ -140,8 +140,10 @@ struct FrameSelectorImpl
bool mbAutoSelect; /// true = Auto select a frame border, if focus reaches control.
bool mbHCMode; /// true = High contrast mode.
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
std::vector<rtl::Reference<a11y::AccFrameSelectorChild>>
maChildVec; /// Pointers to accessibility objects for frame borders.
+#endif
explicit FrameSelectorImpl( FrameSelector& rFrameSel );
~FrameSelectorImpl();
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk
index 3ba73c8ae9af..3bf067a41dae 100644
--- a/sw/Library_sw.mk
+++ b/sw/Library_sw.mk
@@ -93,9 +93,8 @@ $(eval $(call gb_Library_use_externals,sw,\
libxml2 \
))
+ifneq ($(ENABLE_WASM_STRIP_ACCESSIBILITY),TRUE)
$(eval $(call gb_Library_add_exception_objects,sw,\
- sw/source/core/SwNumberTree/SwNodeNum \
- sw/source/core/SwNumberTree/SwNumberTree \
sw/source/core/access/AccessibilityCheck \
sw/source/core/access/AccessibilityIssue \
sw/source/core/access/acccell \
@@ -124,6 +123,13 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
sw/source/core/access/acctextframe \
sw/source/core/access/parachangetrackinginfo \
sw/source/core/access/textmarkuphelper \
+ sw/source/uibase/docvw/SidebarWinAcc \
+))
+endif
+
+$(eval $(call gb_Library_add_exception_objects,sw,\
+ sw/source/core/SwNumberTree/SwNodeNum \
+ sw/source/core/SwNumberTree/SwNumberTree \
sw/source/core/attr/BorderCacheOwner \
sw/source/core/attr/calbck \
sw/source/core/attr/cellatr \
@@ -620,7 +626,6 @@ $(eval $(call gb_Library_add_exception_objects,sw,\
sw/source/uibase/docvw/PostItMgr \
sw/source/uibase/docvw/ShadowOverlayObject \
sw/source/uibase/docvw/SidebarTxtControl \
- sw/source/uibase/docvw/SidebarWinAcc \
sw/source/uibase/docvw/HeaderFooterWin \
sw/source/uibase/docvw/OutlineContentVisibilityWin \
sw/source/uibase/docvw/edtdd \
diff --git a/sw/inc/AnnotationWin.hxx b/sw/inc/AnnotationWin.hxx
index f1ba8a499589..eabb88d0331c 100644
--- a/sw/inc/AnnotationWin.hxx
+++ b/sw/inc/AnnotationWin.hxx
@@ -171,7 +171,9 @@ class SAL_DLLPUBLIC_RTTI SwAnnotationWin : public InterimItemWindow
void SetLanguage(const SvxLanguageItem& rNewItem);
void ChangeSidebarItem( SwSidebarItem const & rSidebarItem );
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override;
+#endif
void DrawForPage(OutputDevice* pDev, const Point& rPos);
diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index 760fc7f8abe7..b2dd914d063b 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -263,11 +263,13 @@ class SAL_DLLPUBLIC_RTTI SwPostItMgr final : public SfxListener
void AssureStdModeAtShell();
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
void ConnectSidebarWinToFrame( const SwFrame& rFrame,
const SwFormatField& rFormatField,
sw::annotation::SwAnnotationWin& rSidebarWin );
void DisconnectSidebarWinFromFrame( const SwFrame& rFrame,
sw::annotation::SwAnnotationWin& rSidebarWin );
+#endif
bool HasFrameConnectedSidebarWins( const SwFrame& rFrame );
vcl::Window* GetSidebarWinForFrameByIndex( const SwFrame& rFrame,
const sal_Int32 nIndex );
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index 070033306af4..14e6fd0501a8 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -252,7 +252,9 @@ public:
bool bTemplate = false ) const override;
virtual std::set<Color> GetDocColors() override;
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
sfx::AccessibilityIssueCollection runAccessibilityCheck() override;
+#endif
virtual void LoadStyles( SfxObjectShell& rSource ) override;
diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx
index 4232d315478a..840ff1e3fb0d 100644
--- a/sw/inc/view.hxx
+++ b/sw/inc/view.hxx
@@ -608,8 +608,11 @@ public:
// Enable mail merge - mail merge field dialog enabled
void EnableMailMerge();
+
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
//apply Accessibility options
void ApplyAccessibilityOptions(SvtAccessibilityOptions const & rAccessibilityOptions);
+#endif
SwView(SfxViewFrame* pFrame, SfxViewShell*);
virtual ~SwView() override;
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index 27d29e9f65f0..8d89876c8fce 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -497,12 +497,12 @@ public:
const Size& GetBrowseBorder() const;
sal_Int32 GetBrowseWidth() const;
void SetBrowseBorder( const Size& rNew );
+ void ShowPreviewSelection( sal_uInt16 nSelPage );
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
css::uno::Reference< css::accessibility::XAccessible > CreateAccessible();
-
css::uno::Reference< css::accessibility::XAccessible > CreateAccessiblePreview();
- void ShowPreviewSelection( sal_uInt16 nSelPage );
void InvalidateAccessibleFocus();
// Apply Accessibility options.
@@ -538,6 +538,7 @@ public:
void InvalidateAccessibleParaAttrs( const SwTextFrame& rTextFrame );
SwAccessibleMap* GetAccessibleMap();
+#endif
SwViewShell( SwViewShell&, vcl::Window *pWin, OutputDevice *pOut = nullptr,
tools::Long nFlags = 0 );
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 64a9d34906e2..115ef3675da6 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -1558,7 +1558,9 @@ class SwNotifyAccAboutInvalidTextSelections
~SwNotifyAccAboutInvalidTextSelections() COVERITY_NOEXCEPT_FALSE
{
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
mrCursorSh.InvalidateAccessibleParaTextSelection();
+#endif
}
};
@@ -1744,8 +1746,10 @@ void SwCursorShell::UpdateCursor( sal_uInt16 eFlags, bool bIdleEnd )
m_pVisibleCursor->Show(); // show again
}
m_eMvState = CursorMoveState::NONE; // state for cursor travelling - GetModelPositionForViewPoint
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
if (Imp()->IsAccessible())
Imp()->InvalidateAccessibleCursorPosition( pTableFrame );
+#endif
return;
}
}
@@ -2016,8 +2020,10 @@ void SwCursorShell::UpdateCursor( sal_uInt16 eFlags, bool bIdleEnd )
m_eMvState = CursorMoveState::NONE; // state for cursor travelling - GetModelPositionForViewPoint
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
if (Imp()->IsAccessible())
Imp()->InvalidateAccessibleCursorPosition( pFrame );
+#endif
// switch from blinking cursor to read-only-text-selection cursor
const sal_uInt64 nBlinkTime = GetOut()->GetSettings().GetStyleSettings().
diff --git a/sw/source/core/docnode/ndsect.cxx b/sw/source/core/docnode/ndsect.cxx
index 26647f2355cf..6963935a5862 100644
--- a/sw/source/core/docnode/ndsect.cxx
+++ b/sw/source/core/docnode/ndsect.cxx
@@ -1115,6 +1115,7 @@ void SwSectionNode::MakeFramesForAdjacentContentNode(const SwNodeIndex & rIdx)
// CONTENT_FLOWS_FROM/_TO relation.
// Relation CONTENT_FLOWS_FROM for next paragraph will change
// and relation CONTENT_FLOWS_TO for previous paragraph will change.
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
if ( pNew->IsTextFrame() )
{
SwViewShell* pViewShell( pNew->getRootFrame()->GetCurrShell() );
@@ -1126,6 +1127,7 @@ void SwSectionNode::MakeFramesForAdjacentContentNode(const SwNodeIndex & rIdx)
dynamic_cast<SwTextFrame*>(pNew->FindPrevCnt()) );
}
}
+#endif
pNew = pSct;
}
@@ -1141,6 +1143,7 @@ void SwSectionNode::MakeFramesForAdjacentContentNode(const SwNodeIndex & rIdx)
// CONTENT_FLOWS_FROM/_TO relation.
// Relation CONTENT_FLOWS_FROM for next paragraph will change
// and relation CONTENT_FLOWS_TO for previous paragraph will change.
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
if ( pNew->IsTextFrame() )
{
SwViewShell* pViewShell( pNew->getRootFrame()->GetCurrShell() );
@@ -1152,6 +1155,7 @@ void SwSectionNode::MakeFramesForAdjacentContentNode(const SwNodeIndex & rIdx)
dynamic_cast<SwTextFrame*>(pNew->FindPrevCnt()) );
}
}
+#endif
if ( bInitNewSect )
static_cast<SwSectionFrame*>(pNew)->Init();
}
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 389923d6f415..a8c1ab7694e7 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -2426,6 +2426,7 @@ void SwTableNode::MakeOwnFrames(SwNodeIndex* pIdxBehind)
// CONTENT_FLOWS_FROM/_TO relation.
// Relation CONTENT_FLOWS_FROM for next paragraph will change
// and relation CONTENT_FLOWS_TO for previous paragraph will change.
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
{
SwViewShell* pViewShell( pNew->getRootFrame()->GetCurrShell() );
if ( pViewShell && pViewShell->GetLayout() &&
@@ -2436,6 +2437,7 @@ void SwTableNode::MakeOwnFrames(SwNodeIndex* pIdxBehind)
dynamic_cast<SwTextFrame*>(pNew->FindPrevCnt()) );
}
}
+#endif
pNew->RegistFlys();
}
}
@@ -2461,6 +2463,7 @@ void SwTableNode::DelFrames(SwRootFrame const*const pLayout)
// CONTENT_FLOWS_FROM/_TO relation.
// Relation CONTENT_FLOWS_FROM for current next paragraph will change
// and relation CONTENT_FLOWS_TO for current previous paragraph will change.
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
{
SwViewShell* pViewShell( pFrame->getRootFrame()->GetCurrShell() );
if ( pViewShell && pViewShell->GetLayout() &&
@@ -2471,6 +2474,7 @@ void SwTableNode::DelFrames(SwRootFrame const*const pLayout)
dynamic_cast<SwTextFrame*>(pFrame->FindPrevCnt()) );
}
}
+#endif
pFrame->Cut();
SwFrame::DestroyFrame(pFrame);
bAgain = true;
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index 809ecd349c81..c933b3f2b230 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -1385,6 +1385,7 @@ void SwContentNode::MakeFramesForAdjacentContentNode(SwContentNode& rNode)
// CONTENT_FLOWS_FROM/_TO relation.
// Relation CONTENT_FLOWS_FROM for next paragraph will change
// and relation CONTENT_FLOWS_TO for previous paragraph will change.
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
if ( pNew->IsTextFrame() )
{
SwViewShell* pViewShell( pNew->getRootFrame()->GetCurrShell() );
@@ -1396,6 +1397,7 @@ void SwContentNode::MakeFramesForAdjacentContentNode(SwContentNode& rNode)
dynamic_cast<SwTextFrame*>(pNew->FindPrevCnt()) );
}
}
+#endif
}
}
@@ -1480,6 +1482,7 @@ void SwContentNode::DelFrames(SwRootFrame const*const pLayout)
// CONTENT_FLOWS_FROM/_TO relation.
// Relation CONTENT_FLOWS_FROM for current next paragraph will change
// and relation CONTENT_FLOWS_TO for current previous paragraph will change.
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
SwViewShell* pViewShell( pFrame->getRootFrame()->GetCurrShell() );
if ( pViewShell && pViewShell->GetLayout() &&
pViewShell->GetLayout()->IsAnyShellAccessible() )
@@ -1488,6 +1491,7 @@ void SwContentNode::DelFrames(SwRootFrame const*const pLayout)
dynamic_cast<SwTextFrame*>(pFrame->FindNextCnt( true )),
dynamic_cast<SwTextFrame*>(pFrame->FindPrevCnt()) );
}
+#endif
}
if( pFrame->IsFollow() )
diff --git a/sw/source/core/draw/dview.cxx b/sw/source/core/draw/dview.cxx
index dfa884e80db5..1c2623b7470e 100644
--- a/sw/source/core/draw/dview.cxx
+++ b/sw/source/core/draw/dview.cxx
@@ -371,6 +371,7 @@ void SwDrawView::MoveRepeatedObjs( const SwAnchoredObject& _rMovedAnchoredObj,
nNewPos );
pDrawPage->RecalcObjOrdNums();
// adjustments for accessibility API
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
if ( auto pTmpFlyFrame = dynamic_cast<SwFlyFrame *>( pAnchoredObj ) )
{
m_rImp.DisposeAccessibleFrame( pTmpFlyFrame );
@@ -381,6 +382,7 @@ void SwDrawView::MoveRepeatedObjs( const SwAnchoredObject& _rMovedAnchoredObj,
m_rImp.DisposeAccessibleObj(pAnchoredObj->GetDrawObj(), true);
m_rImp.AddAccessibleObj( pAnchoredObj->GetDrawObj() );
}
+#endif
}
aAnchoredObjs.pop_back();
}
@@ -404,6 +406,7 @@ void SwDrawView::MoveRepeatedObjs( const SwAnchoredObject& _rMovedAnchoredObj,
nTmpNewPos );
pDrawPage->RecalcObjOrdNums();
// adjustments for accessibility API
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
if ( auto pTmpFlyFrame = dynamic_cast<SwFlyFrame *>( pAnchoredObj ) )
{
m_rImp.DisposeAccessibleFrame( pTmpFlyFrame );
@@ -414,6 +417,7 @@ void SwDrawView::MoveRepeatedObjs( const SwAnchoredObject& _rMovedAnchoredObj,
m_rImp.DisposeAccessibleObj(pAnchoredObj->GetDrawObj(), true);
m_rImp.AddAccessibleObj( pAnchoredObj->GetDrawObj() );
}
+#endif
}
aAnchoredObjs.pop_back();
}
@@ -581,8 +585,10 @@ void SwDrawView::ObjOrderChanged( SdrObject* pObj, size_t nOldPos,
if ( auto pFlyFrame = dynamic_cast< SwFlyFrame *>( pMovedAnchoredObj ) )
{
// adjustments for accessibility API
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
m_rImp.DisposeAccessibleFrame( pFlyFrame );
m_rImp.AddAccessibleFrame( pFlyFrame );
+#endif
const sal_uInt32 nChildNewPos = bMovedForward ? nNewPos : nNewPos+1;
size_t i = bMovedForward ? nOldPos : nObjCount-1;
@@ -609,6 +615,7 @@ void SwDrawView::ObjOrderChanged( SdrObject* pObj, size_t nOldPos,
// collect 'child' object
aMovedChildObjs.push_back( pTmpObj );
// adjustments for accessibility API
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
if ( auto pFlyDrawObj = dynamic_cast<SwVirtFlyDrawObj *>( pTmpObj ) )
{
const SwFlyFrame *pTmpFlyFrame = pFlyDrawObj->GetFlyFrame();
@@ -620,6 +627,7 @@ void SwDrawView::ObjOrderChanged( SdrObject* pObj, size_t nOldPos,
m_rImp.DisposeAccessibleObj(pTmpObj, true);
m_rImp.AddAccessibleObj( pTmpObj );
}
+#endif
}
else
{
@@ -633,12 +641,14 @@ void SwDrawView::ObjOrderChanged( SdrObject* pObj, size_t nOldPos,
} while ( ( bMovedForward && i < ( nObjCount - aMovedChildObjs.size() ) ) ||
( !bMovedForward && i > ( nNewPos + aMovedChildObjs.size() ) ) );
}
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
else
{
// adjustments for accessibility API
m_rImp.DisposeAccessibleObj(pObj, true);
m_rImp.AddAccessibleObj( pObj );
}
+#endif
MoveRepeatedObjs( *pMovedAnchoredObj, aMovedChildObjs );
}
diff --git a/sw/source/core/inc/viewimp.hxx b/sw/source/core/inc/viewimp.hxx
index aff1e701245a..5a97ab3868f9 100644
--- a/sw/source/core/inc/viewimp.hxx
+++ b/sw/source/core/inc/viewimp.hxx
@@ -70,9 +70,11 @@ class SwViewShellImp
// Is registered by the SwLayAction ctor and deregistered by the dtor
SwLayIdle *m_pIdleAct; // The same as SwLayAction for SwLayIdle
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
/// note: the map is *uniquely* owned here - the shared_ptr is only
/// used so that SwAccessibleContext can check via weak_ptr that it's alive
std::shared_ptr<SwAccessibleMap> m_pAccessibleMap;
+#endif
bool m_bFirstPageInvalid : 1; // Pointer to the first Page invalid?
bool m_bResetHdlHiddenPaint : 1; // Ditto
@@ -93,8 +95,8 @@ class SwViewShellImp
private:
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
SwAccessibleMap *CreateAccessibleMap();
-
/** invalidate CONTENT_FLOWS_FROM/_TO relation for paragraphs
#i27138#
@@ -129,6 +131,7 @@ private:
<SwViewShell::InvalidateAccessibleParaAttrs(..)>
*/
void InvalidateAccessibleParaAttrs_( const SwTextFrame& rTextFrame );
+#endif
public:
SwViewShellImp( SwViewShell * );
@@ -214,6 +217,7 @@ public:
return m_pPagePreviewLayout.get();
}
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
/// Is this view accessible?
bool IsAccessible() const { return m_pAccessibleMap != nullptr; }
@@ -264,13 +268,14 @@ public:
/// Fire all accessible events that have been collected so far
void FireAccessibleEvents();
+#endif
};
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
inline SwAccessibleMap& SwViewShellImp::GetAccessibleMap()
{
if( !m_pAccessibleMap )
CreateAccessibleMap();
-
return *m_pAccessibleMap;
}
@@ -302,6 +307,8 @@ inline void SwViewShellImp::AddAccessibleObj( const SdrObject *pObj )
SwRect aEmptyRect;
MoveAccessible( nullptr, pObj, aEmptyRect );
}
+#endif // ENABLE_WASM_STRIP_ACCESSIBILITY
+
#endif // INCLUDED_SW_SOURCE_CORE_INC_VIEWIMP_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/anchoreddrawobject.cxx b/sw/source/core/layout/anchoreddrawobject.cxx
index a5229b626e11..dc300b714e90 100644
--- a/sw/source/core/layout/anchoreddrawobject.cxx
+++ b/sw/source/core/layout/anchoreddrawobject.cxx
@@ -123,11 +123,13 @@ SwPosNotify::~SwPosNotify() COVERITY_NOEXCEPT_FALSE
}
}
// tdf#101464 notify SwAccessibleMap about new drawing object position
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
if (mpOldPageFrame && mpOldPageFrame->getRootFrame()->IsAnyShellAccessible())
{
mpOldPageFrame->getRootFrame()->GetCurrShell()->Imp()->MoveAccessible(
nullptr, mpAnchoredDrawObj->GetDrawObj(), maOldObjRect);
}
+#endif
}
// --> #i32795#
diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx
index 755ea2ea1256..d68dd6692ab6 100644
--- a/sw/source/core/layout/fly.cxx
+++ b/sw/source/core/layout/fly.cxx
@@ -260,6 +260,7 @@ void SwFlyFrame::DestroyImpl()
// For frames bound as char or frames that don't have an anchor we have
// to do that ourselves. For any other frame the call RemoveFly at the
// anchor will do that.
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
if( IsAccessibleFrame() && GetFormat() && (IsFlyInContentFrame() || !GetAnchorFrame()) )
{
SwRootFrame *pRootFrame = getRootFrame();
@@ -274,6 +275,7 @@ void SwFlyFrame::DestroyImpl()
}
}
}
+#endif
if( GetFormat() && !GetFormat()->GetDoc()->IsInDtor() )
{
@@ -483,6 +485,7 @@ void SwFlyFrame::ChainFrames( SwFlyFrame *pMaster, SwFlyFrame *pFollow )
}
// invalidate accessible relation set (accessibility wrapper)
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
SwViewShell* pSh = pMaster->getRootFrame()->GetCurrShell();
if( pSh )
{
@@ -490,6 +493,7 @@ void SwFlyFrame::ChainFrames( SwFlyFrame *pMaster, SwFlyFrame *pFollow )
if( pLayout && pLayout->IsAnyShellAccessible() )
pSh->Imp()->InvalidateAccessibleRelationSet( pMaster, pFollow );
}
+#endif
}
void SwFlyFrame::UnchainFrames( SwFlyFrame *pMaster, SwFlyFrame *pFollow )
@@ -529,6 +533,7 @@ void SwFlyFrame::UnchainFrames( SwFlyFrame *pMaster, SwFlyFrame *pFollow )
pFollow->GetFormat()->GetDoc(), ++nIndex );
// invalidate accessible relation set (accessibility wrapper)
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
SwViewShell* pSh = pMaster->getRootFrame()->GetCurrShell();
if( pSh )
{
@@ -536,6 +541,7 @@ void SwFlyFrame::UnchainFrames( SwFlyFrame *pMaster, SwFlyFrame *pFollow )
if( pLayout && pLayout->IsAnyShellAccessible() )
pSh->Imp()->InvalidateAccessibleRelationSet( pMaster, pFollow );
}
+#endif
}
SwFlyFrame *SwFlyFrame::FindChainNeighbour( SwFrameFormat const &rChain, SwFrame *pAnch )
@@ -791,12 +797,14 @@ void SwFlyFrame::UpdateAttr_( const SfxPoolItem *pOld, const SfxPoolItem *pNew,
const SvxProtectItem *pP = static_cast<const SvxProtectItem*>(pNew);
GetVirtDrawObj()->SetMoveProtect( pP->IsPosProtected() );
GetVirtDrawObj()->SetResizeProtect( pP->IsSizeProtected() );
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
if( pSh )
{
SwRootFrame* pLayout = getRootFrame();
if( pLayout && pLayout->IsAnyShellAccessible() )
pSh->Imp()->InvalidateAccessibleEditableState( true, this );
}
+#endif
}
break;
case RES_COL:
@@ -968,15 +976,17 @@ void SwFlyFrame::UpdateAttr_( const SfxPoolItem *pOld, const SfxPoolItem *pNew,
rIDDMA.GetHeavenId() :
rIDDMA.GetHellId();
GetVirtDrawObj()->SetLayer( nId );
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
if( pSh )
{
SwRootFrame* pLayout = getRootFrame();
if( pLayout && pLayout->IsAnyShellAccessible() )
- {
- pSh->Imp()->DisposeAccessibleFrame( this );
- pSh->Imp()->AddAccessibleFrame( this );
- }
+ {
+ pSh->Imp()->DisposeAccessibleFrame( this );
+ pSh->Imp()->AddAccessibleFrame( this );
+ }
}
+#endif
// #i28701# - perform reorder of object lists
// at anchor frame and at page frame.
rInvFlags |= 0x80;
@@ -2192,6 +2202,7 @@ void SwFrame::RemoveFly( SwFlyFrame *pToRemove )
pPage->RemoveFlyFromPage( pToRemove );
}
// #i73201#
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
else
{
if ( pToRemove->IsAccessibleFrame() &&
@@ -2209,6 +2220,7 @@ void SwFrame::RemoveFly( SwFlyFrame *pToRemove )
}
}
}
+#endif
m_pDrawObjs->Remove(*pToRemove);
if (!m_pDrawObjs->size())
@@ -2290,6 +2302,7 @@ void SwFrame::AppendDrawObj( SwAnchoredObject& _rNewObj )
}
// Notify accessible layout.
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
SwViewShell* pSh = getRootFrame()->GetCurrShell();
if( pSh )
{
@@ -2299,6 +2312,7 @@ void SwFrame::AppendDrawObj( SwAnchoredObject& _rNewObj )
pSh->Imp()->AddAccessibleObj( _rNewObj.GetDrawObj() );
}
}
+#endif
assert(!m_pDrawObjs || m_pDrawObjs->is_sorted());
}
@@ -2306,6 +2320,7 @@ void SwFrame::AppendDrawObj( SwAnchoredObject& _rNewObj )
void SwFrame::RemoveDrawObj( SwAnchoredObject& _rToRemoveObj )
{
// Notify accessible layout.
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
SwViewShell* pSh = getRootFrame()->GetCurrShell();
if( pSh )
{
@@ -2313,6 +2328,7 @@ void SwFrame::RemoveDrawObj( SwAnchoredObject& _rToRemoveObj )
if (pLayout && pLayout->IsAnyShellAccessible())
pSh->Imp()->DisposeAccessibleObj(_rToRemoveObj.GetDrawObj(), false);
}
+#endif
// deregister from page frame
SwPageFrame* pPage = _rToRemoveObj.GetPageFrame();
diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx
index ea50b06ab364..c69af3d2778f 100644
--- a/sw/source/core/layout/flylay.cxx
+++ b/sw/source/core/layout/flylay.cxx
@@ -847,6 +847,7 @@ void SwPageFrame::AppendFlyToPage( SwFlyFrame *pNew )
// Notify accessible layout. That's required at this place for
// frames only where the anchor is moved. Creation of new frames
// is additionally handled by the SwFrameNotify class.
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
if( GetUpper() &&
static_cast< SwRootFrame * >( GetUpper() )->IsAnyShellAccessible() &&
static_cast< SwRootFrame * >( GetUpper() )->GetCurrShell() )
@@ -854,6 +855,7 @@ void SwPageFrame::AppendFlyToPage( SwFlyFrame *pNew )
static_cast< SwRootFrame * >( GetUpper() )->GetCurrShell()->Imp()
->AddAccessibleFrame( pNew );
}
+#endif
}
// #i28701# - correction: consider also drawing objects
@@ -920,6 +922,7 @@ void SwPageFrame::RemoveFlyFromPage( SwFlyFrame *pToRemove )
// Notify accessible layout. That's required at this place for
// frames only where the anchor is moved. Creation of new frames
// is additionally handled by the SwFrameNotify class.
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
if( GetUpper() &&
static_cast< SwRootFrame * >( GetUpper() )->IsAnyShellAccessible() &&
static_cast< SwRootFrame * >( GetUpper() )->GetCurrShell() )
@@ -927,6 +930,7 @@ void SwPageFrame::RemoveFlyFromPage( SwFlyFrame *pToRemove )
static_cast< SwRootFrame * >( GetUpper() )->GetCurrShell()->Imp()
->DisposeAccessibleFrame( pToRemove, true );
}
+#endif
// #i28701# - use new method <SetPageFrame(..)>
pToRemove->SetPageFrame( nullptr );
@@ -956,6 +960,7 @@ void SwPageFrame::MoveFly( SwFlyFrame *pToMove, SwPageFrame *pDest )
// Notify accessible layout. That's required at this place for
// frames only where the anchor is moved. Creation of new frames
// is additionally handled by the SwFrameNotify class.
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
if( GetUpper() &&
static_cast< SwRootFrame * >( GetUpper() )->IsAnyShellAccessible() &&
static_cast< SwRootFrame * >( GetUpper() )->GetCurrShell() )
@@ -963,6 +968,7 @@ void SwPageFrame::MoveFly( SwFlyFrame *pToMove, SwPageFrame *pDest )
static_cast< SwRootFrame * >( GetUpper() )->GetCurrShell()->Imp()
->DisposeAccessibleFrame( pToMove, true );
}
+#endif
// The FlyColl might be gone already, because the page's dtor is being executed.
if ( m_pSortedObjs )
@@ -992,6 +998,7 @@ void SwPageFrame::MoveFly( SwFlyFrame *pToMove, SwPageFrame *pDest )
// Notify accessible layout. That's required at this place for
// frames only where the anchor is moved. Creation of new frames
// is additionally handled by the SwFrameNotify class.
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
if( GetUpper() &&
static_cast< SwRootFrame * >( GetUpper() )->IsAnyShellAccessible() &&
static_cast< SwRootFrame * >( GetUpper() )->GetCurrShell() )
@@ -999,6 +1006,7 @@ void SwPageFrame::MoveFly( SwFlyFrame *pToMove, SwPageFrame *pDest )
static_cast< SwRootFrame * >( GetUpper() )->GetCurrShell()->Imp()
->AddAccessibleFrame( pToMove );
}
+#endif
// #i28701# - correction: move lowers of Writer fly frame
if ( !pToMove->GetDrawObjs() )
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index 557bc2414e63..0eb2134aae9d 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -240,6 +240,7 @@ SwFrameNotify::~SwFrameNotify() COVERITY_NOEXCEPT_FALSE
if ( bAbsP || bPrtP || bChgWidth || bChgHeight ||
bPrtWidth || bPrtHeight || bChgFlyBasePos )
{
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
if( mpFrame->IsAccessibleFrame() )
{
SwRootFrame *pRootFrame = mpFrame->getRootFrame();
@@ -249,6 +250,7 @@ SwFrameNotify::~SwFrameNotify() COVERITY_NOEXCEPT_FALSE
pRootFrame->GetCurrShell()->Imp()->MoveAccessibleFrame( mpFrame, maFrame );
}
}
+#endif
// Notification of anchored objects
if ( mpFrame->GetDrawObjs() )
@@ -368,6 +370,7 @@ SwFrameNotify::~SwFrameNotify() COVERITY_NOEXCEPT_FALSE
}
}
}
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
else if( mpFrame->IsTextFrame() && mbValidSize != mpFrame->isFrameAreaSizeValid() )
{
SwRootFrame *pRootFrame = mpFrame->getRootFrame();
@@ -377,6 +380,7 @@ SwFrameNotify::~SwFrameNotify() COVERITY_NOEXCEPT_FALSE
pRootFrame->GetCurrShell()->Imp()->InvalidateAccessibleFrameContent( mpFrame );
}
}
+#endif
// #i9046# Automatic frame width
SwFlyFrame* pFly = nullptr;
@@ -1564,6 +1568,7 @@ void InsertCnt_( SwLayoutFrame *pLay, SwDoc *pDoc,
// CONTENT_FLOWS_FROM/_TO relation.
// Relation CONTENT_FLOWS_FROM for next paragraph will change
// and relation CONTENT_FLOWS_TO for previous paragraph will change.
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
if ( pFrame->IsTextFrame() )
{
SwViewShell* pViewShell( pFrame->getRootFrame()->GetCurrShell() );
@@ -1585,6 +1590,7 @@ void InsertCnt_( SwLayoutFrame *pLay, SwDoc *pDoc,
pFrame->InvalidateInfFlags();
}
}
+#endif
// OD 12.08.2003 #i17969# - consider horizontal/vertical layout
// for setting position at newly inserted frame
lcl_SetPos( *pFrame, *pLay );
@@ -1651,6 +1657,7 @@ void InsertCnt_( SwLayoutFrame *pLay, SwDoc *pDoc,
// CONTENT_FLOWS_FROM/_TO relation.
// Relation CONTENT_FLOWS_FROM for next paragraph will change
// and relation CONTENT_FLOWS_TO for previous paragraph will change.
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
{
SwViewShell* pViewShell( pFrame->getRootFrame()->GetCurrShell() );
// no notification, if <SwViewShell> is in construction
@@ -1664,6 +1671,7 @@ void InsertCnt_( SwLayoutFrame *pLay, SwDoc *pDoc,
dynamic_cast<SwTextFrame*>(pFrame->FindPrevCnt()) );
}
}
+#endif
if ( bObjsDirect && !pTable->empty() )
static_cast<SwTabFrame*>(pFrame)->RegistFlys();
// OD 12.08.2003 #i17969# - consider horizontal/vertical layout
@@ -1763,6 +1771,7 @@ void InsertCnt_( SwLayoutFrame *pLay, SwDoc *pDoc,
// CONTENT_FLOWS_FROM/_TO relation.
// Relation CONTENT_FLOWS_FROM for next paragraph will change
// and relation CONTENT_FLOWS_TO for previous paragraph will change.
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
{
SwViewShell* pViewShell( pFrame->getRootFrame()->GetCurrShell() );
// no notification, if <SwViewShell> is in construction
@@ -1776,6 +1785,7 @@ void InsertCnt_( SwLayoutFrame *pLay, SwDoc *pDoc,
dynamic_cast<SwTextFrame*>(pFrame->FindPrevCnt()) );
}
}
+#endif
pFrame->CheckDirChange();
// OD 12.08.2003 #i17969# - consider horizontal/vertical layout
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index e3063d59ff21..c6376824057c 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -2326,8 +2326,10 @@ SwLayIdle::SwLayIdle( SwRootFrame *pRt, SwViewShellImp *pI ) :
m_pImp->GetShell()->EnableSmooth( true );
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
if( m_pImp->IsAccessible() )
m_pImp->FireAccessibleEvents();
+#endif
SAL_INFO("sw.idle", "SwLayIdle() return");
diff --git a/sw/source/core/layout/pagechg.cxx b/sw/source/core/layout/pagechg.cxx
index 1c304008aeca..d31090411e5a 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -2058,23 +2058,25 @@ static void lcl_MoveAllLowerObjs( SwFrame* pFrame, const Point& rOffset )
static void lcl_MoveAllLowers( SwFrame* pFrame, const Point& rOffset )
{
- const SwRect aFrame( pFrame->getFrameArea() );
-
// first move the current frame
// RotateFlyFrame3: moved to transform_translate instead of
// direct modification to allow the SwFrame evtl. needed own reactions
pFrame->transform_translate(rOffset);
// Don't forget accessibility:
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
if( pFrame->IsAccessibleFrame() )
{
SwRootFrame *pRootFrame = pFrame->getRootFrame();
if( pRootFrame && pRootFrame->IsAnyShellAccessible() &&
pRootFrame->GetCurrShell() )
{
+ const SwRect aFrame( pFrame->getFrameArea() );
+
pRootFrame->GetCurrShell()->Imp()->MoveAccessibleFrame( pFrame, aFrame );
}
}
+#endif
// the move any objects
lcl_MoveAllLowerObjs( pFrame, rOffset );
diff --git a/sw/source/core/layout/sectfrm.cxx b/sw/source/core/layout/sectfrm.cxx
index 7f738bbc3d5e..9047b2dd42ba 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -198,6 +198,7 @@ void SwSectionFrame::DelEmpty( bool bRemove )
// CONTENT_FLOWS_FROM/_TO relation.
// Relation CONTENT_FLOWS_FROM for current next paragraph will change
// and relation CONTENT_FLOWS_TO for current previous paragraph will change.
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
{
SwViewShell* pViewShell( getRootFrame()->GetCurrShell() );
if ( pViewShell && pViewShell->GetLayout() &&
@@ -208,6 +209,7 @@ void SwSectionFrame::DelEmpty( bool bRemove )
dynamic_cast<SwTextFrame*>(FindPrevCnt()) );
}
}
+#endif
Cut_( bRemove );
}
SwSectionFrame *pMaster = IsFollow() ? FindMaster() : nullptr;
@@ -2705,11 +2707,13 @@ void SwSectionFrame::UpdateAttr_( const SfxPoolItem *pOld, const SfxPoolItem *pN
break;
case RES_PROTECT:
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
{
SwViewShell *pSh = getRootFrame()->GetCurrShell();
if( pSh && pSh->GetLayout()->IsAnyShellAccessible() )
pSh->Imp()->InvalidateAccessibleEditableState( true, this );
}
+#endif
break;
default:
diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx
index b4ac7980e90a..7c4b04eb11d3 100644
--- a/sw/source/core/layout/ssfrm.cxx
+++ b/sw/source/core/layout/ssfrm.cxx
@@ -329,6 +329,7 @@ void SwFrame::DestroyImpl()
// accessible objects for fly and cell frames have been already disposed
// by the destructors of the derived classes.
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
if (IsAccessibleFrame() && !(IsFlyFrame() || IsCellFrame())
&& (GetDep() || IsTextFrame())) // sw_redlinehide: text frame may not have Dep!
{
@@ -344,6 +345,7 @@ void SwFrame::DestroyImpl()
}
}
}
+#endif
if (!m_pDrawObjs)
return;
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 4747cede044b..e4a764f9e0de 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -3190,8 +3190,6 @@ SwTwips SwTabFrame::GrowFrame( SwTwips nDist, bool bTst, bool bInfo )
if ( GetUpper() )
{
- SwRect aOldFrame( getFrameArea() );
-
//The upper only grows as far as needed. nReal provides the distance
//which is already available.
SwTwips nReal = aRectFnSet.GetHeight(GetUpper()->getFramePrintArea());
@@ -3220,12 +3218,15 @@ SwTwips SwTabFrame::GrowFrame( SwTwips nDist, bool bTst, bool bInfo )
aRectFnSet.AddBottom( aFrm, nDist );
}
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
SwRootFrame *pRootFrame = getRootFrame();
if( pRootFrame && pRootFrame->IsAnyShellAccessible() &&
pRootFrame->GetCurrShell() )
{
+ SwRect aOldFrame( getFrameArea() );
pRootFrame->GetCurrShell()->Imp()->MoveAccessibleFrame( this, aOldFrame );
}
+#endif
}
}
@@ -4504,7 +4505,6 @@ void SwRowFrame::AdjustCells( const SwTwips nHeight, const bool bHeight )
SwFrame *pFrame = Lower();
if ( bHeight )
{
- SwRootFrame *pRootFrame = getRootFrame();
SwRectFnSet aRectFnSet(this);
SwRect aOldFrame;
@@ -4581,8 +4581,11 @@ void SwRowFrame::AdjustCells( const SwTwips nHeight, const bool bHeight )
if ( pNotify )
{
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
+ SwRootFrame *pRootFrame = getRootFrame();
if( pRootFrame && pRootFrame->IsAnyShellAccessible() && pRootFrame->GetCurrShell() )
pRootFrame->GetCurrShell()->Imp()->MoveAccessibleFrame( pNotify, aOldFrame );
+#endif
pNotify->InvalidatePrt_();
}
@@ -4853,12 +4856,14 @@ void SwCellFrame::DestroyImpl()
{
// At this stage the lower frames aren't destroyed already,
// therefore we have to do a recursive dispose.
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
SwRootFrame *pRootFrame = getRootFrame();
if( pRootFrame && pRootFrame->IsAnyShellAccessible() &&
pRootFrame->GetCurrShell() )
{
pRootFrame->GetCurrShell()->Imp()->DisposeAccessibleFrame( this, true );
}
+#endif
pMod->Remove( this );
if( !pMod->HasWriterListeners() )
@@ -5449,12 +5454,14 @@ void SwCellFrame::SwClientNotify(const SwModify& rMod, const SfxHint& rHint)
InvalidatePrt();
}
}
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
if(pProtectItem)
{
SwViewShell* pSh = getRootFrame()->GetCurrShell();
if(pSh && pSh->GetLayout()->IsAnyShellAccessible())
pSh->Imp()->InvalidateAccessibleEditableState(true, this);
}
+#endif
if(pFrameDirItem)
{
SetDerivedVert(false);
@@ -5596,6 +5603,7 @@ void SwCellFrame::dumpAsXmlAttributes(xmlTextWriterPtr pWriter) const
void SwCellFrame::Cut()
{
// notification for accessibility
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
{
SwRootFrame *pRootFrame = getRootFrame();
if( pRootFrame && pRootFrame->IsAnyShellAccessible() )
@@ -5607,6 +5615,7 @@ void SwCellFrame::Cut()
}
}
}
+#endif
SwLayoutFrame::Cut();
}
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index 631d728ba4bd..c3ca76fdb45c 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -2766,6 +2766,7 @@ SwTwips SwLayoutFrame::GrowFrame( SwTwips nDist, bool bTst, bool bInfo )
}
}
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
if( bMoveAccFrame && IsAccessibleFrame() )
{
SwRootFrame *pRootFrame = getRootFrame();
@@ -2775,6 +2776,11 @@ SwTwips SwLayoutFrame::GrowFrame( SwTwips nDist, bool bTst, bool bInfo )
pRootFrame->GetCurrShell()->Imp()->MoveAccessibleFrame( this, aOldFrame );
}
}
+#else
+ (void)bMoveAccFrame;
+ (void)aOldFrame;
+#endif
+
return nReal;
}
@@ -2907,6 +2913,7 @@ SwTwips SwLayoutFrame::ShrinkFrame( SwTwips nDist, bool bTst, bool bInfo )
AdjustNeighbourhood( nReal - nShrink );
}
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
if( bMoveAccFrame && IsAccessibleFrame() )
{
SwRootFrame *pRootFrame = getRootFrame();
@@ -2916,6 +2923,11 @@ SwTwips SwLayoutFrame::ShrinkFrame( SwTwips nDist, bool bTst, bool bInfo )
pRootFrame->GetCurrShell()->Imp()->MoveAccessibleFrame( this, aOldFrame );
}
}
+#else
+ (void)aOldFrame;
+ (void)bMoveAccFrame;
+#endif
+
if ( !bTst && (IsCellFrame() || IsColumnFrame() ? nReal : nRealDist) )
{
SwPageFrame *pPage = FindPageFrame();
diff --git a/sw/source/core/text/frmform.cxx b/sw/source/core/text/frmform.cxx
index 0304661e8438..39259de969c6 100644
--- a/sw/source/core/text/frmform.cxx
+++ b/sw/source/core/text/frmform.cxx
@@ -666,6 +666,7 @@ SwContentFrame *SwTextFrame::JoinFrame()
// Relation CONTENT_FLOWS_FROM for current next paragraph will change
// and relation CONTENT_FLOWS_TO for current previous paragraph, which
// is <this>, will change.
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
{
SwViewShell* pViewShell( pFoll->getRootFrame()->GetCurrShell() );
if ( pViewShell && pViewShell->GetLayout() &&
@@ -676,6 +677,8 @@ SwContentFrame *SwTextFrame::JoinFrame()
this );
}
}
+#endif
+
pFoll->Cut();
SetFollow(pNxt);
SwFrame::DestroyFrame(pFoll);
@@ -700,6 +703,7 @@ void SwTextFrame::SplitFrame(TextFrameIndex const nTextPos)
// Relation CONTENT_FLOWS_FROM for current next paragraph will change
// and relation CONTENT_FLOWS_TO for current previous paragraph, which
// is <this>, will change.
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
{
SwViewShell* pViewShell( pNew->getRootFrame()->GetCurrShell() );
if ( pViewShell && pViewShell->GetLayout() &&
@@ -710,6 +714,7 @@ void SwTextFrame::SplitFrame(TextFrameIndex const nTextPos)
this );
}
}
+#endif
// If footnotes end up in pNew bz our actions, we need
// to re-register them
diff --git a/sw/source/core/text/txtfrm.cxx b/sw/source/core/text/txtfrm.cxx
index 6a63cc26500b..c8783a177990 100644
--- a/sw/source/core/text/txtfrm.cxx
+++ b/sw/source/core/text/txtfrm.cxx
@@ -1940,6 +1940,7 @@ void UpdateMergedParaForMove(sw::MergedPara & rMerged,
* Related: fdo#56031 filter out attribute changes that don't matter for
* humans/a11y to stop flooding the destination mortal with useless noise
*/
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
static bool isA11yRelevantAttribute(sal_uInt16 nWhich)
{
return nWhich != RES_CHRATR_RSID;
@@ -1953,6 +1954,7 @@ static bool hasA11yRelevantAttribute( const std::vector<sal_uInt16>& rWhichFmtAt
return false;
}
+#endif // ENABLE_WASM_STRIP_ACCESSIBILITY
// Note: for now this overrides SwClient::SwClientNotify; the intermediary
// classes still override SwClient::Modify, which should continue to work
@@ -2239,6 +2241,7 @@ void SwTextFrame::SwClientNotify(SwModify const& rModify, SfxHint const& rHint)
}
}
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
if( isA11yRelevantAttribute( pNewUpdate->getWhichAttr() ) &&
hasA11yRelevantAttribute( pNewUpdate->getFmtAttrs() ) )
{
@@ -2248,6 +2251,7 @@ void SwTextFrame::SwClientNotify(SwModify const& rModify, SfxHint const& rHint)
pViewSh->InvalidateAccessibleParaAttrs( *this );
}
}
+#endif
}
break;
case RES_OBJECTDYING:
@@ -2545,6 +2549,7 @@ void SwTextFrame::SwClientNotify(SwModify const& rModify, SfxHint const& rHint)
SwContentFrame::SwClientNotify(rModify, sw::LegacyModifyHint(pOld, pNew));
}
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
if (isA11yRelevantAttribute(nWhich))
{
SwViewShell* pViewSh = getRootFrame() ? getRootFrame()->GetCurrShell() : nullptr;
@@ -2553,6 +2558,7 @@ void SwTextFrame::SwClientNotify(SwModify const& rModify, SfxHint const& rHint)
pViewSh->InvalidateAccessibleParaAttrs( *this );
}
}
+#endif
}
break;
diff --git a/sw/source/core/txtnode/txtedt.cxx b/sw/source/core/txtnode/txtedt.cxx
index e734e471060b..259e2c503071 100644
--- a/sw/source/core/txtnode/txtedt.cxx
+++ b/sw/source/core/txtnode/txtedt.cxx
@@ -1390,9 +1390,11 @@ SwRect SwTextFrame::AutoSpell_(SwTextNode & rNode, sal_Int32 nActPos)
aRect = lcl_CalculateRepaintRect(*this, rNode, nChgStart, nChgEnd);
// fdo#71558 notify misspelled word to accessibility
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
SwViewShell* pViewSh = getRootFrame() ? getRootFrame()->GetCurrShell() : nullptr;
if( pViewSh )
pViewSh->InvalidateAccessibleParaAttrs( *this );
+#endif
}
pNode->GetWrong()->SetInvalid( nInvStart, nInvEnd );
diff --git a/sw/source/core/view/pagepreviewlayout.cxx b/sw/source/core/view/pagepreviewlayout.cxx
index ac91694845fe..e6e25d46885f 100644
--- a/sw/source/core/view/pagepreviewlayout.cxx
+++ b/sw/source/core/view/pagepreviewlayout.cxx
@@ -1127,6 +1127,7 @@ bool SwPagePreviewLayout::Paint(vcl::RenderContext& rRenderContext, const tools:
// OD 17.11.2003 #i22014# - no update of accessible preview, if a new
// print preview layout is created during paint.
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
if ( !mbNewLayoutDuringPaint )
{
// update at accessibility interface
@@ -1136,6 +1137,7 @@ bool SwPagePreviewLayout::Paint(vcl::RenderContext& rRenderContext, const tools:
mrLayoutRootFrame.GetPageByPageNum( mnSelectedPageNum ),
maWinSize );
}
+#endif
pOutputDev->SetMapMode( aSavedMapMode );
mrParentViewShell.maVisArea.Clear();
diff --git a/sw/source/core/view/viewimp.cxx b/sw/source/core/view/viewimp.cxx
index 317480500eac..753e9f09d9de 100644
--- a/sw/source/core/view/viewimp.cxx
+++ b/sw/source/core/view/viewimp.cxx
@@ -97,7 +97,9 @@ SwViewShellImp::SwViewShellImp( SwViewShell *pParent ) :
SwViewShellImp::~SwViewShellImp()
{
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
m_pAccessibleMap.reset();
+#endif
m_pPagePreviewLayout.reset();
@@ -282,6 +284,7 @@ void SwViewShellImp::InitPagePreviewLayout()
m_pPagePreviewLayout.reset( new SwPagePreviewLayout( *m_pShell, *(m_pShell->GetLayout()) ) );
}
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
void SwViewShellImp::UpdateAccessible()
{
// We require a layout and an XModel to be accessible.
@@ -453,5 +456,6 @@ void SwViewShellImp::FireAccessibleEvents()
if( IsAccessible() )
GetAccessibleMap().FireEvents();
}
+#endif // ENABLE_WASM_STRIP_ACCESSIBILITY
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/view/viewpg.cxx b/sw/source/core/view/viewpg.cxx
index 2c4d195ba3eb..ca454b5452e7 100644
--- a/sw/source/core/view/viewpg.cxx
+++ b/sw/source/core/view/viewpg.cxx
@@ -37,7 +37,11 @@ SwPagePreviewLayout* SwViewShell::PagePreviewLayout()
void SwViewShell::ShowPreviewSelection( sal_uInt16 nSelPage )
{
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
Imp()->InvalidateAccessiblePreviewSelection( nSelPage );
+#else
+ (void)nSelPage;
+#endif
}
// adjust view options for page preview
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 522813e4b912..107c29134f12 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -247,10 +247,12 @@ void SwViewShell::ImplEndAction( const bool bIdleEnd )
UISizeNotify();
// tdf#101464 print preview may generate events if another view shell
// performs layout...
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
if (IsPreview() && Imp()->IsAccessible())
{
Imp()->FireAccessibleEvents();
}
+#endif
return;
}
@@ -451,8 +453,10 @@ void SwViewShell::ImplEndAction( const bool bIdleEnd )
UISizeNotify();
++mnStartAction;
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
if( Imp()->IsAccessible() )
Imp()->FireAccessibleEvents();
+#endif
}
void SwViewShell::ImplStartAction()
@@ -1233,8 +1237,10 @@ void SwViewShell::VisPortChgd( const SwRect &rRect)
if ( !bScrolled && pPostItMgr && pPostItMgr->HasNotes() && pPostItMgr->ShowNotes() )
pPostItMgr->CorrectPositions();
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
if( Imp()->IsAccessible() )
Imp()->UpdateAccessible();
+#endif
}
bool SwViewShell::SmoothScroll( tools::Long lXDiff, tools::Long lYDiff, const tools::Rectangle *pRect )
@@ -2385,8 +2391,10 @@ void SwViewShell::SetReadonlyOption(bool bSet)
}
else if ( GetWin() )
GetWin()->Invalidate();
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
if( Imp()->IsAccessible() )
Imp()->InvalidateAccessibleEditableState( false );
+#endif
}
void SwViewShell::SetPDFExportOption(bool bSet)
@@ -2439,6 +2447,7 @@ bool SwViewShell::IsNewLayout() const
return GetLayout()->IsNewLayout();
}
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
uno::Reference< css::accessibility::XAccessible > SwViewShell::CreateAccessible()
{
uno::Reference< css::accessibility::XAccessible > xAcc;
@@ -2542,6 +2551,7 @@ void SwViewShell::ApplyAccessibilityOptions(SvtAccessibilityOptions const & rAcc
mpOpt->SetSelectionInReadonly(rAccessibilityOptions.IsSelectionInReadonly());
}
}
+#endif // ENABLE_WASM_STRIP_ACCESSIBILITY
ShellResource* SwViewShell::GetShellRes()
{
diff --git a/sw/source/filter/ww8/docxexport.cxx b/sw/source/filter/ww8/docxexport.cxx
index e9576057a17a..38419bd872ef 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -396,6 +396,8 @@ OString DocxExport::OutputChart( uno::Reference< frame::XModel > const & xModel,
// tdf#134973: the model could get modified: e.g., calling XChartDocument::getSubTitle(),
// which creates the object if absent, and sets the modified state.
xModifiable->setModified(bOldModified);
+#else
+ (void)xModel;
#endif
return OUStringToOString( sId, RTL_TEXTENCODING_UTF8 );
}
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index 3074d96f7bab..f0e18514a11c 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -944,13 +944,10 @@ void SwModule::ConfigurationChanged( utl::ConfigurationBroadcaster* pBrdCst, Con
{
m_bAuthorInitialised = false;
}
- else if ( pBrdCst == m_pColorConfig.get() || pBrdCst == m_pAccessibilityOptions.get() )
+ else if ( pBrdCst == m_pColorConfig.get() )
{
- bool bAccessibility = false;
if( pBrdCst == m_pColorConfig.get() )
SwViewOption::ApplyColorConfigValues(*m_pColorConfig);
- else
- bAccessibility = true;
//invalidate all edit windows
SfxViewShell* pViewShell = SfxViewShell::GetFirst();
@@ -962,19 +959,38 @@ void SwModule::ConfigurationChanged( utl::ConfigurationBroadcaster* pBrdCst, Con
dynamic_cast< const SwPagePreview *>( pViewShell ) != nullptr ||
dynamic_cast< const SwSrcView *>( pViewShell ) != nullptr)
{
- if(bAccessibility)
- {
- if(auto pSwView = dynamic_cast<SwView *>( pViewShell ))
- pSwView->ApplyAccessibilityOptions(*m_pAccessibilityOptions);
- else if(auto pPagePreview = dynamic_cast<SwPagePreview *>( pViewShell ))
- pPagePreview->ApplyAccessibilityOptions(*m_pAccessibilityOptions);
- }
pViewShell->GetWindow()->Invalidate();
}
}
pViewShell = SfxViewShell::GetNext( *pViewShell );
}
}
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
+ else if ( pBrdCst == m_pAccessibilityOptions.get() )
+ {
+ //set Accessibility options
+ SfxViewShell* pViewShell = SfxViewShell::GetFirst();
+ while(pViewShell)
+ {
+ if(pViewShell->GetWindow())
+ {
+ auto pSwView = dynamic_cast<SwView *>( pViewShell );
+ auto pPagePreview = dynamic_cast<SwPagePreview *>( pViewShell );
+
+ if(pSwView)
+ pSwView->ApplyAccessibilityOptions(*m_pAccessibilityOptions);
+ else if(pPagePreview)
+ pPagePreview->ApplyAccessibilityOptions(*m_pAccessibilityOptions);
+
+ if(pSwView || pPagePreview || dynamic_cast< const SwSrcView *>( pViewShell ) != nullptr)
+ {
+ pViewShell->GetWindow()->Invalidate();
+ }
+ }
+ pViewShell = SfxViewShell::GetNext( *pViewShell );
+ }
+ }
+#endif
else if( pBrdCst == m_pCTLOptions.get() )
{
const SfxObjectShell* pObjSh = SfxObjectShell::GetFirst();
diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx
index d642e140f6f7..66e26db34a3a 100644
--- a/sw/source/uibase/app/docst.cxx
+++ b/sw/source/uibase/app/docst.cxx
@@ -1531,12 +1531,14 @@ void SwDocShell::MakeByExample( const OUString &rName, SfxStyleFamily nFamily,
m_xDoc->BroadcastStyleOperation(rName, nFamily, SfxHintId::StyleSheetCreated);
}
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
sfx::AccessibilityIssueCollection SwDocShell::runAccessibilityCheck()
{
sw::AccessibilityCheck aCheck(m_xDoc.get());
aCheck.check();
return aCheck.getIssueCollection();
}
+#endif
std::set<Color> SwDocShell::GetDocColors()
{
diff --git a/sw/source/uibase/docvw/AnnotationWin.cxx b/sw/source/uibase/docvw/AnnotationWin.cxx
index 49ea845944b8..78d5e6efd1b7 100644
--- a/sw/source/uibase/docvw/AnnotationWin.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin.cxx
@@ -120,9 +120,11 @@ SwAnnotationWin::SwAnnotationWin( SwEditWin& rEditWin,
mpShadow->setVisible(false);
}
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
mrMgr.ConnectSidebarWinToFrame( *(mrSidebarItem.maLayoutInfo.mpAnchorFrame),
mrSidebarItem.GetFormatField(),
*this );
+#endif
if (SupportsDoubleBuffering())
// When double-buffering, allow parents to paint on our area. That's
@@ -140,8 +142,10 @@ void SwAnnotationWin::dispose()
if (IsDisposed())
return;
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
mrMgr.DisconnectSidebarWinFromFrame( *(mrSidebarItem.maLayoutInfo.mpAnchorFrame),
*this );
+#endif
Disable();
diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx b/sw/source/uibase/docvw/AnnotationWin2.cxx
index f463bf7597f1..ee069fe66d61 100644
--- a/sw/source/uibase/docvw/AnnotationWin2.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin2.cxx
@@ -1367,15 +1367,18 @@ bool SwAnnotationWin::IsScrollbarVisible() const
void SwAnnotationWin::ChangeSidebarItem( SwSidebarItem const & rSidebarItem )
{
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
const bool bAnchorChanged = mpAnchorFrame != rSidebarItem.maLayoutInfo.mpAnchorFrame;
if ( bAnchorChanged )
{
mrMgr.DisconnectSidebarWinFromFrame( *mpAnchorFrame, *this );
}
+#endif
mrSidebarItem = rSidebarItem;
mpAnchorFrame = mrSidebarItem.maLayoutInfo.mpAnchorFrame;
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
if (SidebarWinAccessible* pAcc = dynamic_cast<SidebarWinAccessible*>(GetWindowPeer()))
pAcc->ChangeSidebarItem( mrSidebarItem );
@@ -1385,8 +1388,10 @@ void SwAnnotationWin::ChangeSidebarItem( SwSidebarItem const & rSidebarItem )
mrSidebarItem.GetFormatField(),
*this );
}
+#endif
}
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
css::uno::Reference< css::accessibility::XAccessible > SwAnnotationWin::CreateAccessible()
{
rtl::Reference<SidebarWinAccessible> pAcc( new SidebarWinAccessible( *this,
@@ -1395,6 +1400,7 @@ css::uno::Reference< css::accessibility::XAccessible > SwAnnotationWin::CreateAc
SetWindowPeer( pAcc, pAcc.get() );
return pAcc;
}
+#endif
} // eof of namespace sw::sidebarwindows
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx
index d8b79c6e9d7e..131176938827 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -2400,6 +2400,7 @@ void SwPostItMgr::ToggleInsModeOnActiveSidebarWin()
}
}
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
void SwPostItMgr::ConnectSidebarWinToFrame( const SwFrame& rFrame,
const SwFormatField& rFormatField,
SwAnnotationWin& rSidebarWin )
@@ -2430,6 +2431,7 @@ void SwPostItMgr::DisconnectSidebarWinFromFrame( const SwFrame& rFrame,
}
}
}
+#endif // ENABLE_WASM_STRIP_ACCESSIBILITY
bool SwPostItMgr::HasFrameConnectedSidebarWins( const SwFrame& rFrame )
{
diff --git a/sw/source/uibase/docvw/SidebarTxtControl.cxx b/sw/source/uibase/docvw/SidebarTxtControl.cxx
index e9ce19243225..b9042ee768c9 100644
--- a/sw/source/uibase/docvw/SidebarTxtControl.cxx
+++ b/sw/source/uibase/docvw/SidebarTxtControl.cxx
@@ -120,7 +120,9 @@ void SidebarTextControl::SetDrawingArea(weld::DrawingArea* pDrawingArea)
pDrawingArea->set_cursor(PointerStyle::Text);
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
InitAccessible();
+#endif
}
void SidebarTextControl::SetCursorLogicPosition(const Point& rPosition, bool bPoint, bool bClearMark)
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index 93560ec91f3b..0df76e6feb7f 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -5342,14 +5342,18 @@ void SwEditWin::GetFocus()
{
m_rView.GotFocus();
Window::GetFocus();
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
m_rView.GetWrtShell().InvalidateAccessibleFocus();
+#endif
}
}
void SwEditWin::LoseFocus()
{
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
if (m_rView.GetWrtShellPtr())
m_rView.GetWrtShell().InvalidateAccessibleFocus();
+#endif
Window::LoseFocus();
if( m_pQuickHlpData && m_pQuickHlpData->m_bIsDisplayed )
m_pQuickHlpData->Stop( m_rView.GetWrtShell() );
@@ -6039,6 +6043,7 @@ void SwEditWin::SetChainMode( bool bOn )
m_rView.GetViewFrame()->GetBindings().Invalidate(aInva);
}
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
uno::Reference< css::accessibility::XAccessible > SwEditWin::CreateAccessible()
{
SolarMutexGuard aGuard; // this should have happened already!!!
@@ -6051,6 +6056,7 @@ uno::Reference< css::accessibility::XAccessible > SwEditWin::CreateAccessible()
return xAcc;
}
+#endif
void QuickHelpData::Move( QuickHelpData& rCpy )
{
diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx
index 1cf352437d83..a81b678000af 100644
--- a/sw/source/uibase/inc/edtwin.hxx
+++ b/sw/source/uibase/inc/edtwin.hxx
@@ -244,7 +244,9 @@ public:
const SwView &GetView() const { return m_rView; }
SwView &GetView() { return m_rView; }
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
virtual css::uno::Reference< css::accessibility::XAccessible > CreateAccessible() override;
+#endif
static tools::Long GetDDStartPosX() { return m_nDDStartPosX; }
static tools::Long GetDDStartPosY() { return m_nDDStartPosY; }
diff --git a/sw/source/uibase/inc/pview.hxx b/sw/source/uibase/inc/pview.hxx
index 6a2c898069f0..4acc0e693117 100644
--- a/sw/source/uibase/inc/pview.hxx
+++ b/sw/source/uibase/inc/pview.hxx
@@ -152,7 +152,9 @@ public:
*/
bool SetBookPreviewMode( const bool _bBookPreview );
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
virtual css::uno::Reference<css::accessibility::XAccessible> CreateAccessible() override;
+#endif
};
/**
@@ -266,8 +268,10 @@ public:
SwDocShell* GetDocShell();
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
// apply Accessibility options
void ApplyAccessibilityOptions(SvtAccessibilityOptions const & rAccessibilityOptions);
+#endif
// Inline method to request values of new members
// <mbResetFormDesignMode> and <mbFormDesignModeToReset>
diff --git a/sw/source/uibase/shells/basesh.cxx b/sw/source/uibase/shells/basesh.cxx
index 78e37c09c756..2fbb64ae8dc5 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -2690,6 +2690,7 @@ void SwBaseShell::ExecDlg(SfxRequest &rReq)
}
}
break;
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
case SID_ACCESSIBILITY_CHECK:
{
sw::AccessibilityCheck aCheck(rSh.GetDoc());
@@ -2698,6 +2699,7 @@ void SwBaseShell::ExecDlg(SfxRequest &rReq)
aDialog.run();
}
break;
+#endif
default:OSL_FAIL("wrong Dispatcher (basesh.cxx)");
}
if(!bDone)
diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx
index 8fc8f681dbea..961a94f5f6e7 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -1120,7 +1120,9 @@ void SwPagePreview::Init()
aOpt.SetHideWhitespaceMode( false );
GetViewShell()->ApplyViewOptions( aOpt );
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
GetViewShell()->ApplyAccessibilityOptions(SW_MOD()->GetAccessibilityOptions());
+#endif
// adjust view shell option to the same as for print
SwPrintData const aPrintOptions = *SW_MOD()->GetPrtOptions(false);
@@ -1808,6 +1810,7 @@ bool SwPagePreview::HandleWheelCommands( const CommandEvent& rCEvt )
return bOk;
}
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
uno::Reference< css::accessibility::XAccessible >
SwPagePreviewWin::CreateAccessible()
{
@@ -1831,6 +1834,7 @@ void SwPagePreview::ApplyAccessibilityOptions(SvtAccessibilityOptions const & rA
{
GetViewShell()->ApplyAccessibilityOptions(rAccessibilityOptions);
}
+#endif // ENABLE_WASM_STRIP_ACCESSIBILITY
void SwPagePreview::ShowHScrollbar(bool bShow)
{
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index c874e021375a..6233b2a836af 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -973,7 +973,9 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
m_pWrtShell->SetUIOptions( aUsrPref );
m_pWrtShell->SetReadOnlyAvailable( aUsrPref.IsCursorInProtectedArea() );
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
m_pWrtShell->ApplyAccessibilityOptions(SW_MOD()->GetAccessibilityOptions());
+#endif
if( m_pWrtShell->GetDoc()->getIDocumentState().IsUpdateExpField() )
{
diff --git a/sw/source/uibase/uiview/view0.cxx b/sw/source/uibase/uiview/view0.cxx
index 8d7e8521664e..176927ef857c 100644
--- a/sw/source/uibase/uiview/view0.cxx
+++ b/sw/source/uibase/uiview/view0.cxx
@@ -113,6 +113,7 @@ view::XSelectionSupplier* SwView::GetUNOObject()
return m_pViewImpl->GetUNOObject();
}
+#ifndef ENABLE_WASM_STRIP_ACCESSIBILITY
void SwView::ApplyAccessibilityOptions(SvtAccessibilityOptions const & rAccessibilityOptions)
{
m_pWrtShell->ApplyAccessibilityOptions(rAccessibilityOptions);
@@ -121,6 +122,7 @@ void SwView::ApplyAccessibilityOptions(SvtAccessibilityOptions const & rAccessib
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list