sd/Library_sd.mk | 1 sd/source/filter/html/a11yex.cxx | 46 +++++++++++++++++++++++++++++++++ sd/source/filter/html/sdhtmlfilter.cxx | 5 --- sd/source/ui/unoidl/unomodel.cxx | 2 - 4 files changed, 48 insertions(+), 6 deletions(-)
New commits: commit 173af8974c03e9a0e65ae3e64be1a9f6c55ad5c7 Author: Henry Castro <hcas...@collabora.com> AuthorDate: Mon Sep 15 06:30:26 2025 -0400 Commit: Caolán McNamara <caolan.mcnam...@collabora.com> CommitDate: Wed Sep 17 09:36:10 2025 +0200 sd: create new file to export accessibility HTML The exported HTML does not require attributes; it only needs accessibility strings, which are not yet implemented for graphics or charts. Change-Id: Ifb08927659bf245259a3ef87125569a62093c3fc Signed-off-by: Henry Castro <hcas...@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191023 Tested-by: Caolán McNamara <caolan.mcnam...@collabora.com> Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com> diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index e340d8b18c73..012c1ad49522 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -200,6 +200,7 @@ $(eval $(call gb_Library_add_exception_objects,sd,\ sd/source/filter/ppt/propread \ sd/source/filter/grf/sdgrffilter \ sd/source/filter/html/htmlex \ + sd/source/filter/html/a11yex \ sd/source/filter/html/sdhtmlfilter \ sd/source/filter/pdf/sdpdffilter \ sd/source/filter/sdfilter \ diff --git a/sd/source/filter/html/a11yex.cxx b/sd/source/filter/html/a11yex.cxx new file mode 100644 index 000000000000..ee492ae75876 --- /dev/null +++ b/sd/source/filter/html/a11yex.cxx @@ -0,0 +1,46 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#include <sal/log.hxx> +#include <svx/svdoutl.hxx> +#include <svx/svdogrp.hxx> +#include <svx/svdotable.hxx> +#include <svx/svdograf.hxx> +#include <tools/debug.hxx> + +#include <drawdoc.hxx> +#include <DrawDocShell.hxx> +#include <Outliner.hxx> +#include <sdpage.hxx> + +#include "htmlex.hxx" +#include <sdhtmlfilter.hxx> + +using namespace ::com::sun::star; +using namespace ::com::sun::star::uno; +using namespace ::com::sun::star::document; + +using namespace sdr::table; + +void SdHTMLFilter::ExportPage(SdrOutliner* pOutliner, SdPage* pPage, OUStringBuffer& rHtml) +{ + HtmlExport::ExportPage(pOutliner, pPage, rHtml); +} + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/filter/html/sdhtmlfilter.cxx b/sd/source/filter/html/sdhtmlfilter.cxx index 6b5939e9e40f..01aaae8cc64d 100644 --- a/sd/source/filter/html/sdhtmlfilter.cxx +++ b/sd/source/filter/html/sdhtmlfilter.cxx @@ -42,9 +42,4 @@ bool SdHTMLFilter::Export() return true; } -void SdHTMLFilter::ExportPage(SdrOutliner* pOutliner, SdPage* pPage, OUStringBuffer& rHtml) -{ - HtmlExport::ExportPage(pOutliner, pPage, rHtml); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit 3736204cbeb312a9cc4dd9e37abcf41173cb48b5 Author: Henry Castro <hcas...@collabora.com> AuthorDate: Tue Sep 16 06:51:22 2025 -0400 Commit: Caolán McNamara <caolan.mcnam...@collabora.com> CommitDate: Wed Sep 17 09:36:03 2025 +0200 sd: rename 'ally' to 'a11y' for consistency Change-Id: Iabd3fc139d9a842aadab4fb8af8426034cec8db3 Signed-off-by: Henry Castro <hcas...@collabora.com> Reviewed-on: https://gerrit.libreoffice.org/c/core/+/191026 Reviewed-by: Caolán McNamara <caolan.mcnam...@collabora.com> Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com> diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index 7933cbd0deaa..607375fc2c84 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -4680,7 +4680,7 @@ OString SdXImpressDocument::getPresentationInfo(bool bAllyState) const if (pOutliner) { SdHTMLFilter::ExportPage(pOutliner, pPage, aHtml); - aJsonWriter.put("ally", aHtml.makeStringAndClear()); + aJsonWriter.put("a11y", aHtml.makeStringAndClear()); pOutliner->Clear(); } }