mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#39593 Remove SvxUnoDrawMSFactory::concatServiceNames

Browse Source 
Replace with comphelper::concatSequences

Change-Id: I6b16104fac6ac5fdfcb6f322da4a5b8405d5d999
Reviewed-on: https://gerrit.libreoffice.org/75315
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
This commit is contained in:
Arkadiy Illarionov
2019-07-09 01:51:19 +03:00
committed by Stephan Bergmann
parent 6eed518408
commit f926de93c4
6 changed files with 5 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/svx/unomod.hxx
View File

@@ -50,10 +50,6 @@ public:
/// @throws css::uno::Exception /// @throws css::uno::Exception
/// @throws css::uno::RuntimeException /// @throws css::uno::RuntimeException
static css::uno::Reference< css::uno::XInterface > createTextField( const OUString& aServiceSpecifier ); 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. /** fills the given EventObject from the given SdrHint.
@returns @returns

2
reportdesign/source/core/api/ReportDefinition.cxx
View File

@@ -2169,7 +2169,7 @@ uno::Sequence< OUString > SAL_CALL OReportDefinition::getAvailableServiceNames()
pStrings[nIdx] = aSvxComponentServiceNameList[nIdx]; pStrings[nIdx] = aSvxComponentServiceNameList[nIdx];
uno::Sequence< OUString > aParentSeq( SvxUnoDrawMSFactory::getAvailableServiceNames() ); uno::Sequence< OUString > aParentSeq( SvxUnoDrawMSFactory::getAvailableServiceNames() );
return concatServiceNames( aParentSeq, aSeq ); return comphelper::concatSequences( aParentSeq, aSeq );
} }
// XShape // XShape

10
sc/source/ui/unoobj/docuno.cxx
View File

@@ -2838,14 +2838,8 @@ uno::Sequence<OUString> SAL_CALL ScModelObj::getAvailableServiceNames()
{ {
SolarMutexGuard aGuard; SolarMutexGuard aGuard;
//! why are the parameters of concatServiceNames not const ??? return comphelper::concatSequences( ScServiceProvider::GetAllServiceNames(),
//! return concatServiceNames( ScServiceProvider::GetAllServiceNames(), SvxFmMSFactory::getAvailableServiceNames() );
//! SvxFmMSFactory::getAvailableServiceNames() );
uno::Sequence<OUString> aMyServices(ScServiceProvider::GetAllServiceNames());
uno::Sequence<OUString> aDrawServices(SvxFmMSFactory::getAvailableServiceNames());
return concatServiceNames( aMyServices, aDrawServices );
} }
// XServiceInfo // XServiceInfo

2
svx/source/form/fmdmod.cxx
View File

@@ -85,7 +85,7 @@ using namespace ::svxform;
auto aSeq( comphelper::arrayToSequence< OUString >(aSvxComponentServiceNameList, nSvxComponentServiceNameListCount) ); auto aSeq( comphelper::arrayToSequence< OUString >(aSvxComponentServiceNameList, nSvxComponentServiceNameListCount) );
::com::sun::star::uno::Sequence< OUString > aParentSeq( SvxUnoDrawMSFactory::getAvailableServiceNames() ); ::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: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

5
svx/source/unodraw/unomod.cxx
View File

@@ -222,11 +222,6 @@ uno::Sequence< OUString > SAL_CALL SvxUnoDrawMSFactory::getAvailableServiceNames
return UHashMap::getServiceNames(); 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 SdrModel& SvxUnoDrawingModel::getSdrModelFromUnoModel() const
{ {
OSL_ENSURE(mpDoc, "No SdrModel in UnoDrawingModel, should not happen"); OSL_ENSURE(mpDoc, "No SdrModel in UnoDrawingModel, should not happen");

2
sw/source/uibase/uno/unotxdoc.cxx
View File

@@ -1773,7 +1773,7 @@ Sequence< OUString > SwXTextDocument::getAvailableServiceNames()
aRet.realloc( nLength - 1 ); aRet.realloc( nLength - 1 );
} }
Sequence< OUString > aOwn = SwXServiceProvider::GetAllServiceNames(); Sequence< OUString > aOwn = SwXServiceProvider::GetAllServiceNames();
aServices = SvxFmMSFactory::concatServiceNames(aRet, aOwn); aServices = comphelper::concatSequences(aRet, aOwn);
} }
return aServices; return aServices;