Drop ContainerHelper::vectorToSequence and use comphelper::containerToSequence

Change-Id: I987c56feab147cdbeb4ad58bd5ebb23dce6dbbca
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124215
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>

5 files changed, 18 insertions, 8 deletions

diff --git a/sc/source/filter/oox/autofilterbuffer.cxx b/sc/source/filter/oox/autofilterbuffer.cxx
index 211511e52367..5779bd1e5e9c 100644
--- a/sc/source/filter/oox/autofilterbuffer.cxx
+++ b/sc/source/filter/oox/autofilterbuffer.cxx
@@ -28,6 +28,8 @@
 #include <com/sun/star/sheet/XSheetFilterDescriptor3.hpp>
 #include <com/sun/star/table/TableOrientation.hpp>
 #include <com/sun/star/table/CellAddress.hpp>
+
+#include <comphelper/sequence.hxx>
 #include <editeng/colritem.hxx>
 #include <editeng/brushitem.hxx>
 #include <rtl/ustrbuf.hxx>
@@ -779,7 +781,7 @@ void AutoFilter::finalizeImport( const Reference< XDatabaseRange >& rxDatabaseRa
 
     // insert all filter fields to the filter descriptor
     if( !aFilterFields.empty() )
-        xFilterDesc->setFilterFields3( ContainerHelper::vectorToSequence( aFilterFields ) );
+        xFilterDesc->setFilterFields3( comphelper::containerToSequence( aFilterFields ) );
 
     // regular expressions
     bool bUseRegExp = obNeedsRegExp.get( false );
diff --git a/sc/source/filter/oox/externallinkbuffer.cxx b/sc/source/filter/oox/externallinkbuffer.cxx
index b0c5ccd77c6f..9c09580f096e 100644
--- a/sc/source/filter/oox/externallinkbuffer.cxx
+++ b/sc/source/filter/oox/externallinkbuffer.cxx
@@ -29,6 +29,8 @@
 #include <com/sun/star/sheet/XDDELinkResults.hpp>
 #include <com/sun/star/sheet/XExternalDocLinks.hpp>
 #include <com/sun/star/sheet/XSpreadsheetDocument.hpp>
+
+#include <comphelper/sequence.hxx>
 #include <o3tl/safeint.hxx>
 #include <osl/diagnose.h>
 #include <sal/log.hxx>
@@ -425,7 +427,7 @@ ExternalLinkInfo ExternalLink::getLinkInfo() const
             for( const auto& rxExtName : maExtNames )
                 if( rxExtName->getDdeItemInfo( aItemInfo ) )
                     aItemInfos.push_back( aItemInfo );
-            aDdeLinkInfo.Items = ContainerHelper::vectorToSequence( aItemInfos );
+            aDdeLinkInfo.Items = comphelper::containerToSequence( aItemInfos );
             aLinkInfo.Data <<= aDdeLinkInfo;
         }
         break;
@@ -647,7 +649,7 @@ Sequence< ExternalLinkInfo > ExternalLinkBuffer::getLinkInfos() const
     aLinkInfos.push_back( mxSelfRef->getLinkInfo() );
     for( const auto& rxExtLink : maExtLinks )
         aLinkInfos.push_back( rxExtLink->getLinkInfo() );
-    return ContainerHelper::vectorToSequence( aLinkInfos );
+    return comphelper::containerToSequence( aLinkInfos );
 }
 
 ExternalLinkRef ExternalLinkBuffer::getExternalLink( sal_Int32 nRefId, bool bUseRefSheets ) const
diff --git a/sc/source/filter/oox/formulabase.cxx b/sc/source/filter/oox/formulabase.cxx
index 928023f7b7bc..3cb012bda7c8 100644
--- a/sc/source/filter/oox/formulabase.cxx
+++ b/sc/source/filter/oox/formulabase.cxx
@@ -33,6 +33,8 @@
 #include <com/sun/star/sheet/FormulaMapGroupSpecialOffset.hpp>
 #include <com/sun/star/sheet/XFormulaOpCodeMapper.hpp>
 #include <com/sun/star/sheet/XFormulaParser.hpp>
+
+#include <comphelper/sequence.hxx>
 #include <rtl/strbuf.hxx>
 #include <rtl/ustrbuf.hxx>
 #include <osl/diagnose.h>
