include/oox/helper/attributelist.hxx | 3 +--
oox/source/drawingml/diagram/layoutnodecontext.cxx | 1 +
oox/source/drawingml/misccontexts.cxx | 1 +
oox/source/helper/attributelist.cxx | 5 -----
oox/source/ppt/commonbehaviorcontext.cxx | 1 +
oox/source/ppt/commontimenodecontext.cxx | 1 +
oox/source/ppt/conditioncontext.cxx | 1 +
oox/source/ppt/customshowlistcontext.cxx | 1 +
oox/source/ppt/presentationfragmenthandler.cxx | 1 +
oox/source/ppt/timenodelistcontext.cxx | 1 +
oox/source/ppt/timetargetelementcontext.cxx | 1 +
sc/source/filter/inc/connectionsbuffer.hxx | 2 +-
sc/source/filter/oox/connectionsbuffer.cxx | 2 +-
sc/source/filter/oox/pivottablebuffer.cxx | 1 +
14 files changed, 13 insertions(+), 9 deletions(-)
New commits:
commit 2578da962608a2123d637b80499123c258829582
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Thu Feb 20 10:14:53 2025 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Thu Feb 20 12:27:49 2025 +0100
return concrete UNO class in oox::AttributeList::getFastAttributeList
Change-Id: I9d149b15f495080f25c1ace7fa29c4c9bb20ce10
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181929
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/include/oox/helper/attributelist.hxx
b/include/oox/helper/attributelist.hxx
index 7e3c773a5781..af0883d98c40 100644
--- a/include/oox/helper/attributelist.hxx
+++ b/include/oox/helper/attributelist.hxx
@@ -86,8 +86,7 @@ public:
const css::uno::Reference<
css::xml::sax::XFastAttributeList >& rxAttribs );
~AttributeList();
- /** Returns the wrapped com.sun.star.xml.sax.XFastAttributeList object. */
- css::uno::Reference<css::xml::sax::XFastAttributeList>
getFastAttributeList() const;
+ const rtl::Reference<sax_fastparser::FastAttributeList> &
getFastAttributeList() const { return mxAttribs; }
/** Returns true, if the specified attribute is present. */
bool hasAttribute( sal_Int32 nAttrToken ) const;
diff --git a/oox/source/drawingml/diagram/layoutnodecontext.cxx
b/oox/source/drawingml/diagram/layoutnodecontext.cxx
index de7d25286f64..d82dc881b844 100644
--- a/oox/source/drawingml/diagram/layoutnodecontext.cxx
+++ b/oox/source/drawingml/diagram/layoutnodecontext.cxx
@@ -27,6 +27,7 @@
#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>
#include <sal/log.hxx>
+#include <sax/fastattribs.hxx>
#include <utility>
using namespace ::oox::core;
diff --git a/oox/source/drawingml/misccontexts.cxx
b/oox/source/drawingml/misccontexts.cxx
index ccbff30df1a3..53548c9b5bd4 100644
--- a/oox/source/drawingml/misccontexts.cxx
+++ b/oox/source/drawingml/misccontexts.cxx
@@ -27,6 +27,7 @@
#include <oox/token/tokens.hxx>
#include <vcl/GraphicExternalLink.hxx>
#include <vcl/graph.hxx>
+#include <sax/fastattribs.hxx>
#include <unordered_map>
#include <frozen/bits/defines.h>
#include <frozen/bits/elsa_std.h>
diff --git a/oox/source/helper/attributelist.cxx
b/oox/source/helper/attributelist.cxx
index dc5c54c14d3d..8944513302a5 100644
--- a/oox/source/helper/attributelist.cxx
+++ b/oox/source/helper/attributelist.cxx
@@ -150,11 +150,6 @@ AttributeList::AttributeList( const Reference<
XFastAttributeList >& rxAttribs )
AttributeList::~AttributeList() = default;
-css::uno::Reference<css::xml::sax::XFastAttributeList>
AttributeList::getFastAttributeList() const
-{
- return mxAttribs;
-}
-
bool AttributeList::hasAttribute( sal_Int32 nAttrToken ) const
{
return mxAttribs->hasAttribute( nAttrToken );
diff --git a/oox/source/ppt/commonbehaviorcontext.cxx
b/oox/source/ppt/commonbehaviorcontext.cxx
index ca0a0c9ec7ac..f6e13c9b0823 100644
--- a/oox/source/ppt/commonbehaviorcontext.cxx
+++ b/oox/source/ppt/commonbehaviorcontext.cxx
@@ -23,6 +23,7 @@
#include <oox/helper/attributelist.hxx>
#include <oox/token/namespaces.hxx>
#include <oox/ppt/pptfilterhelpers.hxx>
+#include <sax/fastattribs.hxx>
#include "commonbehaviorcontext.hxx"
#include "commontimenodecontext.hxx"
diff --git a/oox/source/ppt/commontimenodecontext.cxx
b/oox/source/ppt/commontimenodecontext.cxx
index aa897a286362..6e982c216ab5 100644
--- a/oox/source/ppt/commontimenodecontext.cxx
+++ b/oox/source/ppt/commontimenodecontext.cxx
@@ -31,6 +31,7 @@
#include <oox/drawingml/drawingmltypes.hxx>
#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>
+#include <sax/fastattribs.hxx>
#include "animationtypes.hxx"
diff --git a/oox/source/ppt/conditioncontext.cxx
b/oox/source/ppt/conditioncontext.cxx
index 39fa33bc6b79..ac842c994f3b 100644
--- a/oox/source/ppt/conditioncontext.cxx
+++ b/oox/source/ppt/conditioncontext.cxx
@@ -27,6 +27,7 @@
#include "animationtypes.hxx"
#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>
+#include <sax/fastattribs.hxx>
#include "timetargetelementcontext.hxx"
diff --git a/oox/source/ppt/customshowlistcontext.cxx
b/oox/source/ppt/customshowlistcontext.cxx
index fa76e55f3735..5bcd4102cfec 100644
--- a/oox/source/ppt/customshowlistcontext.cxx
+++ b/oox/source/ppt/customshowlistcontext.cxx
@@ -22,6 +22,7 @@
#include <oox/helper/attributelist.hxx>
#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>
+#include <sax/fastattribs.hxx>
using namespace ::oox::core;
using namespace ::com::sun::star::uno;
diff --git a/oox/source/ppt/presentationfragmenthandler.cxx
b/oox/source/ppt/presentationfragmenthandler.cxx
index 941fa68b6e16..3266e9945bde 100644
--- a/oox/source/ppt/presentationfragmenthandler.cxx
+++ b/oox/source/ppt/presentationfragmenthandler.cxx
@@ -62,6 +62,7 @@
#include <oox/ppt/pptimport.hxx>
#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>
+#include <sax/fastattribs.hxx>
#include <com/sun/star/office/XAnnotation.hpp>
#include <com/sun/star/office/XAnnotationAccess.hpp>
diff --git a/oox/source/ppt/timenodelistcontext.cxx
b/oox/source/ppt/timenodelistcontext.cxx
index 9ae108592612..70c75ffd17cd 100644
--- a/oox/source/ppt/timenodelistcontext.cxx
+++ b/oox/source/ppt/timenodelistcontext.cxx
@@ -39,6 +39,7 @@
#include <oox/token/namespaces.hxx>
#include <oox/token/tokens.hxx>
#include <o3tl/string_view.hxx>
+#include <sax/fastattribs.hxx>
#include <utility>
#include "animvariantcontext.hxx"
diff --git a/oox/source/ppt/timetargetelementcontext.cxx
b/oox/source/ppt/timetargetelementcontext.cxx
index 6945fccebb33..06fa6d2473a5 100644
--- a/oox/source/ppt/timetargetelementcontext.cxx
+++ b/oox/source/ppt/timetargetelementcontext.cxx
@@ -31,6 +31,7 @@
#include <oox/core/xmlfilterbase.hxx>
#include <com/sun/star/io/XInputStream.hpp>
#include <avmedia/mediaitem.hxx>
+#include <sax/fastattribs.hxx>
#include <utility>
using namespace ::com::sun::star::uno;
diff --git a/sc/source/filter/inc/connectionsbuffer.hxx
b/sc/source/filter/inc/connectionsbuffer.hxx
index 4bad185febc5..5f3fb3ac734f 100644
--- a/sc/source/filter/inc/connectionsbuffer.hxx
+++ b/sc/source/filter/inc/connectionsbuffer.hxx
@@ -188,7 +188,7 @@ public:
void importWebPrTable( SequenceInputStream& rStrm,
sal_Int32 nRecId );
static css::uno::Sequence<css::uno::Any>
- getSequenceOfAny(css::uno::Reference<css::xml::sax::XFastAttributeList>&
xFastAttributeList);
+ getSequenceOfAny(const
css::uno::Reference<css::xml::sax::XFastAttributeList>& xFastAttributeList);
/** Returns the unique connection identifier. */
sal_Int32 getConnectionId() const { return maModel.mnId; }
/** Returns the source data type of the connection. */
diff --git a/sc/source/filter/oox/connectionsbuffer.cxx
b/sc/source/filter/oox/connectionsbuffer.cxx
index 9d8fddaf59e9..6da344c4ceb3 100644
--- a/sc/source/filter/oox/connectionsbuffer.cxx
+++ b/sc/source/filter/oox/connectionsbuffer.cxx
@@ -322,7 +322,7 @@ void Connection::importExtension(const AttributeList&
rAttribs)
}
css::uno::Sequence<css::uno::Any> Connection::getSequenceOfAny(
- css::uno::Reference<css::xml::sax::XFastAttributeList>& xFastAttributeList)
+ const css::uno::Reference<css::xml::sax::XFastAttributeList>&
xFastAttributeList)
{
css::uno::Sequence<css::xml::FastAttribute> aFast =
xFastAttributeList->getFastAttributes();
css::uno::Sequence<css::xml::Attribute> aUnk =
xFastAttributeList->getUnknownAttributes();
diff --git a/sc/source/filter/oox/pivottablebuffer.cxx
b/sc/source/filter/oox/pivottablebuffer.cxx
index b71652baadc2..04ace38fa876 100644
--- a/sc/source/filter/oox/pivottablebuffer.cxx
+++ b/sc/source/filter/oox/pivottablebuffer.cxx
@@ -50,6 +50,7 @@
#include <oox/helper/propertyset.hxx>
#include <oox/token/properties.hxx>
#include <oox/token/tokens.hxx>
+#include <sax/fastattribs.hxx>
#include <addressconverter.hxx>
#include <biffhelper.hxx>
