offapi/UnoApi_offapi.mk | 1
offapi/com/sun/star/drawing/AccessibleSlideView.idl | 41 -------------------
solenv/clang-format/excludelist | 2
sw/source/core/access/accembedded.cxx | 42 +++-----------------
sw/source/core/access/accembedded.hxx | 21 ++--------
5 files changed, 12 insertions(+), 95 deletions(-)
New commits:
commit 070732f622ac54f940f41d7d80883a2385725111
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Tue Jun 24 16:31:34 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Wed Jun 25 07:42:10 2025 +0200
sw a11y: clang-format SwAccessibleEmbeddedObject code
Only few lines need to be reformatted.
Change-Id: I3ade15712e90609c4156ac79e3c75b98c5e0245d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186915
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/solenv/clang-format/excludelist b/solenv/clang-format/excludelist
index 7150025c32d6..04939eca45d2 100644
--- a/solenv/clang-format/excludelist
+++ b/solenv/clang-format/excludelist
@@ -12012,8 +12012,6 @@ sw/source/core/access/acccontext.cxx
sw/source/core/access/acccontext.hxx
sw/source/core/access/accdoc.cxx
sw/source/core/access/accdoc.hxx
-sw/source/core/access/accembedded.cxx
-sw/source/core/access/accembedded.hxx
sw/source/core/access/accfootnote.cxx
sw/source/core/access/accfootnote.hxx
sw/source/core/access/accframe.cxx
diff --git a/sw/source/core/access/accembedded.cxx
b/sw/source/core/access/accembedded.cxx
index babf033e702e..11fef0f2b51a 100644
--- a/sw/source/core/access/accembedded.cxx
+++ b/sw/source/core/access/accembedded.cxx
@@ -36,9 +36,7 @@ SwAccessibleEmbeddedObject::SwAccessibleEmbeddedObject(
{
}
-SwAccessibleEmbeddedObject::~SwAccessibleEmbeddedObject()
-{
-}
+SwAccessibleEmbeddedObject::~SwAccessibleEmbeddedObject() {}
// XAccessibleExtendedAttributes
OUString SAL_CALL SwAccessibleEmbeddedObject::getExtendedAttributes()
@@ -48,16 +46,16 @@ OUString SAL_CALL
SwAccessibleEmbeddedObject::getExtendedAttributes()
OUString style;
SwFlyFrame* pFFrame = getFlyFrame();
- if( pFFrame )
+ if (pFFrame)
{
style = "style:";
SwContentFrame* pCFrame;
pCFrame = pFFrame->ContainsContent();
- if( pCFrame )
+ if (pCFrame)
{
assert(pCFrame->IsNoTextFrame());
- SwContentNode *const pCNode =
static_cast<SwNoTextFrame*>(pCFrame)->GetNode();
- if( pCNode )
+ SwContentNode* const pCNode =
static_cast<SwNoTextFrame*>(pCFrame)->GetNode();
+ if (pCNode)
{
style +=
static_cast<SwOLENode*>(pCNode)->GetOLEObj().GetStyleString();
}
diff --git a/sw/source/core/access/accembedded.hxx
b/sw/source/core/access/accembedded.hxx
index e660b914b37d..f3d8aa28874e 100644
--- a/sw/source/core/access/accembedded.hxx
+++ b/sw/source/core/access/accembedded.hxx
@@ -34,7 +34,7 @@ protected:
public:
SwAccessibleEmbeddedObject(std::shared_ptr<SwAccessibleMap> const&
pInitMap,
- const SwFlyFrame* pFlyFrame );
+ const SwFlyFrame* pFlyFrame);
// XAccessibleExtendedAttributes
virtual OUString SAL_CALL getExtendedAttributes() override;
commit 6eb2f9ef4154634ac2a287976bb8ce0f746b49c7
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Tue Jun 24 16:29:54 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Wed Jun 25 07:42:04 2025 +0200
sw a11y: Use ImplInheritanceHelper for SwAccessibleEmbeddedObject
Change-Id: Ic5530bdc9a222ac825282a831cb29aa08a66f9b3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186914
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/sw/source/core/access/accembedded.cxx
b/sw/source/core/access/accembedded.cxx
index 4ba8a40cc236..babf033e702e 100644
--- a/sw/source/core/access/accembedded.cxx
+++ b/sw/source/core/access/accembedded.cxx
@@ -31,9 +31,8 @@ using namespace ::com::sun::star::lang;
using namespace ::com::sun::star::accessibility;
SwAccessibleEmbeddedObject::SwAccessibleEmbeddedObject(
- std::shared_ptr<SwAccessibleMap> const& pInitMap,
- const SwFlyFrame* pFlyFrame ) :
- SwAccessibleNoTextFrame( pInitMap, AccessibleRole::EMBEDDED_OBJECT,
pFlyFrame )
+ std::shared_ptr<SwAccessibleMap> const& pInitMap, const SwFlyFrame*
pFlyFrame)
+ : ImplInheritanceHelper(pInitMap, AccessibleRole::EMBEDDED_OBJECT,
pFlyFrame)
{
}
@@ -41,31 +40,6 @@ SwAccessibleEmbeddedObject::~SwAccessibleEmbeddedObject()
{
}
-// XInterface
-css::uno::Any SAL_CALL
- SwAccessibleEmbeddedObject::queryInterface (const css::uno::Type & rType)
-{
- css::uno::Any aReturn = SwAccessibleNoTextFrame::queryInterface (rType);
- if ( ! aReturn.hasValue())
- aReturn = ::cppu::queryInterface (rType,
- static_cast< css::accessibility::XAccessibleExtendedAttributes*
>(this) );
- return aReturn;
-}
-
-void SAL_CALL
- SwAccessibleEmbeddedObject::acquire()
- noexcept
-{
- SwAccessibleNoTextFrame::acquire ();
-}
-
-void SAL_CALL
- SwAccessibleEmbeddedObject::release()
- noexcept
-{
- SwAccessibleNoTextFrame::release ();
-}
-
// XAccessibleExtendedAttributes
OUString SAL_CALL SwAccessibleEmbeddedObject::getExtendedAttributes()
{
diff --git a/sw/source/core/access/accembedded.hxx
b/sw/source/core/access/accembedded.hxx
index c60ea4cc7447..e660b914b37d 100644
--- a/sw/source/core/access/accembedded.hxx
+++ b/sw/source/core/access/accembedded.hxx
@@ -22,9 +22,11 @@
#include "accnotextframe.hxx"
#include <com/sun/star/accessibility/XAccessibleExtendedAttributes.hpp>
+#include <cppuhelper/implbase.hxx>
-class SwAccessibleEmbeddedObject : public SwAccessibleNoTextFrame
- , public css::accessibility::XAccessibleExtendedAttributes
+class SwAccessibleEmbeddedObject
+ : public cppu::ImplInheritanceHelper<SwAccessibleNoTextFrame,
+
css::accessibility::XAccessibleExtendedAttributes>
{
protected:
@@ -34,19 +36,6 @@ public:
SwAccessibleEmbeddedObject(std::shared_ptr<SwAccessibleMap> const&
pInitMap,
const SwFlyFrame* pFlyFrame );
- // XInterface
-
- virtual css::uno::Any SAL_CALL
- queryInterface (const css::uno::Type & rType) override;
-
- virtual void SAL_CALL
- acquire()
- noexcept override;
-
- virtual void SAL_CALL
- release()
- noexcept override;
-
// XAccessibleExtendedAttributes
virtual OUString SAL_CALL getExtendedAttributes() override;
};
commit a24b625b5144a5140b3a1793cae338f203cd02b4
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Tue Jun 24 16:12:03 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Wed Jun 25 07:41:58 2025 +0200
[API CHANGE]: a11y: Drop css::drawing::AccessibleSlideView
Drop the unpublished service
com::sun::star::drawing::AccessibleSlideView.
It's not implemented or used anywhere.
A search in Google and on Ask [1] didn't give
any results that would suggest this unpublished service
would be relevant for third party code.
[1] https://ask.libreoffice.org/
Change-Id: I6071ebdc51cbdcdf85b9d89bb495f893b995ca92
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/186913
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk
index 072bdd918fe6..ae807e2edd9a 100644
--- a/offapi/UnoApi_offapi.mk
+++ b/offapi/UnoApi_offapi.mk
@@ -755,7 +755,6 @@ $(eval $(call
gb_UnoApi_add_idlfiles_noheader,offapi,com/sun/star/drawing,\
AccessibleImageBullet \
AccessibleOLEShape \
AccessibleShape \
- AccessibleSlideView \
AppletShape \
Background \
BitmapTable \
diff --git a/offapi/com/sun/star/drawing/AccessibleSlideView.idl
b/offapi/com/sun/star/drawing/AccessibleSlideView.idl
deleted file mode 100644
index 9c6669a52bb4..000000000000
--- a/offapi/com/sun/star/drawing/AccessibleSlideView.idl
+++ /dev/null
@@ -1,41 +0,0 @@
-/* -*- 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 .
- */
-
-module com { module sun { module star { module drawing {
-
-/** The AccessibleSlideView service is implemented by
- slide views of Impress documents.
-
- <p>An accessible slide view gives access to all visible slides of a
- slide view.</p>
-
- @since OOo 1.1.2
-*/
-service AccessibleSlideView
-{
- interface ::com::sun::star::accessibility::XAccessible;
- interface ::com::sun::star::accessibility::XAccessibleContext;
- interface ::com::sun::star::accessibility::XAccessibleEventBroadcaster;
- interface ::com::sun::star::accessibility::XAccessibleComponent;
- interface ::com::sun::star::accessibility::XAccessibleSelection;
-};
-
-}; }; }; };
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
