diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-05-07 14:28:40 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2024-05-11 14:50:40 +0200 |
| commit | 0652885ffeddac94c47fe7c53a58c172a63f9d56 (patch) | |
| tree | 8e743564f412828a478d54d66ac713a9aeed9682 /dbaccess | |
| parent | ed699baa9226f94d912cd2646ed8e2ce37bb1869 (diff) | |
replace createFromAscii with OUString literals in ReadThroughComponent
Change-Id: Ic92b15ea369e420faf6bfc40f509bba6e454710f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167500
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/filter/xml/xmlfilter.cxx | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx index 06b6db1edd95..18a1d223df86 100644 --- a/dbaccess/source/filter/xml/xmlfilter.cxx +++ b/dbaccess/source/filter/xml/xmlfilter.cxx @@ -125,12 +125,11 @@ static ErrCode ReadThroughComponent( static ErrCode ReadThroughComponent( const uno::Reference< embed::XStorage >& xStorage, const uno::Reference<XComponent>& xModelComponent, - const char* pStreamName, + const OUString& sStreamName, const uno::Reference<XComponentContext> & rxContext, ODBFilter& _rFilter) { OSL_ENSURE( xStorage.is(), "Need storage!"); - OSL_ENSURE(nullptr != pStreamName, "Please, please, give me a name!"); if ( !xStorage ) // TODO/LATER: better error handling @@ -141,7 +140,6 @@ static ErrCode ReadThroughComponent( try { // open stream (and set parser input) - OUString sStreamName = OUString::createFromAscii(pStreamName); if ( !xStorage->hasByName( sStreamName ) || !xStorage->isStreamElement( sStreamName ) ) { // stream name not found! return immediately with OK signal @@ -323,7 +321,7 @@ bool ODBFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) uno::Reference<XComponent> xModel(GetModel()); ErrCode nRet = ReadThroughComponent( xStorage ,xModel - ,"settings.xml" + ,u"settings.xml"_ustr ,GetComponentContext() ,*this ); @@ -331,7 +329,7 @@ bool ODBFilter::implImport( const Sequence< PropertyValue >& rDescriptor ) if ( nRet == ERRCODE_NONE ) nRet = ReadThroughComponent( xStorage ,xModel - ,"content.xml" + ,u"content.xml"_ustr ,GetComponentContext() ,*this ); |