diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2011-03-01 14:51:44 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2011-03-01 20:34:28 +0000 |
| commit | 01517bd118521ce0b87f5ddc0214327417143b23 (patch) | |
| tree | 3c5b4e16e1ac28a6162156ef1d5410db5aab61d1 | |
| parent | f60dd30c0e109ed70cd9c4e5a7e1b4f6af8b5138 (diff) | |
avoid implicit cast
| -rw-r--r-- | forms/source/misc/services.cxx | 2 | ||||
| -rw-r--r-- | package/source/xstor/owriteablestream.cxx | 2 | ||||
| -rw-r--r-- | xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx | 6 |
3 files changed, 4 insertions, 6 deletions
diff --git a/forms/source/misc/services.cxx b/forms/source/misc/services.cxx index e1beaafe4..b04de0463 100644 --- a/forms/source/misc/services.cxx +++ b/forms/source/misc/services.cxx @@ -419,7 +419,7 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* _pImplN for (sal_Int32 i=0; i<nClasses; ++i, ++pClasses, ++pServices, ++pFunctionsAsInts) { - if (rtl_ustr_ascii_compare(*pClasses, _pImplName) == 0) + if (rtl_ustr_ascii_compare(pClasses->getStr(), _pImplName) == 0) { ::cppu::ComponentInstantiation aCurrentCreateFunction = reinterpret_cast< ::cppu::ComponentInstantiation>(*pFunctionsAsInts); diff --git a/package/source/xstor/owriteablestream.cxx b/package/source/xstor/owriteablestream.cxx index f719bbf60..5c2039215 100644 --- a/package/source/xstor/owriteablestream.cxx +++ b/package/source/xstor/owriteablestream.cxx @@ -522,7 +522,7 @@ uno::Reference< lang::XMultiServiceFactory > OWriteStream_Impl::GetServiceFactor ::rtl::OUString aTempURL = GetNewTempFileURL( GetServiceFactory() ); try { - if ( aTempURL && xStream.is() ) + if ( aTempURL.getLength() && xStream.is() ) { uno::Reference < ucb::XSimpleFileAccess > xTempAccess( GetServiceFactory()->createInstance ( diff --git a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx index 3013f6b66..b9041e242 100644 --- a/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx +++ b/xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx @@ -400,7 +400,7 @@ cssu::Reference< cssxc::XXMLSecurityContext > SAL_CALL rtl::OString sCertDir; if( sCertDB.getLength() ) { - sCertDir = rtl::OString(sCertDB, sCertDB.getLength(), RTL_TEXTENCODING_ASCII_US); + sCertDir = rtl::OUStringToOString(sCertDB, RTL_TEXTENCODING_ASCII_US); } else { @@ -410,10 +410,8 @@ cssu::Reference< cssxc::XXMLSecurityContext > SAL_CALL pDefaultCertDir = new rtl::OString; rtl::OUString ouCertDir; - - if ( getMozillaCurrentProfile(mxMSF, ouCertDir) ) - *pDefaultCertDir = rtl::OString(ouCertDir, ouCertDir.getLength(), RTL_TEXTENCODING_ASCII_US); + *pDefaultCertDir = rtl::OUStringToOString(ouCertDir, RTL_TEXTENCODING_ASCII_US); } sCertDir = *pDefaultCertDir; |