[Libreoffice-commits] core.git: chart2/source comphelper/source cui/source dbaccess/source desktop/source extensions/source forms/source include/comphelper include/sot include/svtools pyuno/source scripting/source sc/source sd/source sfx2/source stoc/source svl/source svx/source sw/source vcl/unx xmloff/source
Noel Grandin
noel.grandin at collabora.co.uk
Wed Nov 9 07:48:41 UTC 2016
chart2/source/tools/ConfigColorScheme.cxx | 2 -
comphelper/source/eventattachermgr/eventattachermgr.cxx | 2 -
cui/source/dialogs/hlmarkwn.cxx | 2 -
cui/source/options/tsaurls.cxx | 2 -
dbaccess/source/core/dataaccess/connection.cxx | 2 -
desktop/source/deployment/manager/dp_extensionmanager.cxx | 15 ++------------
extensions/source/bibliography/framectr.cxx | 5 ----
extensions/source/propctrlr/propertycomposer.cxx | 3 --
forms/source/component/FormattedField.cxx | 2 -
forms/source/component/ListBox.cxx | 4 +--
forms/source/component/refvaluecomponent.cxx | 2 -
forms/source/misc/componenttools.cxx | 2 -
include/comphelper/sequence.hxx | 9 ++++++++
include/sot/exchange.hxx | 7 ------
include/svtools/transfer.hxx | 2 -
pyuno/source/module/pyuno_runtime.cxx | 2 -
sc/source/ui/unoobj/chart2uno.cxx | 2 -
scripting/source/vbaevents/eventhelper.cxx | 2 -
sd/source/core/CustomAnimationEffect.cxx | 2 -
sfx2/source/appl/appdispatchprovider.cxx | 7 +-----
sfx2/source/dialog/filtergrouping.cxx | 2 -
sfx2/source/view/sfxbasecontroller.cxx | 7 +-----
stoc/source/implementationregistration/implreg.cxx | 2 -
stoc/source/servicemanager/servicemanager.cxx | 2 -
svl/source/passwordcontainer/syscreds.cxx | 2 -
svx/source/form/fmPropBrw.cxx | 2 -
svx/source/unodraw/UnoNameItemTable.cxx | 2 -
svx/source/unodraw/UnoNamespaceMap.cxx | 2 -
svx/source/unodraw/unomtabl.cxx | 2 -
sw/source/core/unocore/unotbl.cxx | 2 -
vcl/unx/kde/UnxCommandThread.cxx | 2 -
xmloff/source/chart/SchXMLExport.cxx | 2 -
xmloff/source/style/prstylei.cxx | 2 -
33 files changed, 46 insertions(+), 61 deletions(-)
New commits:
commit 389999abdb2d35f8641a6ff2e8984887166d39e2
Author: Noel Grandin <noel.grandin at collabora.co.uk>
Date: Tue Nov 8 15:53:21 2016 +0200
make comphelper::containerToSequence a little smarter
So we don't have to specify the source and destination type as often.
Change-Id: Id9e286417a1cb246d163cbc3c536b231a4a92624
Reviewed-on: https://gerrit.libreoffice.org/30700
Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
Tested-by: Noel Grandin <noel.grandin at collabora.co.uk>
diff --git a/chart2/source/tools/ConfigColorScheme.cxx b/chart2/source/tools/ConfigColorScheme.cxx
index 21b54d5..309c056 100644
--- a/chart2/source/tools/ConfigColorScheme.cxx
+++ b/chart2/source/tools/ConfigColorScheme.cxx
@@ -88,7 +88,7 @@ void ChartConfigItem::ImplCommit()
void ChartConfigItem::addPropertyNotification( const OUString & rPropertyName )
{
m_aPropertiesToNotify.insert( rPropertyName );
- EnableNotification( comphelper::containerToSequence<OUString>( m_aPropertiesToNotify ));
+ EnableNotification( comphelper::containerToSequence( m_aPropertiesToNotify ));
}
uno::Any ChartConfigItem::getProperty( const OUString & aPropertyName )
diff --git a/comphelper/source/eventattachermgr/eventattachermgr.cxx b/comphelper/source/eventattachermgr/eventattachermgr.cxx
index 81bfcd3..1523333 100644
--- a/comphelper/source/eventattachermgr/eventattachermgr.cxx
+++ b/comphelper/source/eventattachermgr/eventattachermgr.cxx
@@ -559,7 +559,7 @@ Sequence< ScriptEventDescriptor > SAL_CALL ImplEventAttacherManager::getScriptEv
{
Guard< Mutex > aGuard( aLock );
::std::deque<AttacherIndex_Impl>::iterator aIt = implCheckIndex( nIndex );
- return comphelper::containerToSequence<ScriptEventDescriptor>(aIt->aEventList);
+ return comphelper::containerToSequence(aIt->aEventList);
}
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index a7d6d2f..cd11a88 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -606,7 +606,7 @@ IMPL_LINK_NOARG(SvxHlinkDlgMarkWnd, ClickCloseHdl_Impl, Button*, void)
uno::Sequence< beans::NamedValue > aSettings
{
{ TG_SETTING_LASTMARK, css::uno::makeAny(sLastSelectedMark) },
- { TG_SETTING_LASTPATH, css::uno::makeAny(comphelper::containerToSequence<OUString>(aLastSelectedPath)) }
+ { TG_SETTING_LASTPATH, css::uno::makeAny(comphelper::containerToSequence(aLastSelectedPath)) }
};
// write
diff --git a/cui/source/options/tsaurls.cxx b/cui/source/options/tsaurls.cxx
index fa678c7..b1db289 100644
--- a/cui/source/options/tsaurls.cxx
+++ b/cui/source/options/tsaurls.cxx
@@ -56,7 +56,7 @@ IMPL_LINK_NOARG(TSAURLsDialog, OKHdl_Impl, Button*, void)
{
std::shared_ptr<comphelper::ConfigurationChanges> batch(comphelper::ConfigurationChanges::create());
- officecfg::Office::Common::Security::Scripting::TSAURLs::set(comphelper::containerToSequence<OUString>(m_aURLs), batch);
+ officecfg::Office::Common::Security::Scripting::TSAURLs::set(comphelper::containerToSequence(m_aURLs), batch);
batch->commit();
EndDialog(RET_OK);
diff --git a/dbaccess/source/core/dataaccess/connection.cxx b/dbaccess/source/core/dataaccess/connection.cxx
index 10c6334..c037345 100644
--- a/dbaccess/source/core/dataaccess/connection.cxx
+++ b/dbaccess/source/core/dataaccess/connection.cxx
@@ -412,7 +412,7 @@ Sequence< Type > OConnection::getTypes() throw (RuntimeException, std::exception
if ( !m_bSupportsGroups )
aNormalizedTypes.erase( cppu::UnoType<XGroupsSupplier>::get() );
- return comphelper::containerToSequence<Type>(aNormalizedTypes);
+ return comphelper::containerToSequence(aNormalizedTypes);
}
Sequence< sal_Int8 > OConnection::getImplementationId() throw (RuntimeException, std::exception)
diff --git a/desktop/source/deployment/manager/dp_extensionmanager.cxx b/desktop/source/deployment/manager/dp_extensionmanager.cxx
index b98cc0e..4b471f1 100644
--- a/desktop/source/deployment/manager/dp_extensionmanager.cxx
+++ b/desktop/source/deployment/manager/dp_extensionmanager.cxx
@@ -332,10 +332,7 @@ ExtensionManager::getExtensionsWithSameIdentifier(
"Could not find extension: " + identifier + ", " + fileName,
static_cast<cppu::OWeakObject*>(this), -1);
- return comphelper::containerToSequence<
- Reference<css::deployment::XPackage>,
- ::std::list<Reference<css::deployment::XPackage> >
- > (listExtensions);
+ return comphelper::containerToSequence(listExtensions);
}
catch ( const css::deployment::DeploymentException & )
{
@@ -369,10 +366,7 @@ bool ExtensionManager::isUserDisabled(
}
OSL_ASSERT(listExtensions.size() == 3);
- return isUserDisabled( ::comphelper::containerToSequence<
- Reference<css::deployment::XPackage>,
- ::std::list<Reference<css::deployment::XPackage> >
- > (listExtensions));
+ return isUserDisabled( ::comphelper::containerToSequence(listExtensions) );
}
bool ExtensionManager::isUserDisabled(
@@ -425,10 +419,7 @@ void ExtensionManager::activateExtension(
OSL_ASSERT(listExtensions.size() == 3);
activateExtension(
- ::comphelper::containerToSequence<
- Reference<css::deployment::XPackage>,
- ::std::list<Reference<css::deployment::XPackage> >
- > (listExtensions),
+ ::comphelper::containerToSequence(listExtensions),
bUserDisabled, bStartup, xAbortChannel, xCmdEnv);
fireModified();
diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx
index 65e1d06..f07e61b 100644
--- a/extensions/source/bibliography/framectr.cxx
+++ b/extensions/source/bibliography/framectr.cxx
@@ -335,10 +335,7 @@ throw (css::uno::RuntimeException, std::exception)
}
}
- css::uno::Sequence< css::frame::DispatchInformation > aSeq =
- comphelper::containerToSequence< css::frame::DispatchInformation, std::list< css::frame::DispatchInformation > >( aDispatchInfoList );
-
- return aSeq;
+ return comphelper::containerToSequence( aDispatchInfoList );
}
bool canInsertRecords(const Reference< beans::XPropertySet>& _rxCursorSet)
diff --git a/extensions/source/propctrlr/propertycomposer.cxx b/extensions/source/propctrlr/propertycomposer.cxx
index 98f6746..dd3f24e 100644
--- a/extensions/source/propctrlr/propertycomposer.cxx
+++ b/extensions/source/propctrlr/propertycomposer.cxx
@@ -255,8 +255,7 @@ namespace pcr
m_bSupportedPropertiesAreKnown = true;
}
- Sequence< Property > aSurvived = comphelper::containerToSequence<Property>( m_aSupportedProperties );
- return aSurvived;
+ return comphelper::containerToSequence( m_aSupportedProperties );
}
diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx
index d3841a1..ad6bfb4 100644
--- a/forms/source/component/FormattedField.cxx
+++ b/forms/source/component/FormattedField.cxx
@@ -998,7 +998,7 @@ Sequence< Type > OFormattedModel::getSupportedBindingTypes()
aTypes.push_front(cppu::UnoType< sal_Bool >::get() );
break;
}
- return comphelper::containerToSequence<Type>(aTypes);
+ return comphelper::containerToSequence(aTypes);
}
Any OFormattedModel::getDefaultForReset() const
diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx
index 4ad8003..840d2a4 100644
--- a/forms/source/component/ListBox.cxx
+++ b/forms/source/component/ListBox.cxx
@@ -1403,7 +1403,7 @@ namespace frm
}
// copy the indexes to the sequence
- aSelectIndexes = comphelper::containerToSequence<sal_Int16>( aSelectionSet );
+ aSelectIndexes = comphelper::containerToSequence( aSelectionSet );
}
break;
@@ -1420,7 +1420,7 @@ namespace frm
++idx;
}
- aSelectIndexes = comphelper::containerToSequence<sal_Int16>( aSelectionSet );
+ aSelectIndexes = comphelper::containerToSequence( aSelectionSet );
}
break;
}
diff --git a/forms/source/component/refvaluecomponent.cxx b/forms/source/component/refvaluecomponent.cxx
index b48469a..b931b7d 100644
--- a/forms/source/component/refvaluecomponent.cxx
+++ b/forms/source/component/refvaluecomponent.cxx
@@ -169,7 +169,7 @@ namespace frm
aTypes.push_front( cppu::UnoType<OUString>::get() );
// push_front, because this is the preferred type
- return comphelper::containerToSequence<Type>(aTypes);
+ return comphelper::containerToSequence(aTypes);
}
diff --git a/forms/source/misc/componenttools.cxx b/forms/source/misc/componenttools.cxx
index 13a1ed7..ad92957 100644
--- a/forms/source/misc/componenttools.cxx
+++ b/forms/source/misc/componenttools.cxx
@@ -81,7 +81,7 @@ namespace frm
TypeBag::TypeSequence TypeBag::getTypes() const
{
- return comphelper::containerToSequence<css::uno::Type>(m_aTypes);
+ return comphelper::containerToSequence(m_aTypes);
}
diff --git a/include/comphelper/sequence.hxx b/include/comphelper/sequence.hxx
index 7d8209d..bb1b1e8 100644
--- a/include/comphelper/sequence.hxx
+++ b/include/comphelper/sequence.hxx
@@ -291,6 +291,15 @@ namespace comphelper
return result;
}
+ // this one does better type deduction, but does not allow us to copy into a different element type
+ template < typename SrcType >
+ inline css::uno::Sequence< typename SrcType::value_type > containerToSequence( const SrcType& i_Container )
+ {
+ css::uno::Sequence< typename SrcType::value_type > result( i_Container.size() );
+ ::std::copy( i_Container.begin(), i_Container.end(), result.getArray() );
+ return result;
+ }
+
template <typename T>
inline css::uno::Sequence<T> containerToSequence(
::std::vector<T> const& v )
diff --git a/include/sot/exchange.hxx b/include/sot/exchange.hxx
index f28d47e..307ffea 100644
--- a/include/sot/exchange.hxx
+++ b/include/sot/exchange.hxx
@@ -42,12 +42,7 @@ struct DataFlavorEx : public css::datatransfer::DataFlavor
SotClipboardFormatId mnSotId;
};
-// JP 23.03.2001 - this struct is only for "hide" the STD of the vetor,
-// because our makefile filter all this symbols and so nobody can use
-// these struct in any interfacses.
-struct DataFlavorExVector : public ::std::vector< DataFlavorEx >
-{
-};
+typedef ::std::vector<DataFlavorEx> DataFlavorExVector;
SOT_DLLPUBLIC bool IsFormatSupported( const DataFlavorExVector& rDataFlavorExVector,
diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx
index 2eb3159..9213e67 100644
--- a/include/svtools/transfer.hxx
+++ b/include/svtools/transfer.hxx
@@ -26,6 +26,7 @@
#include <tools/link.hxx>
#include <tools/ref.hxx>
#include <sot/formats.hxx>
+#include <sot/exchange.hxx>
#include <cppuhelper/implbase1.hxx>
#include <cppuhelper/implbase4.hxx>
#include <com/sun/star/frame/XTerminateListener.hpp>
@@ -51,7 +52,6 @@ class INetBookmark;
class INetImage;
class FileList;
class SotStorageStream;
-struct DataFlavorExVector;
namespace vcl { class Window; }
// Drag&Drop defines
diff --git a/pyuno/source/module/pyuno_runtime.cxx b/pyuno/source/module/pyuno_runtime.cxx
index 2a3a9e7..4dd532ff 100644
--- a/pyuno/source/module/pyuno_runtime.cxx
+++ b/pyuno/source/module/pyuno_runtime.cxx
@@ -632,7 +632,7 @@ bool Runtime::pyIterUnpack( PyObject *const pObj, Any &a ) const
items.push_back( pyObject2Any( rItem.get() ) );
}
while( (pItem = PyIter_Next( pObj )) );
- a <<= comphelper::containerToSequence<Any>(items);
+ a <<= comphelper::containerToSequence(items);
return true;
}
diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx
index 2c34f0b..40cc474 100644
--- a/sc/source/ui/unoobj/chart2uno.cxx
+++ b/sc/source/ui/unoobj/chart2uno.cxx
@@ -2414,7 +2414,7 @@ uno::Sequence< uno::Reference< chart2::data::XLabeledDataSequence> > SAL_CALL
ScChart2DataSource::getDataSequences() throw ( uno::RuntimeException, std::exception)
{
SolarMutexGuard aGuard;
- return comphelper::containerToSequence< uno::Reference< chart2::data::XLabeledDataSequence> >(m_aLabeledSequences);
+ return comphelper::containerToSequence(m_aLabeledSequences);
}
void ScChart2DataSource::AddLabeledSequence(const uno::Reference < chart2::data::XLabeledDataSequence >& xNew)
diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx
index 262bd0d..7cb345c 100644
--- a/scripting/source/vbaevents/eventhelper.cxx
+++ b/scripting/source/vbaevents/eventhelper.cxx
@@ -407,7 +407,7 @@ ScriptEventHelper::getEventListeners()
}
}
- return comphelper::containerToSequence<OUString>(eventMethods);
+ return comphelper::containerToSequence(eventMethods);
}
Sequence< ScriptEventDescriptor >
diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx
index 804bda8..74d842b 100644
--- a/sd/source/core/CustomAnimationEffect.cxx
+++ b/sd/source/core/CustomAnimationEffect.cxx
@@ -1730,7 +1730,7 @@ CustomAnimationEffectPtr EffectSequenceHelper::append( const CustomAnimationPres
if( bFilter )
{
- aUserData = ::comphelper::containerToSequence< NamedValue, std::vector< NamedValue > >( aNewUserData );
+ aUserData = ::comphelper::containerToSequence( aNewUserData );
xNode->setUserData( aUserData );
}
diff --git a/sfx2/source/appl/appdispatchprovider.cxx b/sfx2/source/appl/appdispatchprovider.cxx
index c425d9d..2f2a53d 100644
--- a/sfx2/source/appl/appdispatchprovider.cxx
+++ b/sfx2/source/appl/appdispatchprovider.cxx
@@ -205,7 +205,7 @@ throw (uno::RuntimeException, std::exception)
}
}
- return comphelper::containerToSequence< sal_Int16 >( aGroupList );
+ return comphelper::containerToSequence( aGroupList );
}
Sequence< frame::DispatchInformation > SAL_CALL SfxAppDispatchProvider::getConfigurableDispatchInformation( sal_Int16 nCmdGroup )
@@ -249,10 +249,7 @@ throw (uno::RuntimeException, std::exception)
}
}
- uno::Sequence< frame::DispatchInformation > aSeq =
- comphelper::containerToSequence< frame::DispatchInformation, std::list< frame::DispatchInformation > >( aCmdList );
-
- return aSeq;
+ return comphelper::containerToSequence( aCmdList );
}
}
diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx
index dfe0fc6..25f6e80 100644
--- a/sfx2/source/dialog/filtergrouping.cxx
+++ b/sfx2/source/dialog/filtergrouping.cxx
@@ -812,7 +812,7 @@ namespace sfx2
// create a representation of the group which is understandable by the XFilterGroupManager
if ( _rGroup.size() )
{
- Sequence< StringPair > aFilters( comphelper::containerToSequence<StringPair>(_rGroup) );
+ Sequence< StringPair > aFilters( comphelper::containerToSequence(_rGroup) );
if ( _bAddExtension )
{
StringPair* pFilters = aFilters.getArray();
diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx
index 2c2ec74..c2cc85f 100644
--- a/sfx2/source/view/sfxbasecontroller.cxx
+++ b/sfx2/source/view/sfxbasecontroller.cxx
@@ -1169,7 +1169,7 @@ throw (RuntimeException, std::exception)
}
}
- return comphelper::containerToSequence< sal_Int16 >( aGroupList );
+ return comphelper::containerToSequence( aGroupList );
}
uno::Sequence< frame::DispatchInformation > SAL_CALL SfxBaseController::getConfigurableDispatchInformation( sal_Int16 nCmdGroup )
@@ -1214,10 +1214,7 @@ throw (RuntimeException, std::exception)
}
}
- uno::Sequence< frame::DispatchInformation > aSeq =
- comphelper::containerToSequence< frame::DispatchInformation, std::list< frame::DispatchInformation > >( aCmdList );
-
- return aSeq;
+ return comphelper::containerToSequence( aCmdList );
}
bool SfxBaseController::HandleEvent_Impl( NotifyEvent& rEvent )
diff --git a/stoc/source/implementationregistration/implreg.cxx b/stoc/source/implementationregistration/implreg.cxx
index 3ede86f..f01737a 100644
--- a/stoc/source/implementationregistration/implreg.cxx
+++ b/stoc/source/implementationregistration/implreg.cxx
@@ -1624,7 +1624,7 @@ Sequence< OUString > ImplementationRegistration::getImplementations(
if (!implNames.empty())
{
- Sequence<OUString> seqImpl(comphelper::containerToSequence<OUString>(implNames));
+ Sequence<OUString> seqImpl(comphelper::containerToSequence(implNames));
xImpl->closeKey();
return seqImpl;
}
diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx
index 2aec83c..3dd9274 100644
--- a/stoc/source/servicemanager/servicemanager.cxx
+++ b/stoc/source/servicemanager/servicemanager.cxx
@@ -851,7 +851,7 @@ Sequence< OUString > OServiceManager::getUniqueAvailableServiceNames(
aNameSet.insert( (*aIt++).first );
*/
- return comphelper::containerToSequence<OUString>(aNameSet);
+ return comphelper::containerToSequence(aNameSet);
}
// XMultiComponentFactory
diff --git a/svl/source/passwordcontainer/syscreds.cxx b/svl/source/passwordcontainer/syscreds.cxx
index ca54b51..69df68a 100644
--- a/svl/source/passwordcontainer/syscreds.cxx
+++ b/svl/source/passwordcontainer/syscreds.cxx
@@ -186,7 +186,7 @@ void SysCredentialsConfig::writeCfg()
OSL_ENSURE( m_bCfgInited, "SysCredentialsConfig::writeCfg : not initialized!" );
- m_aConfigItem.setSystemCredentialsURLs( comphelper::containerToSequence<OUString>(m_aCfgContainer) );
+ m_aConfigItem.setSystemCredentialsURLs( comphelper::containerToSequence(m_aCfgContainer) );
}
OUString SysCredentialsConfig::find( OUString const & aURL )
diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index 35570da..51137e4 100644
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -396,7 +396,7 @@ void FmPropBrw::implSetNewSelection( const InterfaceBag& _rSelection )
Reference< XObjectInspector > xInspector( m_xBrowserController, UNO_QUERY_THROW );
// tell it the objects to inspect
- xInspector->inspect( comphelper::containerToSequence< Reference< XInterface > >(_rSelection) );
+ xInspector->inspect( comphelper::containerToSequence(_rSelection) );
}
catch( const VetoException& )
{
diff --git a/svx/source/unodraw/UnoNameItemTable.cxx b/svx/source/unodraw/UnoNameItemTable.cxx
index f6e7539..cf6e850 100644
--- a/svx/source/unodraw/UnoNameItemTable.cxx
+++ b/svx/source/unodraw/UnoNameItemTable.cxx
@@ -241,7 +241,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoNameItemTable::getElementNames( )
aNameSet.insert(aApiName);
}
- return comphelper::containerToSequence<OUString>(aNameSet);
+ return comphelper::containerToSequence(aNameSet);
}
sal_Bool SAL_CALL SvxUnoNameItemTable::hasByName( const OUString& aApiName )
diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx
index 88b0142..e542d61 100644
--- a/svx/source/unodraw/UnoNamespaceMap.cxx
+++ b/svx/source/unodraw/UnoNamespaceMap.cxx
@@ -224,7 +224,7 @@ Sequence< OUString > SAL_CALL NamespaceMap::getElementNames() throw (RuntimeExce
while( aIter.next( aPrefix, aURL ) )
aPrefixSet.insert( aPrefix );
- return comphelper::containerToSequence<OUString>(aPrefixSet);
+ return comphelper::containerToSequence(aPrefixSet);
}
sal_Bool SAL_CALL NamespaceMap::hasByName( const OUString& aName ) throw (RuntimeException, std::exception)
diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx
index 97d68c9..ef6ec07 100644
--- a/svx/source/unodraw/unomtabl.cxx
+++ b/svx/source/unodraw/unomtabl.cxx
@@ -353,7 +353,7 @@ uno::Sequence< OUString > SAL_CALL SvxUnoMarkerTable::getElementNames()
// search model pool for line ends
createNamesForPool( mpModelPool, XATTR_LINEEND, aNameSet );
- return comphelper::containerToSequence<OUString>(aNameSet);
+ return comphelper::containerToSequence(aNameSet);
}
sal_Bool SAL_CALL SvxUnoMarkerTable::hasByName( const OUString& aName )
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 75cfdea..88b85f5 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -2130,7 +2130,7 @@ uno::Sequence<OUString> SwXTextTable::getCellNames() throw( uno::RuntimeExceptio
SwTableLines& rTableLines = pTable->GetTabLines();
std::vector<OUString> aAllNames;
lcl_InspectLines(rTableLines, aAllNames);
- return comphelper::containerToSequence<OUString>(aAllNames);
+ return comphelper::containerToSequence(aAllNames);
}
uno::Reference<text::XTextTableCursor> SwXTextTable::createCursorByCellName(const OUString& sCellName)
diff --git a/vcl/unx/kde/UnxCommandThread.cxx b/vcl/unx/kde/UnxCommandThread.cxx
index c5d313c..e2ca566 100644
--- a/vcl/unx/kde/UnxCommandThread.cxx
+++ b/vcl/unx/kde/UnxCommandThread.cxx
@@ -269,7 +269,7 @@ void SAL_CALL UnxFilePickerCommandThread::handleCommand( const OUString &rComman
}
else if ( aType == "stringList" )
{
- m_aGetValue <<= comphelper::containerToSequence<OUString>(aList);
+ m_aGetValue <<= comphelper::containerToSequence(aList);
m_aGetValueCondition.set();
}
else
diff --git a/xmloff/source/chart/SchXMLExport.cxx b/xmloff/source/chart/SchXMLExport.cxx
index 6bc6a90..88488d2 100644
--- a/xmloff/source/chart/SchXMLExport.cxx
+++ b/xmloff/source/chart/SchXMLExport.cxx
@@ -386,7 +386,7 @@ Sequence< Reference< chart2::data::XLabeledDataSequence > > lcl_getAllSeriesSequ
}
}
- return comphelper::containerToSequence< Reference< chart2::data::XLabeledDataSequence > >( aContainer );
+ return comphelper::containerToSequence( aContainer );
}
Reference< chart2::data::XLabeledDataSequence >
diff --git a/xmloff/source/style/prstylei.cxx b/xmloff/source/style/prstylei.cxx
index 387ca19..7870e02 100644
--- a/xmloff/source/style/prstylei.cxx
+++ b/xmloff/source/style/prstylei.cxx
@@ -427,7 +427,7 @@ void XMLPropStyleContext::CreateAndInsert( bool bOverwrite )
if (xPropState.is())
{
nCount = aNameSet.size();
- Sequence<OUString> aNames( comphelper::containerToSequence<OUString>(aNameSet) );
+ Sequence<OUString> aNames( comphelper::containerToSequence(aNameSet) );
Sequence < PropertyState > aStates( xPropState->getPropertyStates(aNames) );
const PropertyState *pStates = aStates.getConstArray();
OUString* pNames = aNames.getArray();
More information about the Libreoffice-commits
mailing list