diff options
Diffstat (limited to 'dbaccess/source/core/dataaccess/documentcontainer.cxx')
| -rw-r--r-- | dbaccess/source/core/dataaccess/documentcontainer.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/dbaccess/source/core/dataaccess/documentcontainer.cxx b/dbaccess/source/core/dataaccess/documentcontainer.cxx index e5c485e6d4e9..082a6f315f96 100644 --- a/dbaccess/source/core/dataaccess/documentcontainer.cxx +++ b/dbaccess/source/core/dataaccess/documentcontainer.cxx @@ -43,7 +43,6 @@ #include "datasource.hxx" #include <comphelper/classids.hxx> #include <comphelper/mimeconfighelper.hxx> -#include <comphelper/string.hxx> #include <connectivity/sqlerror.hxx> #include "core_resource.hxx" #include "core_resource.hrc" @@ -542,8 +541,9 @@ Reference< XComponent > SAL_CALL ODocumentContainer::loadComponentFromURL( const ::rtl::OUString sName; if ( !lcl_queryContent(_sURL,xNameContainer,aContent,sName) ) { - ::rtl::OUString sMessage( DBA_RES( RID_STR_NAME_NOT_FOUND ) ); - ::comphelper::string::searchAndReplaceAsciiI( sMessage, "$name$", _sURL ); + ::rtl::OUString sMessage( + DBA_RES(RID_STR_NAME_NOT_FOUND).replaceFirstAsciiL( + RTL_CONSTASCII_STRINGPARAM("$name$"), _sURL)); throw IllegalArgumentException( sMessage, *this, 1 ); } @@ -611,9 +611,11 @@ void SAL_CALL ODocumentContainer::insertByHierarchicalName( const ::rtl::OUStrin if ( !xNameContainer.is() ) { - ::rtl::OUString sMessage( DBA_RES( RID_STR_NO_SUB_FOLDER ) ); sal_Int32 index = sName.getLength(); - ::comphelper::string::searchAndReplaceAsciiI( sMessage, "$folder$", _sName.getToken(0,'/',index) ); + ::rtl::OUString sMessage( + DBA_RES(RID_STR_NO_SUB_FOLDER).replaceFirstAsciiL( + RTL_CONSTASCII_STRINGPARAM("$folder$"), + _sName.getToken(0,'/',index))); throw IllegalArgumentException( sMessage, *this, 1 ); } |