diff options
author | Kevin Hunter <hunteke@earlham.edu> | 2010-11-18 18:47:55 -0500 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2010-11-19 09:55:14 +0000 |
commit | 9321d8acfed33545aecb18f2a6619041066cbc33 (patch) | |
tree | 3ffb4925e9095c9d35fa6297db57211ff51384fa /svtools/source/config | |
parent | 324612c06bb1c16c575224d5791be1a0afee6a5e (diff) |
EasyHack: RTL_CONST macro from createFromAscii
Diffstat (limited to 'svtools/source/config')
-rw-r--r-- | svtools/source/config/helpopt.cxx | 20 | ||||
-rw-r--r-- | svtools/source/config/itemholder2.cxx | 2 |
2 files changed, 11 insertions, 11 deletions
diff --git a/svtools/source/config/helpopt.cxx b/svtools/source/config/helpopt.cxx index 6e1f817ad622..7582712389f7 100644 --- a/svtools/source/config/helpopt.cxx +++ b/svtools/source/config/helpopt.cxx @@ -166,7 +166,7 @@ Sequence< OUString > SvtHelpOptions_Impl::GetPropertyNames() // ----------------------------------------------------------------------- SvtHelpOptions_Impl::SvtHelpOptions_Impl() - : ConfigItem( OUString::createFromAscii("Office.Common/Help") ) + : ConfigItem( OUString( RTL_CONSTASCII_USTRINGPARAM( "Office.Common/Help" )) ) , pList( 0 ) , bExtendedHelp( sal_False ) , bHelpTips( sal_True ) @@ -279,10 +279,10 @@ void SvtHelpOptions_Impl::Load(const uno::Sequence< ::rtl::OUString>& rProperty void SvtHelpOptions_Impl::implGetURLCounters( Sequence< ::rtl::OUString >& _rNodeNames, Sequence< Any >& _rURLs, Sequence< Any >& _rCounters ) { // the ignore counters for the help agent URLs - const ::rtl::OUString sIgnoreListNodePath = ::rtl::OUString::createFromAscii("HelpAgent/IgnoreList"); - const ::rtl::OUString sPathSeparator = ::rtl::OUString::createFromAscii("/"); - const ::rtl::OUString sURLLocalPath = ::rtl::OUString::createFromAscii("/Name"); - const ::rtl::OUString sCounterLocalPath = ::rtl::OUString::createFromAscii("/Counter"); + const ::rtl::OUString sIgnoreListNodePath( RTL_CONSTASCII_USTRINGPARAM( "HelpAgent/IgnoreList" )); + const ::rtl::OUString sPathSeparator( RTL_CONSTASCII_USTRINGPARAM( "/" )); + const ::rtl::OUString sURLLocalPath( RTL_CONSTASCII_USTRINGPARAM( "/Name" )); + const ::rtl::OUString sCounterLocalPath( RTL_CONSTASCII_USTRINGPARAM( "/Counter" )); // get the names of all the nodes containing ignore counters // collect the node names we have to ask @@ -339,10 +339,10 @@ void SvtHelpOptions_Impl::implSaveURLCounters() { ::osl::MutexGuard aGuard(aIgnoreCounterSafety); - const ::rtl::OUString sIgnoreListNodePath = ::rtl::OUString::createFromAscii("HelpAgent/IgnoreList"); - const ::rtl::OUString sPathSeparator = ::rtl::OUString::createFromAscii("/"); - const ::rtl::OUString sURLLocalPath = ::rtl::OUString::createFromAscii("/Name"); - const ::rtl::OUString sCounterLocalPath = ::rtl::OUString::createFromAscii("/Counter"); + const ::rtl::OUString sIgnoreListNodePath( RTL_CONSTASCII_USTRINGPARAM( "HelpAgent/IgnoreList" )); + const ::rtl::OUString sPathSeparator( RTL_CONSTASCII_USTRINGPARAM( "/" )); + const ::rtl::OUString sURLLocalPath( RTL_CONSTASCII_USTRINGPARAM( "/Name" )); + const ::rtl::OUString sCounterLocalPath( RTL_CONSTASCII_USTRINGPARAM( "/Counter" )); // get the current URL/counter pairs (as they're persistent at the moment) Sequence< ::rtl::OUString > aNodeNames; @@ -426,7 +426,7 @@ void SvtHelpOptions_Impl::implSaveURLCounters() ::rtl::OUString sNewNodeName; Sequence< ::rtl::OUString > aNewCounterDataNodeNames(2); Sequence< Any > aNewCounterDataValues(2); - const ::rtl::OUString sNodeNameBase = ::rtl::OUString::createFromAscii("URL"); + const ::rtl::OUString sNodeNameBase( RTL_CONSTASCII_USTRINGPARAM( "URL" )); for ( ConstMapString2IntIterator aCollectNew = aURLIgnoreCounters.begin(); aCollectNew != aURLIgnoreCounters.end(); ++aCollectNew diff --git a/svtools/source/config/itemholder2.cxx b/svtools/source/config/itemholder2.cxx index 2c0b250934b5..8c0446ebc37e 100644 --- a/svtools/source/config/itemholder2.cxx +++ b/svtools/source/config/itemholder2.cxx @@ -65,7 +65,7 @@ ItemHolder2::ItemHolder2() { css::uno::Reference< css::lang::XMultiServiceFactory > xSMGR = ::comphelper::getProcessServiceFactory(); css::uno::Reference< css::lang::XComponent > xCfg( - xSMGR->createInstance(::rtl::OUString::createFromAscii("com.sun.star.configuration.ConfigurationProvider")), + xSMGR->createInstance(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationProvider" ))), css::uno::UNO_QUERY); if (xCfg.is()) xCfg->addEventListener(static_cast< css::lang::XEventListener* >(this)); |