[Libreoffice-commits] .: 3 commits - cui/source forms/source package/source xmlsecurity/source

[Caolán McNamara]

 cui/source/dialogs/showcols.cxx                         |    2 +-
 cui/source/options/treeopt.cxx                          |    6 ++----
 forms/source/misc/services.cxx                          |    2 +-
 package/source/xstor/owriteablestream.cxx               |    2 +-
 xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx |    6 ++----
 5 files changed, 7 insertions(+), 11 deletions(-)

New commits:
commit 01517bd118521ce0b87f5ddc0214327417143b23
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Mar 1 14:51:44 2011 +0000

    avoid implicit cast

diff --git a/forms/source/misc/services.cxx b/forms/source/misc/services.cxx
index e1beaaf..b04de04 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 f719bbf..5c20392 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 3013f6b..b9041e2 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;
         
commit f60dd30c0e109ed70cd9c4e5a7e1b4f6af8b5138
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Mar 1 14:49:39 2011 +0000

    pointless to go from char* to OString to char*

diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 7dd4d87..8469d04 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -837,13 +837,11 @@ void OfaTreeOptionsDialog::InitTreeAndHandler()
 {
     aTreeLB.SetNodeDefaultImages();
 
-    String sResName = String::CreateFromAscii( "iso" );
-    ResMgr* pIsoRes = ResMgr::CreateResMgr( ::rtl::OUStringToOString( sResName, RTL_TEXTENCODING_UTF8 ) );
+    ResMgr* pIsoRes = ResMgr::CreateResMgr( "iso" );
     if ( !pIsoRes )
     {
         // Fallback: Use ooo resource file
-        String sOOoName = String::CreateFromAscii( "ooo" );
-        pIsoRes = ResMgr::CreateResMgr( ::rtl::OUStringToOString( sOOoName, RTL_TEXTENCODING_UTF8 ) );
+        pIsoRes = ResMgr::CreateResMgr("ooo");
     }
 
     //! ResMgr* pIsoRes = SFX_APP()->GetLabelResManager();
commit b85f821043063474f3489f2119ed3ebd2bab34fe
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Mar 1 12:48:18 2011 +0000

    pointless cast

diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx
index 5b2ea7d..743e1f9 100644
--- a/cui/source/dialogs/showcols.cxx
+++ b/cui/source/dialogs/showcols.cxx
@@ -117,7 +117,7 @@ void FmShowColsDialog::SetColumns(const ::com::sun::star::uno::Reference< ::com:
 
             ::rtl::OUString sName;
             xCurCol->getPropertyValue(CUIFM_PROP_LABEL) >>= sName;
-            sCurName = (const sal_Unicode*)sName;
+            sCurName = sName;
         }
         catch(...)
         {