diff options
| -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 2184fb42f992..ab891083d50e 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 c4aa0647f3b1..c95c46113d67 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 e1448045ad6e..5bb2a9ecb567 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; |