diff options
| author | Arkadiy Illarionov <qarkai@gmail.com> | 2019-07-09 01:51:19 +0300 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2019-07-15 13:06:38 +0200 |
| commit | f926de93c455f7cede505ad8cf849fe81eb514cf (patch) | |
| tree | e30e5835ad3b45703ce4050b895f7d4409f7a32a /svx | |
| parent | 6eed518408a93ad5a9896623d83405c4834b100c (diff) | |
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@redhat.com>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/form/fmdmod.cxx | 2 | ||||
| -rw-r--r-- | svx/source/unodraw/unomod.cxx | 5 |
2 files changed, 1 insertions, 6 deletions
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"); |