diff options
author | Kevin Hunter <hunteke@earlham.edu> | 2010-11-09 14:55:22 -0500 |
---|---|---|
committer | David Tardon <dtardon@redhat.com> | 2010-11-10 08:19:12 +0100 |
commit | 601bfe023f5aeb9b10f4c17d50d18f9b7455f229 (patch) | |
tree | 22fa377c3b0de213eda4d616600749c5e1ccad31 /connectivity/source/cpool | |
parent | e30c45f22519a413f6fb08adb5307b2b610e5c28 (diff) |
EasyHack: Convert to RTL macro from FromAscii
Diffstat (limited to 'connectivity/source/cpool')
-rw-r--r-- | connectivity/source/cpool/ZConnectionPool.cxx | 2 | ||||
-rw-r--r-- | connectivity/source/cpool/ZPoolCollection.cxx | 12 | ||||
-rw-r--r-- | connectivity/source/cpool/Zregistration.cxx | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/connectivity/source/cpool/ZConnectionPool.cxx b/connectivity/source/cpool/ZConnectionPool.cxx index a65c7c1c99b8..3e63d401a735 100644 --- a/connectivity/source/cpool/ZConnectionPool.cxx +++ b/connectivity/source/cpool/ZConnectionPool.cxx @@ -65,7 +65,7 @@ namespace //-------------------------------------------------------------------- static const ::rtl::OUString& getTimeoutNodeName() { - static ::rtl::OUString s_sNodeName = ::rtl::OUString::createFromAscii("Timeout"); + static ::rtl::OUString s_sNodeName( RTL_CONSTASCII_USTRINGPARAM( "Timeout" )); return s_sNodeName; } diff --git a/connectivity/source/cpool/ZPoolCollection.cxx b/connectivity/source/cpool/ZPoolCollection.cxx index f3d2e1b3fc31..2cc925ccde6a 100644 --- a/connectivity/source/cpool/ZPoolCollection.cxx +++ b/connectivity/source/cpool/ZPoolCollection.cxx @@ -49,31 +49,31 @@ using namespace connectivity; //-------------------------------------------------------------------- static const ::rtl::OUString& getConnectionPoolNodeName() { - static ::rtl::OUString s_sNodeName = ::rtl::OUString::createFromAscii("org.openoffice.Office.DataAccess/ConnectionPool"); + static ::rtl::OUString s_sNodeName( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Office.DataAccess/ConnectionPool" )); return s_sNodeName; } //-------------------------------------------------------------------- static const ::rtl::OUString& getEnablePoolingNodeName() { - static ::rtl::OUString s_sNodeName = ::rtl::OUString::createFromAscii("EnablePooling"); + static ::rtl::OUString s_sNodeName( RTL_CONSTASCII_USTRINGPARAM( "EnablePooling" )); return s_sNodeName; } //-------------------------------------------------------------------- static const ::rtl::OUString& getDriverNameNodeName() { - static ::rtl::OUString s_sNodeName = ::rtl::OUString::createFromAscii("DriverName"); + static ::rtl::OUString s_sNodeName( RTL_CONSTASCII_USTRINGPARAM( "DriverName" )); return s_sNodeName; } // ----------------------------------------------------------------------------- static const ::rtl::OUString& getDriverSettingsNodeName() { - static ::rtl::OUString s_sNodeName = ::rtl::OUString::createFromAscii("DriverSettings"); + static ::rtl::OUString s_sNodeName( RTL_CONSTASCII_USTRINGPARAM( "DriverSettings" )); return s_sNodeName; } //-------------------------------------------------------------------------- static const ::rtl::OUString& getEnableNodeName() { - static ::rtl::OUString s_sNodeName = ::rtl::OUString::createFromAscii("Enable"); + static ::rtl::OUString s_sNodeName( RTL_CONSTASCII_USTRINGPARAM( "Enable" )); return s_sNodeName; } @@ -406,7 +406,7 @@ Reference< XInterface > OPoolCollection::createWithProvider(const Reference< XMu aCreationArgs[1] = makeAny(PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("depth")), 0, makeAny((sal_Int32)-1), PropertyState_DIRECT_VALUE)); aCreationArgs[2] = makeAny(PropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("lazywrite")), 0, makeAny(sal_True), PropertyState_DIRECT_VALUE)); - static ::rtl::OUString sAccessService = ::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationAccess"); + static ::rtl::OUString sAccessService( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationAccess" )); xInterface = _rxConfProvider->createInstanceWithArguments(sAccessService, aCreationArgs); OSL_ENSURE(xInterface.is(), "::createWithProvider: could not create the node access!"); diff --git a/connectivity/source/cpool/Zregistration.cxx b/connectivity/source/cpool/Zregistration.cxx index c1ebcd213031..3acb300a862e 100644 --- a/connectivity/source/cpool/Zregistration.cxx +++ b/connectivity/source/cpool/Zregistration.cxx @@ -53,7 +53,7 @@ extern "C" //--------------------------------------------------------------------------------------- sal_Bool SAL_CALL component_writeInfo(void* /*_pServiceManager*/, com::sun::star::registry::XRegistryKey* _pRegistryKey) { - ::rtl::OUString sMainKeyName = ::rtl::OUString::createFromAscii("/"); + ::rtl::OUString sMainKeyName( RTL_CONSTASCII_USTRINGPARAM( "/" )); sMainKeyName += OPoolCollection::getImplementationName_Static(); sMainKeyName += ::rtl::OUString::createFromAscii("/UNO/SERVICES"); |