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

micro optimizations

üst f379da21
...@@ -40,7 +40,6 @@ ...@@ -40,7 +40,6 @@
#include <registry/registry.hxx> #include <registry/registry.hxx>
#define OUSTR(x) ::rtl::OUString::createFromAscii( x )
#define OSToOUS(x) ::rtl::OStringToOUString(x, osl_getThreadTextEncoding()) #define OSToOUS(x) ::rtl::OStringToOUString(x, osl_getThreadTextEncoding())
#define OUSToOS(x) ::rtl::OUStringToOString(x, osl_getThreadTextEncoding()) #define OUSToOS(x) ::rtl::OUStringToOString(x, osl_getThreadTextEncoding())
using namespace ::rtl; using namespace ::rtl;
...@@ -95,7 +94,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) ...@@ -95,7 +94,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
++nPos; ++nPos;
} }
OUString sys_path( OUSTR( argv[ nPos ] ) ); OUString sys_path( ::rtl::OUString::createFromAscii( argv[ nPos ] ) );
OUString reg_url; OUString reg_url;
oslFileError rc = osl_getFileURLFromSystemPath( sys_path.pData, &reg_url.pData ); oslFileError rc = osl_getFileURLFromSystemPath( sys_path.pData, &reg_url.pData );
if (osl_File_E_None != rc) if (osl_File_E_None != rc)
...@@ -207,21 +206,21 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv) ...@@ -207,21 +206,21 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc, argv)
} }
OString sLoaderName = (*comp_iter).sLoaderName; OString sLoaderName = (*comp_iter).sLoaderName;
OUString usKeyName(OUSTR("UNO/ACTIVATOR")); OUString usKeyName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UNO/ACTIVATOR")));
key.createKey(usKeyName, subKey); key.createKey(usKeyName, subKey);
subKey.setValue(OUString(), RG_VALUETYPE_STRING, subKey.setValue(OUString(), RG_VALUETYPE_STRING,
(sal_Char*)sLoaderName.getStr(), sLoaderName.getLength()+1); (sal_Char*)sLoaderName.getStr(), sLoaderName.getLength()+1);
OString sCompName = (*comp_iter).sComponentName; OString sCompName = (*comp_iter).sComponentName;
usKeyName = OUSTR("UNO/LOCATION"); usKeyName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UNO/LOCATION"));
key.createKey(usKeyName, subKey); key.createKey(usKeyName, subKey);
subKey.setValue(OUString(), RG_VALUETYPE_STRING, subKey.setValue(OUString(), RG_VALUETYPE_STRING,
(sal_Char*)sCompName.getStr(), sCompName.getLength()+1); (sal_Char*)sCompName.getStr(), sCompName.getLength()+1);
usKeyName = OUSTR("UNO/SERVICES"); usKeyName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UNO/SERVICES"));
key.createKey(usKeyName, subKey); key.createKey(usKeyName, subKey);
rootKey.createKey(OUSTR("/SERVICES"), serviceKey); rootKey.createKey(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/SERVICES")), serviceKey);
OSVector::const_iterator serv_iter = ((*comp_iter).vSupportedServices).begin(); OSVector::const_iterator serv_iter = ((*comp_iter).vSupportedServices).begin();
OUString usServiceKeyName; OUString usServiceKeyName;
......
...@@ -83,7 +83,7 @@ OUString replacePrefix(OUString const & url, OUString const & prefix) { ...@@ -83,7 +83,7 @@ OUString replacePrefix(OUString const & url, OUString const & prefix) {
sal_Bool isFileUrl(const OUString& fileName) sal_Bool isFileUrl(const OUString& fileName)
{ {
if (fileName.indexOf(OUString::createFromAscii("file://")) == 0 ) if (fileName.indexOf(OUString(RTL_CONSTASCII_USTRINGPARAM("file://"))) == 0 )
return sal_True; return sal_True;
return sal_False; return sal_False;
} }
...@@ -694,7 +694,7 @@ static void bootstrap( ...@@ -694,7 +694,7 @@ static void bootstrap(
} }
reg = Reference< XSimpleRegistry >( reg = Reference< XSimpleRegistry >(
xSMgr->createInstance( xSMgr->createInstance(
rtl::OUString::createFromAscii("com.sun.star.registry.SimpleRegistry")), UNO_QUERY); rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.registry.SimpleRegistry"))), UNO_QUERY);
if (reg.is()) if (reg.is())
{ {
...@@ -727,15 +727,15 @@ static void bootstrap( ...@@ -727,15 +727,15 @@ static void bootstrap(
// we know our java loader, so we check, whether a java-loader is // we know our java loader, so we check, whether a java-loader is
// registered // registered
Reference< XInterface > r = loadSharedLibComponentFactory( Reference< XInterface > r = loadSharedLibComponentFactory(
OUString::createFromAscii( "javavm.uno" SAL_DLLEXTENSION ), OUString(RTL_CONSTASCII_USTRINGPARAM("javavm.uno" SAL_DLLEXTENSION)),
OUString(), OUString(),
OUString::createFromAscii( "com.sun.star.comp.stoc.JavaVirtualMachine" ), OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.stoc.JavaVirtualMachine")),
xSMgr, xSMgr,
Reference< XRegistryKey > () ); Reference< XRegistryKey > () );
Reference< XInterface > r2 = loadSharedLibComponentFactory( Reference< XInterface > r2 = loadSharedLibComponentFactory(
OUString::createFromAscii( "javaloader.uno" SAL_DLLEXTENSION ), OUString(RTL_CONSTASCII_USTRINGPARAM("javaloader.uno" SAL_DLLEXTENSION)),
OUString(), OUString(),
OUString::createFromAscii(( "com.sun.star.comp.stoc.JavaComponentLoader" ) ), OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.stoc.JavaComponentLoader")),
xSMgr, xSMgr,
Reference< XRegistryKey > () ); Reference< XRegistryKey > () );
Reference <XSet> xSet( xSMgr, UNO_QUERY ); Reference <XSet> xSet( xSMgr, UNO_QUERY );
......
...@@ -90,7 +90,7 @@ namespace unoexe ...@@ -90,7 +90,7 @@ namespace unoexe
static sal_Bool isFileUrl(const OUString& fileName) static sal_Bool isFileUrl(const OUString& fileName)
{ {
if (fileName.indexOf(OUString::createFromAscii("file://")) == 0 ) if (fileName.indexOf(OUString(RTL_CONSTASCII_USTRINGPARAM("file://"))) == 0 )
return sal_True; return sal_True;
return sal_False; return sal_False;
} }
...@@ -159,7 +159,7 @@ static sal_Bool readOption( OUString * pValue, const sal_Char * pOpt, ...@@ -159,7 +159,7 @@ static sal_Bool readOption( OUString * pValue, const sal_Char * pOpt,
sal_Int32 * pnIndex, const OUString & aArg) sal_Int32 * pnIndex, const OUString & aArg)
throw (RuntimeException) throw (RuntimeException)
{ {
const OUString dash = OUString(RTL_CONSTASCII_USTRINGPARAM("-")); const OUString dash(RTL_CONSTASCII_USTRINGPARAM("-"));
if(aArg.indexOf(dash) != 0) if(aArg.indexOf(dash) != 0)
return sal_False; return sal_False;
...@@ -650,7 +650,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc,) ...@@ -650,7 +650,7 @@ SAL_IMPLEMENT_MAIN_WITH_ARGS(argc,)
rtl_getAppCommandArg(nPos, &arg.pData); rtl_getAppCommandArg(nPos, &arg.pData);
const OUString dashdash = OUString(RTL_CONSTASCII_USTRINGPARAM("--")); const OUString dashdash(RTL_CONSTASCII_USTRINGPARAM("--"));
if (dashdash == arg) if (dashdash == arg)
{ {
++nPos; ++nPos;
......
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