Kaydet (Commit) a64e5e3c authored tarafından Caolán McNamara's avatar Caolán McNamara

avoid implicit cast

üst 75a22945
...@@ -419,7 +419,7 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory(const sal_Char* _pImplN ...@@ -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) 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 = ::cppu::ComponentInstantiation aCurrentCreateFunction =
reinterpret_cast< ::cppu::ComponentInstantiation>(*pFunctionsAsInts); reinterpret_cast< ::cppu::ComponentInstantiation>(*pFunctionsAsInts);
......
...@@ -522,7 +522,7 @@ uno::Reference< lang::XMultiServiceFactory > OWriteStream_Impl::GetServiceFactor ...@@ -522,7 +522,7 @@ uno::Reference< lang::XMultiServiceFactory > OWriteStream_Impl::GetServiceFactor
::rtl::OUString aTempURL = GetNewTempFileURL( GetServiceFactory() ); ::rtl::OUString aTempURL = GetNewTempFileURL( GetServiceFactory() );
try { try {
if ( aTempURL && xStream.is() ) if ( aTempURL.getLength() && xStream.is() )
{ {
uno::Reference < ucb::XSimpleFileAccess > xTempAccess( uno::Reference < ucb::XSimpleFileAccess > xTempAccess(
GetServiceFactory()->createInstance ( GetServiceFactory()->createInstance (
......
...@@ -400,7 +400,7 @@ cssu::Reference< cssxc::XXMLSecurityContext > SAL_CALL ...@@ -400,7 +400,7 @@ cssu::Reference< cssxc::XXMLSecurityContext > SAL_CALL
rtl::OString sCertDir; rtl::OString sCertDir;
if( sCertDB.getLength() ) if( sCertDB.getLength() )
{ {
sCertDir = rtl::OString(sCertDB, sCertDB.getLength(), RTL_TEXTENCODING_ASCII_US); sCertDir = rtl::OUStringToOString(sCertDB, RTL_TEXTENCODING_ASCII_US);
} }
else else
{ {
...@@ -410,10 +410,8 @@ cssu::Reference< cssxc::XXMLSecurityContext > SAL_CALL ...@@ -410,10 +410,8 @@ cssu::Reference< cssxc::XXMLSecurityContext > SAL_CALL
pDefaultCertDir = new rtl::OString; pDefaultCertDir = new rtl::OString;
rtl::OUString ouCertDir; rtl::OUString ouCertDir;
if ( getMozillaCurrentProfile(mxMSF, 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; sCertDir = *pDefaultCertDir;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment