[Libreoffice-commits] core.git: include/svx reportdesign/source sc/source svx/source sw/source

[Arkadiy Illarionov (via logerrit)]

 include/svx/unomod.hxx                            |    4 ----
 reportdesign/source/core/api/ReportDefinition.cxx |    2 +-
 sc/source/ui/unoobj/docuno.cxx                    |   10 ++--------
 svx/source/form/fmdmod.cxx                        |    2 +-
 svx/source/unodraw/unomod.cxx                     |    5 -----
 sw/source/uibase/uno/unotxdoc.cxx                 |    2 +-
 6 files changed, 5 insertions(+), 20 deletions(-)

New commits:
commit f926de93c455f7cede505ad8cf849fe81eb514cf
Author:     Arkadiy Illarionov <qarkai at gmail.com>
AuthorDate: Tue Jul 9 01:51:19 2019 +0300
Commit:     Stephan Bergmann <sbergman at redhat.com>
CommitDate: Mon Jul 15 13:06:38 2019 +0200

    tdf#39593 Remove SvxUnoDrawMSFactory::concatServiceNames
    
    Replace with comphelper::concatSequences
    
    Change-Id: I6b16104fac6ac5fdfcb6f322da4a5b8405d5d999
    Reviewed-on: https://gerrit.libreoffice.org/75315
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>

diff --git a/include/svx/unomod.hxx b/include/svx/unomod.hxx
index f8ecfd6fc965..d616a78650a6 100644
--- a/include/svx/unomod.hxx
+++ b/include/svx/unomod.hxx
@@ -50,10 +50,6 @@ public:
     /// @throws css::uno::Exception
     /// @throws css::uno::RuntimeException
     static css::uno::Reference< css::uno::XInterface > createTextField( const OUString& aServiceSpecifier );
-    // internal
-    static css::uno::Sequence< OUString >
-        concatServiceNames( css::uno::Sequence< OUString >& rServices1,
-                            css::uno::Sequence< OUString >& rServices2 ) throw();
 
     /** fills the given EventObject from the given SdrHint.
         @returns
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index 67f74d58458f..600dd78628b1 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -2169,7 +2169,7 @@ uno::Sequence< OUString > SAL_CALL OReportDefinition::getAvailableServiceNames()
         pStrings[nIdx] = aSvxComponentServiceNameList[nIdx];
 
     uno::Sequence< OUString > aParentSeq( SvxUnoDrawMSFactory::getAvailableServiceNames() );
-    return concatServiceNames( aParentSeq, aSeq );
+    return comphelper::concatSequences( aParentSeq, aSeq );
 }
 
 // XShape
diff --git a/sc/source/ui/unoobj/docuno.cxx b/sc/source/ui/unoobj/docuno.cxx
index e6c7495203c4..c16b992cd03b 100644
--- a/sc/source/ui/unoobj/docuno.cxx
+++ b/sc/source/ui/unoobj/docuno.cxx
@@ -2838,14 +2838,8 @@ uno::Sequence<OUString> SAL_CALL ScModelObj::getAvailableServiceNames()
 {
     SolarMutexGuard aGuard;
 
-    //! why are the parameters of concatServiceNames not const ???
-    //! return concatServiceNames( ScServiceProvider::GetAllServiceNames(),
-    //!                            SvxFmMSFactory::getAvailableServiceNames() );
-
-    uno::Sequence<OUString> aMyServices(ScServiceProvider::GetAllServiceNames());
-    uno::Sequence<OUString> aDrawServices(SvxFmMSFactory::getAvailableServiceNames());
-
-    return concatServiceNames( aMyServices, aDrawServices );
+    return comphelper::concatSequences( ScServiceProvider::GetAllServiceNames(),
+                                        SvxFmMSFactory::getAvailableServiceNames() );
 }
 
 // XServiceInfo
diff --git a/svx/source/form/fmdmod.cxx b/svx/source/form/fmdmod.cxx
index 6f34a16d4d5f..894dea39cb21 100644
--- a/svx/source/form/fmdmod.cxx
+++ b/svx/source/form/fmdmod.cxx
@@ -85,7 +85,7 @@ using namespace ::svxform;
     auto aSeq( comphelper::arrayToSequence< OUString >(aSvxComponentServiceNameList, nSvxComponentServiceNameListCount) );
 
     ::com::sun::star::uno::Sequence< OUString > aParentSeq( SvxUnoDrawMSFactory::getAvailableServiceNames() );
-    return concatServiceNames( aParentSeq, aSeq );
+    return comphelper::concatSequences( aParentSeq, aSeq );
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx
index 4df6688e4523..530d3983d5e2 100644
--- a/svx/source/unodraw/unomod.cxx
+++ b/svx/source/unodraw/unomod.cxx
@@ -222,11 +222,6 @@ uno::Sequence< OUString > SAL_CALL SvxUnoDrawMSFactory::getAvailableServiceNames
     return UHashMap::getServiceNames();
 }
 
-uno::Sequence< OUString > SvxUnoDrawMSFactory::concatServiceNames( uno::Sequence< OUString >& rServices1, uno::Sequence< OUString >& rServices2 ) throw()
-{
-    return comphelper::concatSequences(rServices1, rServices2);
-}
-
 SdrModel& SvxUnoDrawingModel::getSdrModelFromUnoModel() const
 {
     OSL_ENSURE(mpDoc, "No SdrModel in UnoDrawingModel, should not happen");
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index a73f4fd5d791..ccb0497d4179 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -1773,7 +1773,7 @@ Sequence< OUString > SwXTextDocument::getAvailableServiceNames()
             aRet.realloc( nLength - 1 );
         }
         Sequence< OUString > aOwn = SwXServiceProvider::GetAllServiceNames();
-        aServices = SvxFmMSFactory::concatServiceNames(aRet, aOwn);
+        aServices = comphelper::concatSequences(aRet, aOwn);
     }
 
     return aServices;