[Libreoffice-commits] core.git: xmloff/source

Arkadiy Illarionov (via logerrit) logerrit at kemper.freedesktop.org
Sun May 5 17:25:03 UTC 2019


 xmloff/source/chart/SchXMLTableContext.cxx |   12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

New commits:
commit ddd5587d48eb685cbfc1106f694fb6b582fac6b8
Author:     Arkadiy Illarionov <qarkai at gmail.com>
AuthorDate: Sun May 5 19:14:24 2019 +0300
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Sun May 5 19:24:18 2019 +0200

    Drop lcl_SequenceToVector in favor of comphelper::sequenceToContainer
    
    Change-Id: I86284553e1b0229d0b576ef1d92efd040b524a1b
    Reviewed-on: https://gerrit.libreoffice.org/71825
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>

diff --git a/xmloff/source/chart/SchXMLTableContext.cxx b/xmloff/source/chart/SchXMLTableContext.cxx
index cb0423c92976..996f2b82c287 100644
--- a/xmloff/source/chart/SchXMLTableContext.cxx
+++ b/xmloff/source/chart/SchXMLTableContext.cxx
@@ -196,14 +196,6 @@ bool lcl_tableOfRangeMatches(
              (rRange.indexOf( rTableName ) != -1 ));
 }
 
-template< typename T >
-::std::vector< T > lcl_SequenceToVector( const uno::Sequence< T > & rSequence )
-{
-    ::std::vector< T > aResult( rSequence.getLength());
-    ::std::copy( rSequence.begin(), rSequence.end(), aResult.begin());
-    return aResult;
-}
-
 } // anonymous namespace
 
 // class SchXMLTableContext
@@ -298,7 +290,7 @@ void SchXMLTableContext::EndElement()
     if( mbHasColumnPermutation )
     {
         SAL_WARN_IF( mbHasRowPermutation, "xmloff.chart", "mbHasColumnPermutation is true" );
-        ::std::vector< sal_Int32 > aPermutation( lcl_SequenceToVector( maColumnPermutation ));
+        auto aPermutation( comphelper::sequenceToContainer<std::vector< sal_Int32 >>( maColumnPermutation ));
         SAL_WARN_IF( aPermutation.empty(), "xmloff.chart", "aPermutation is NULL");
         if( aPermutation.empty())
             return;
@@ -338,7 +330,7 @@ void SchXMLTableContext::EndElement()
     }
     else if( mbHasRowPermutation )
     {
-        ::std::vector< sal_Int32 > aPermutation( lcl_SequenceToVector( maRowPermutation ));
+        auto aPermutation( comphelper::sequenceToContainer<std::vector< sal_Int32 >>( maRowPermutation ));
         SAL_WARN_IF( aPermutation.empty(), "xmloff.chart", "aPermutation is NULL");
         if( aPermutation.empty())
             return;


More information about the Libreoffice-commits mailing list