@@ -138,7 +140,7 @@ Any& ApiTokenVector::append( sal_Int32 nOpCode )
 
 ApiTokenSequence ApiTokenVector::toSequence() const
 {
-    return ContainerHelper::vectorToSequence( mvTokens );
+    return comphelper::containerToSequence( mvTokens );
 }
 
 // token sequence iterator ====================================================
@@ -1427,7 +1429,7 @@ const FunctionInfo* OpCodeProvider::getFuncInfoFromApiToken( const ApiToken& rTo
 
 Sequence< FormulaOpCodeMapEntry > OpCodeProvider::getOoxParserMap() const
 {
-    return ContainerHelper::vectorToSequence( mxOpCodeImpl->maParserMap );
+    return comphelper::containerToSequence( mxOpCodeImpl->maParserMap );
 }
 
 // API formula parser wrapper =================================================
@@ -1703,7 +1705,7 @@ void FormulaProcessorBase::convertStringToStringList(
             aNewTokens.emplace_back( OPCODE_SEP, Any() );
         aNewTokens.emplace_back( OPCODE_PUSH, Any( aEntry ) );
     }
-    orTokens = ContainerHelper::vectorToSequence( aNewTokens );
+    orTokens = comphelper::containerToSequence( aNewTokens );
 }
 
 } // namespace oox
diff --git a/sc/source/filter/oox/pivotcachebuffer.cxx b/sc/source/filter/oox/pivotcachebuffer.cxx
index a6d9302cfbdd..52c57d002a0b 100644
--- a/sc/source/filter/oox/pivotcachebuffer.cxx
+++ b/sc/source/filter/oox/pivotcachebuffer.cxx
@@ -26,6 +26,8 @@
 #include <com/sun/star/sheet/DataPilotFieldGroupBy.hpp>
 #include <com/sun/star/sheet/DataPilotFieldGroupInfo.hpp>
 #include <com/sun/star/sheet/XDataPilotFieldGrouping.hpp>
+
+#include <comphelper/sequence.hxx>
 #include <o3tl/safeint.hxx>
 #include <osl/diagnose.h>
 #include <sal/log.hxx>
@@ -700,7 +702,7 @@ OUString PivotCacheField::createParentGroupField( const Reference< XDataPilotFie
             if( !aMembers.empty() ) try
             {
                 // only the first call of createNameGroup() returns the new field
-                Reference< XDataPilotField > xDPNewField = xDPGrouping->createNameGroup( ContainerHelper::vectorToSequence( aMembers ) );
+                Reference< XDataPilotField > xDPNewField = xDPGrouping->createNameGroup( comphelper::containerToSequence( aMembers ) );
                 SAL_WARN_IF( xDPGroupField.is() == xDPNewField.is(), "sc", "PivotCacheField::createParentGroupField - missing group field" );
                 if( !xDPGroupField.is() )
                     xDPGroupField = xDPNewField;
diff --git a/sc/source/filter/oox/pivottablebuffer.cxx b/sc/source/filter/oox/pivottablebuffer.cxx
index 712a2dcb37ac..142ec1b2406e 100644
--- a/sc/source/filter/oox/pivottablebuffer.cxx
+++ b/sc/source/filter/oox/pivottablebuffer.cxx
@@ -38,6 +38,8 @@
 #include <com/sun/star/sheet/XDataPilotTablesSupplier.hpp>
 #include <com/sun/star/sheet/XSheetOperation.hpp>
 #include <com/sun/star/xml/sax/XFastAttributeList.hpp>
+
+#include <comphelper/sequence.hxx>
 #include <osl/diagnose.h>
 #include <tools/diagnose_ex.h>
 #include <sal/log.hxx>
@@ -701,7 +703,7 @@ Reference< XDataPilotField > PivotTableField::convertRowColPageField( sal_Int32
             // if no function is set manually, check the 'defaultSubtotal' flag
             if( aSubtotals.empty() && maModel.mbDefaultSubtotal )
                 aSubtotals.push_back( GeneralFunction_AUTO );
-            aPropSet.setProperty( PROP_Subtotals, ContainerHelper::vectorToSequence( aSubtotals ) );
+            aPropSet.setProperty( PROP_Subtotals, comphelper::containerToSequence( aSubtotals ) );
 
             // layout settings
             DataPilotFieldLayoutInfo aLayoutInfo;