From 389999abdb2d35f8641a6ff2e8984887166d39e2 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 8 Nov 2016 15:53:21 +0200 Subject: 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 Tested-by: Noel Grandin --- 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(-) diff --git a/chart2/source/tools/ConfigColorScheme.cxx b/chart2/source/tools/ConfigColorScheme.cxx index 21b54d5a365f..309c05650495 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( 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 81bfcd3c6ac1..1523333f4f4e 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::iterator aIt = implCheckIndex( nIndex ); - return comphelper::containerToSequence(aIt->aEventList); + return comphelper::containerToSequence(aIt->aEventList); } diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx index a7d6d2f3681d..cd11a88df050 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(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 fa678c71d2a9..b1db289d4b13 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 batch(comphelper::ConfigurationChanges::create()); - officecfg::Office::Common::Security::Scripting::TSAURLs::set(comphelper::containerToSequence(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 10c63345db44..c03734574d74 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::get() ); - return comphelper::containerToSequence(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 b98cc0ee95ea..4b471f177715 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(this), -1); - return comphelper::containerToSequence< - Reference, - ::std::list > - > (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, - ::std::list > - > (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, - ::std::list > - > (listExtensions), + ::comphelper::containerToSequence(listExtensions), bUserDisabled, bStartup, xAbortChannel, xCmdEnv); fireModified(); diff --git a/extensions/source/bibliography/framectr.cxx b/extensions/source/bibliography/framectr.cxx index 65e1d061fcd2..f07e61b156e1 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 98f67468cb0c..dd3f24e78799 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( m_aSupportedProperties ); - return aSurvived; + return comphelper::containerToSequence( m_aSupportedProperties ); } diff --git a/forms/source/component/FormattedField.cxx b/forms/source/component/FormattedField.cxx index d3841a1ea649..ad6bfb4900e1 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(aTypes); + return comphelper::containerToSequence(aTypes); } Any OFormattedModel::getDefaultForReset() const diff --git a/forms/source/component/ListBox.cxx b/forms/source/component/ListBox.cxx index 4ad80031f502..840d2a4b1d08 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( aSelectionSet ); + aSelectIndexes = comphelper::containerToSequence( aSelectionSet ); } break; @@ -1420,7 +1420,7 @@ namespace frm ++idx; } - aSelectIndexes = comphelper::containerToSequence( aSelectionSet ); + aSelectIndexes = comphelper::containerToSequence( aSelectionSet ); } break; } diff --git a/forms/source/component/refvaluecomponent.cxx b/forms/source/component/refvaluecomponent.cxx index b48469a880d9..b931b7ded39f 100644 --- a/forms/source/component/refvaluecomponent.cxx +++ b/forms/source/component/refvaluecomponent.cxx @@ -169,7 +169,7 @@ namespace frm aTypes.push_front( cppu::UnoType::get() ); // push_front, because this is the preferred type - return comphelper::containerToSequence(aTypes); + return comphelper::containerToSequence(aTypes); } diff --git a/forms/source/misc/componenttools.cxx b/forms/source/misc/componenttools.cxx index 13a1ed71f03d..ad929575d7f5 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(m_aTypes); + return comphelper::containerToSequence(m_aTypes); } diff --git a/include/comphelper/sequence.hxx b/include/comphelper/sequence.hxx index 7d8209d7a21f..bb1b1e81ba61 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 inline css::uno::Sequence containerToSequence( ::std::vector const& v ) diff --git a/include/sot/exchange.hxx b/include/sot/exchange.hxx index f28d47e58c7e..307ffea16bb4 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 DataFlavorExVector; SOT_DLLPUBLIC bool IsFormatSupported( const DataFlavorExVector& rDataFlavorExVector, diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx index 2eb31595afe1..9213e6754db1 100644 --- a/include/svtools/transfer.hxx +++ b/include/svtools/transfer.hxx @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -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 2a3a9e7d05f0..4dd532ff30c3 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(items); + a <<= comphelper::containerToSequence(items); return true; } diff --git a/sc/source/ui/unoobj/chart2uno.cxx b/sc/source/ui/unoobj/chart2uno.cxx index 2c34f0ba7080..40cc47469878 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 262bd0d29a31..7cb345ca389b 100644 --- a/scripting/source/vbaevents/eventhelper.cxx +++ b/scripting/source/vbaevents/eventhelper.cxx @@ -407,7 +407,7 @@ ScriptEventHelper::getEventListeners() } } - return comphelper::containerToSequence(eventMethods); + return comphelper::containerToSequence(eventMethods); } Sequence< ScriptEventDescriptor > diff --git a/sd/source/core/CustomAnimationEffect.cxx b/sd/source/core/CustomAnimationEffect.cxx index 804bda8569e1..74d842b84c02 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 c425d9d5150f..2f2a53d289c9 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 dfe0fc664435..25f6e8001a5f 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(_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 2c2ec74e29c3..c2cc85fe17c2 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 3ede86fb2836..f01737a651a1 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 seqImpl(comphelper::containerToSequence(implNames)); + Sequence seqImpl(comphelper::containerToSequence(implNames)); xImpl->closeKey(); return seqImpl; } diff --git a/stoc/source/servicemanager/servicemanager.cxx b/stoc/source/servicemanager/servicemanager.cxx index 2aec83c41396..3dd9274d5b07 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(aNameSet); + return comphelper::containerToSequence(aNameSet); } // XMultiComponentFactory diff --git a/svl/source/passwordcontainer/syscreds.cxx b/svl/source/passwordcontainer/syscreds.cxx index ca54b517ab78..69df68a5e521 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(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 35570dacc333..51137e4be4ac 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 f6e75393a722..cf6e850cdb57 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(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 88b0142a1f15..e542d61c0a42 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(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 97d68c979a25..ef6ec0776cb0 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(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 75cfdea7bdf4..88b85f500e21 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -2130,7 +2130,7 @@ uno::Sequence SwXTextTable::getCellNames() throw( uno::RuntimeExceptio SwTableLines& rTableLines = pTable->GetTabLines(); std::vector aAllNames; lcl_InspectLines(rTableLines, aAllNames); - return comphelper::containerToSequence(aAllNames); + return comphelper::containerToSequence(aAllNames); } uno::Reference SwXTextTable::createCursorByCellName(const OUString& sCellName) diff --git a/vcl/unx/kde/UnxCommandThread.cxx b/vcl/unx/kde/UnxCommandThread.cxx index c5d313c91d57..e2ca566dcce2 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(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 6bc6a90c3d8e..88488d2a37ba 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 387ca191bb2d..7870e02f5150 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 aNames( comphelper::containerToSequence(aNameSet) ); + Sequence aNames( comphelper::containerToSequence(aNameSet) ); Sequence < PropertyState > aStates( xPropState->getPropertyStates(aNames) ); const PropertyState *pStates = aStates.getConstArray(); OUString* pNames = aNames.getArray(); -- cgit