core.git: Branch 'distro/collabora/co-24.04' - sax/source

[Caolán McNamara (via logerrit)]

 sax/source/tools/CachedOutputStream.hxx |   10 ++++++----
 sax/source/tools/fastserializer.cxx     |   10 +++++-----
 sax/source/tools/fastserializer.hxx     |    5 ++---
 3 files changed, 13 insertions(+), 12 deletions(-)

New commits:
commit ea17befeec0bd655b1c10f931230b4177d449d31
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Wed Feb 5 11:47:42 2025 +0000
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Thu Feb 6 10:22:46 2025 +0100

    use more ByteSequence in sax
    
    Change-Id: I514b022256acc60c20e430ef6e68815a47859ab6
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/181183
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>

diff --git a/sax/source/tools/CachedOutputStream.hxx 
b/sax/source/tools/CachedOutputStream.hxx
index f62fe2359575..4e8c22a12116 100644
--- a/sax/source/tools/CachedOutputStream.hxx
+++ b/sax/source/tools/CachedOutputStream.hxx
@@ -21,11 +21,13 @@
 
 namespace sax_fastparser {
 
+typedef rtl::ByteSequence Int8Sequence;
+
 class ForMergeBase
 {
 public:
     virtual ~ForMergeBase() {}
-    virtual void append( const css::uno::Sequence<sal_Int8>& rWhat ) = 0;
+    virtual void append( const Int8Sequence& rWhat ) = 0;
 };
 
 class CachedOutputStream
@@ -35,7 +37,7 @@ class CachedOutputStream
 
     /// ForMerge structure is used for sorting elements in Writer
     std::shared_ptr< ForMergeBase > mpForMerge;
-    const rtl::ByteSequence maCache;
+    const Int8Sequence maCache;
     /// Output stream, usually writing data into files.
     css::uno::Reference< css::io::XOutputStream > mxOutputStream;
     uno_Sequence *pSeq;
@@ -89,7 +91,7 @@ public:
                 if (mbWriteToOutStream)
                     mxOutputStream->writeBytes( 
css::uno::Sequence<sal_Int8>(pStr, nLen) );
                 else
-                    mpForMerge->append( css::uno::Sequence<sal_Int8>(pStr, 
nLen) );
+                    mpForMerge->append( Int8Sequence(pStr, nLen) );
                 return;
             }
         }
@@ -106,7 +108,7 @@ public:
         if (mbWriteToOutStream)
             mxOutputStream->writeBytes( css::uno::toUnoSequence(maCache) );
         else
-            mpForMerge->append( css::uno::toUnoSequence(maCache) );
+            mpForMerge->append( maCache );
         // and next time write to the beginning
         mnCacheWrittenSize = 0;
     }
diff --git a/sax/source/tools/fastserializer.cxx 
b/sax/source/tools/fastserializer.cxx
index 0a5c227b7210..a5769333cc73 100644
--- a/sax/source/tools/fastserializer.cxx
+++ b/sax/source/tools/fastserializer.cxx
@@ -615,7 +615,7 @@ namespace sax_fastparser {
                 maMarkStack.top()->m_DebugStartedElements.pop_front();
             }
 #endif
-            Sequence<sal_Int8> aSeq( maMarkStack.top()->getData() );
+            Int8Sequence aSeq( maMarkStack.top()->getData() );
             maMarkStack.pop();
             mbMarkStackEmpty = true;
             maCachedOutputStream.resetOutputToStream();
@@ -712,7 +712,7 @@ namespace sax_fastparser {
         maCachedOutputStream.writeBytes( reinterpret_cast<const 
sal_Int8*>(pStr), nLen );
     }
 
-    FastSaxSerializer::Int8Sequence& FastSaxSerializer::ForMerge::getData()
+    Int8Sequence& FastSaxSerializer::ForMerge::getData()
     {
         merge( maData, maPostponed, true );
         maPostponed.realloc( 0 );
@@ -744,7 +744,7 @@ namespace sax_fastparser {
         merge( maData, rWhat, false );
     }
 
-    void FastSaxSerializer::ForMerge::append( const 
css::uno::Sequence<sal_Int8> &rWhat )
+    void FastSaxSerializer::ForMerge::append( const Int8Sequence &rWhat )
     {
         merge( maData, rWhat, true );
     }
@@ -797,7 +797,7 @@ namespace sax_fastparser {
         append( rWhat );
     }
 
-    void FastSaxSerializer::ForSort::append( const 
css::uno::Sequence<sal_Int8> &rWhat )
+    void FastSaxSerializer::ForSort::append( const Int8Sequence &rWhat )
     {
         merge( maData[mnCurrentElement], rWhat, true );
     }
@@ -817,7 +817,7 @@ namespace sax_fastparser {
         }
     }
 
-    FastSaxSerializer::Int8Sequence& FastSaxSerializer::ForSort::getData()
+    Int8Sequence& FastSaxSerializer::ForSort::getData()
     {
         sort( );
         return ForMerge::getData();
diff --git a/sax/source/tools/fastserializer.hxx 
b/sax/source/tools/fastserializer.hxx
index 8d97caf305a4..3ed38d59b91c 100644
--- a/sax/source/tools/fastserializer.hxx
+++ b/sax/source/tools/fastserializer.hxx
@@ -45,7 +45,6 @@ typedef std::vector<TokenValue> TokenValueList;
 /// Receives notification of sax document events to write into an 
XOutputStream.
 class FastSaxSerializer
 {
-    typedef css::uno::Sequence< ::sal_Int8 > Int8Sequence;
     typedef css::uno::Sequence< ::sal_Int32 > Int32Sequence;
 
 public:
@@ -189,7 +188,7 @@ private:
 #endif
 
         virtual void prepend( const Int8Sequence &rWhat );
-        virtual void append( const css::uno::Sequence<sal_Int8> &rWhat ) 
override;
+        virtual void append( const Int8Sequence &rWhat ) override;
         void postpone( const Int8Sequence &rWhat );
 
     protected:
@@ -220,7 +219,7 @@ private:
 #endif
 
         virtual void prepend( const Int8Sequence &rWhat ) override;
-        virtual void append( const css::uno::Sequence<sal_Int8> &rWhat ) 
override;
+        virtual void append( const Int8Sequence &rWhat ) override;
     private:
         void sort();
     };