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

OSequenceIterator is not necessary anymore

Browse Source 
we have been able to iterate over a sequence for a long time now

Change-Id: Ie7ed6ec25682f631e01170029f7c9f0089448836
Reviewed-on: https://gerrit.libreoffice.org/68666
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin 2019-03-04 10:09:41 +02:00
parent 96af93e5df
commit b47bca7fd7
4 changed files with 11 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dbaccess/source/filter/xml/xmlExport.cxx
View File

@ -644,12 +644,14 @@ void ODBExport::exportConnectionData()
template< typename T > void ODBExport::exportDataSourceSettingsSequence(
std::vector< TypedPropertyValue >::iterator const & in)
{
OSequenceIterator< T > i( in->Value );
while (i.hasMoreElements())
css::uno::Sequence<T> anySeq;
bool bSuccess = in->Value >>= anySeq;
assert(bSuccess); (void)bSuccess;
for (T const & i : anySeq )
{
SvXMLElementExport aDataValue(*this,XML_NAMESPACE_DB, XML_DATA_SOURCE_SETTING_VALUE, true, false);
// (no whitespace inside the tag)
Characters(implConvertAny(i.nextElement()));
Characters(implConvertAny(css::uno::Any(i)));
}
}

73
include/comphelper/sequence.hxx
View File

@ -97,79 +97,6 @@ namespace comphelper
_rSeq.realloc(nLength-1);
}
//= iterating through sequences
/** a helper class for iterating through a sequence
*/
template <class TYPE>
class OSequenceIterator
{
const TYPE* m_pElements;
sal_Int32 m_nLen;
const TYPE* m_pCurrent;
public:
/** construct a sequence iterator from a sequence
*/
OSequenceIterator(const css::uno::Sequence< TYPE >& _rSeq);
/** construct a sequence iterator from a Any containing a sequence
*/
OSequenceIterator(const css::uno::Any& _rSequenceAny);
bool hasMoreElements() const;
css::uno::Any nextElement();
private:
inline void construct(const css::uno::Sequence< TYPE >& _rSeq);
};
template <class TYPE>
inline OSequenceIterator<TYPE>::OSequenceIterator(const css::uno::Sequence< TYPE >& _rSeq)
:m_pElements(nullptr)
,m_nLen(0)
,m_pCurrent(nullptr)
{
construct(_rSeq);
}
template <class TYPE>
inline OSequenceIterator<TYPE>::OSequenceIterator(const css::uno::Any& _rSequenceAny)
:m_pElements(nullptr)
,m_nLen(0)
,m_pCurrent(nullptr)
{
css::uno::Sequence< TYPE > aContainer;
bool bSuccess = _rSequenceAny >>= aContainer;
OSL_ENSURE(bSuccess, "OSequenceIterator::OSequenceIterator: invalid Any!");
construct(aContainer);
}
template <class TYPE>
void OSequenceIterator<TYPE>::construct(const css::uno::Sequence< TYPE >& _rSeq)
{
m_pElements = _rSeq.getConstArray();
m_nLen = _rSeq.getLength();
m_pCurrent = m_pElements;
}
template <class TYPE>
inline bool OSequenceIterator<TYPE>::hasMoreElements() const
{
return m_pCurrent - m_pElements < m_nLen;
}
template <class TYPE>
inline css::uno::Any OSequenceIterator<TYPE>::nextElement()
{
return css::uno::toAny(*m_pCurrent++);
}
/** Copy from a plain C/C++ array into a Sequence.
@tpl SrcType

4
svl/source/items/grabbagitem.cxx
View File

@ -43,10 +43,8 @@ bool SfxGrabBagItem::PutValue(const uno::Any& rVal, sal_uInt8 /*nMemberId*/)
if (rVal >>= aValue)
{
m_aMap.clear();
comphelper::OSequenceIterator<beans::PropertyValue> i(aValue);
while (i.hasMoreElements())
for (beans::PropertyValue const& aPropertyValue : aValue)
{
auto aPropertyValue = i.nextElement().get<beans::PropertyValue>();
m_aMap[aPropertyValue.Name] = aPropertyValue.Value;
}
return true;

8
xmloff/source/forms/propertyexport.cxx
View File

@ -93,10 +93,12 @@ namespace xmloff
OPropertyExport::exportRemainingPropertiesSequence(
Any const & value, token::XMLTokenEnum eValueAttName)
{
OSequenceIterator< T > i(value);
while (i.hasMoreElements())
css::uno::Sequence<T> anySeq;
bool bSuccess = value >>= anySeq;
assert(bSuccess); (void)bSuccess;
for (T const & i : anySeq)
{
OUString sValue(implConvertAny(i.nextElement()));
OUString sValue(implConvertAny(makeAny(i)));
AddAttribute(XML_NAMESPACE_OFFICE, eValueAttName, sValue );
SvXMLElementExport aValueTag(
m_rContext.getGlobalContext(), XML_NAMESPACE_FORM,