diff options
Diffstat (limited to 'dbaccess/source/filter')
| -rw-r--r-- | dbaccess/source/filter/hsqldb/rowinputbinary.cxx | 4 | ||||
| -rw-r--r-- | dbaccess/source/filter/xml/xmlDataSourceSetting.cxx | 2 | ||||
| -rw-r--r-- | dbaccess/source/filter/xml/xmlExport.cxx | 15 |
3 files changed, 11 insertions, 10 deletions
diff --git a/dbaccess/source/filter/hsqldb/rowinputbinary.cxx b/dbaccess/source/filter/hsqldb/rowinputbinary.cxx index cfbef28a2b11..1a71ad9276e1 100644 --- a/dbaccess/source/filter/hsqldb/rowinputbinary.cxx +++ b/dbaccess/source/filter/hsqldb/rowinputbinary.cxx @@ -309,10 +309,8 @@ std::vector<Any> HsqlRowInputStream::readOneRow(const std::vector<ColumnDefiniti sal_Int32 nScale = 0; m_pStream->ReadInt32(nScale); - Sequence<Any> result(2); OUString sNum = lcl_makeStringFromBigint(std::move(aBytes)); - result[0] <<= lcl_putDot(sNum, nScale); - result[1] <<= nScale; + Sequence<Any> result{ Any(lcl_putDot(sNum, nScale)), Any(nScale) }; aData.push_back(makeAny(result)); } break; diff --git a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx index d250dd10fecc..9402bb399dca 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx +++ b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx @@ -143,7 +143,7 @@ void OXMLDataSourceSetting::addValue(const OUString& _sValue) { sal_Int32 nPos = m_aInfoSequence.getLength(); m_aInfoSequence.realloc(nPos+1); - m_aInfoSequence[nPos] = aValue; + m_aInfoSequence.getArray()[nPos] = aValue; } } diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx index b2b6ae0ce395..74cb97721f2b 100644 --- a/dbaccess/source/filter/xml/xmlExport.cxx +++ b/dbaccess/source/filter/xml/xmlExport.cxx @@ -1194,22 +1194,24 @@ void ODBExport::GetViewSettings(Sequence<PropertyValue>& aProps) { sal_Int32 nLength = aProps.getLength(); aProps.realloc(nLength + 1); - aProps[nLength].Name = "Queries"; + auto pProps = aProps.getArray(); + pProps[nLength].Name = "Queries"; Sequence< OUString> aSeq = xCollection->getElementNames(); const OUString* pIter = aSeq.getConstArray(); const OUString* pEnd = pIter + aSeq.getLength(); Sequence<PropertyValue> aQueries(aSeq.getLength()); + auto aQueriesRange = asNonConstRange(aQueries); for(sal_Int32 i = 0;pIter != pEnd;++pIter,++i) { Reference<XPropertySet> xProp(xCollection->getByName(*pIter),UNO_QUERY); if ( xProp.is() ) { - aQueries[i].Name = *pIter; - aQueries[i].Value = xProp->getPropertyValue(PROPERTY_LAYOUTINFORMATION); + aQueriesRange[i].Name = *pIter; + aQueriesRange[i].Value = xProp->getPropertyValue(PROPERTY_LAYOUTINFORMATION); } } - aProps[nLength].Value <<= aQueries; + pProps[nLength].Value <<= aQueries; } catch(const Exception&) { @@ -1233,8 +1235,9 @@ void ODBExport::GetConfigurationSettings(Sequence<PropertyValue>& aProps) if ( aPropValues.hasElements() ) { aProps.realloc(nLength + 1); - aProps[nLength].Name = "layout-settings"; - aProps[nLength].Value = aValue; + auto pProps = aProps.getArray(); + pProps[nLength].Name = "layout-settings"; + pProps[nLength].Value = aValue; } } catch(const Exception&) |