From d8e3eb234b729e9b3d9b8d81abd27f228fd06687 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Sat, 2 Jun 2012 22:56:28 -0500 Subject: targeted string re-work Change-Id: I6f5075e40d820c91b3fa8a359564da4a4d098032 --- linguistic/source/convdic.cxx | 2 +- linguistic/source/convdiclist.cxx | 2 +- linguistic/source/gciterator.cxx | 5 ++--- linguistic/source/lngsvcmgr.cxx | 18 +++++++++--------- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx index de1a36e2795a..d5599b058448 100644 --- a/linguistic/source/convdic.cxx +++ b/linguistic/source/convdic.cxx @@ -290,7 +290,7 @@ void ConvDic::Save() { xSaxWriter = uno::Reference< io::XActiveDataSource >( xServiceFactory->createInstance( - OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Writer")) ), UNO_QUERY ); + OUString("com.sun.star.xml.sax.Writer") ), UNO_QUERY ); } catch (uno::Exception &) { diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx index 85ac0c866bfb..39cc442ece9a 100644 --- a/linguistic/source/convdiclist.cxx +++ b/linguistic/source/convdiclist.cxx @@ -315,7 +315,7 @@ void SAL_CALL ConvDicNameContainer::removeByName( const OUString& rName ) { ::ucbhelper::Content aCnt( aObj.GetMainURL( INetURLObject::NO_DECODE ), uno::Reference< ::com::sun::star::ucb::XCommandEnvironment > () ); - aCnt.executeCommand( OUString(RTL_CONSTASCII_USTRINGPARAM("delete")), makeAny( sal_Bool( sal_True ) ) ); + aCnt.executeCommand( OUString("delete"), makeAny( sal_Bool( sal_True ) ) ); } catch( ::com::sun::star::ucb::CommandAbortedException& ) { diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx index 37e08d276d1c..9e4e3dca9eb0 100644 --- a/linguistic/source/gciterator.cxx +++ b/linguistic/source/gciterator.cxx @@ -764,7 +764,7 @@ sal_Int32 GrammarCheckingIterator::GetSuggestedEndOfSentence( uno::Reference< lang::XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory(); if ( xMSF.is() ) xBreakIterator = uno::Reference < i18n::XBreakIterator >( xMSF->createInstance( - ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.BreakIterator")) ), uno::UNO_QUERY ); + ::rtl::OUString("com.sun.star.i18n.BreakIterator") ), uno::UNO_QUERY ); } sal_Int32 nTextLen = rText.getLength(); sal_Int32 nEndPosition = nTextLen; @@ -987,8 +987,7 @@ uno::Reference< util::XChangesBatch > GrammarCheckingIterator::GetUpdateAccess() if (xMgr.is()) { xConfigurationProvider = uno::Reference< lang::XMultiServiceFactory > ( - xMgr->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( - "com.sun.star.configuration.ConfigurationProvider" ) ) ), + xMgr->createInstance( OUString( "com.sun.star.configuration.ConfigurationProvider" ) ), uno::UNO_QUERY_THROW ) ; } diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx index 63ee7b0c7cb9..b41dc22f5ae3 100644 --- a/linguistic/source/lngsvcmgr.cxx +++ b/linguistic/source/lngsvcmgr.cxx @@ -459,7 +459,7 @@ sal_Bool LngSvcMgrListenerHelper::RemoveLngSvcEvtBroadcaster( LngSvcMgr::LngSvcMgr() - : utl::ConfigItem(OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Linguistic"))) + : utl::ConfigItem(OUString("Office.Linguistic")) , aEvtListeners(GetLinguMutex()) { bDisposing = sal_False; @@ -756,7 +756,7 @@ void LngSvcMgr::GetAvailableSpellSvcs_Impl() uno::Reference < uno::XComponentContext > xContext; uno::Reference< beans::XPropertySet > xProps( xFac, uno::UNO_QUERY ); - xProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))) >>= xContext; + xProps->getPropertyValue( OUString( "DefaultContext" )) >>= xContext; xSvc = uno::Reference< linguistic2::XSpellChecker >( ( xCompFactory.is() ? xCompFactory->createInstanceWithContext( xContext ) : xFactory->createInstance() ), uno::UNO_QUERY ); } catch (const uno::Exception &) @@ -821,7 +821,7 @@ void LngSvcMgr::GetAvailableGrammarSvcs_Impl() uno::Reference < uno::XComponentContext > xContext; uno::Reference< beans::XPropertySet > xProps( xFac, uno::UNO_QUERY ); - xProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))) >>= xContext; + xProps->getPropertyValue( OUString( "DefaultContext" )) >>= xContext; xSvc = uno::Reference< linguistic2::XProofreader >( ( xCompFactory.is() ? xCompFactory->createInstanceWithContext( xContext ) : xFactory->createInstance() ), uno::UNO_QUERY ); } catch (const uno::Exception &) @@ -884,7 +884,7 @@ void LngSvcMgr::GetAvailableHyphSvcs_Impl() uno::Reference < uno::XComponentContext > xContext; uno::Reference< beans::XPropertySet > xProps( xFac, uno::UNO_QUERY ); - xProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))) >>= xContext; + xProps->getPropertyValue( OUString( "DefaultContext" )) >>= xContext; xSvc = uno::Reference< linguistic2::XHyphenator >( ( xCompFactory.is() ? xCompFactory->createInstanceWithContext( xContext ) : xFactory->createInstance() ), uno::UNO_QUERY ); } @@ -951,7 +951,7 @@ void LngSvcMgr::GetAvailableThesSvcs_Impl() uno::Reference < uno::XComponentContext > xContext; uno::Reference< beans::XPropertySet > xProps( xFac, uno::UNO_QUERY ); - xProps->getPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" ))) >>= xContext; + xProps->getPropertyValue( OUString( "DefaultContext" )) >>= xContext; xSvc = uno::Reference< linguistic2::XThesaurus >( ( xCompFactory.is() ? xCompFactory->createInstanceWithContext( xContext ) : xFactory->createInstance() ), uno::UNO_QUERY ); } catch (const uno::Exception &) @@ -1632,7 +1632,7 @@ uno::Sequence< OUString > SAL_CALL OUString *pNames = aNames.getArray(); if ( 0 == rServiceName.compareToAscii( SN_SPELLCHECKER ) ) { - OUString aNode( RTL_CONSTASCII_USTRINGPARAM("ServiceManager/SpellCheckerList")); + OUString aNode( "ServiceManager/SpellCheckerList"); const uno::Sequence< OUString > aNodeEntries( GetNodeNames( aNode ) ); if (lcl_SeqHasString( aNodeEntries, aCfgLocale )) { @@ -1647,7 +1647,7 @@ uno::Sequence< OUString > SAL_CALL } else if ( 0 == rServiceName.compareToAscii( SN_GRAMMARCHECKER ) ) { - OUString aNode( RTL_CONSTASCII_USTRINGPARAM("ServiceManager/GrammarCheckerList")); + OUString aNode( "ServiceManager/GrammarCheckerList"); const uno::Sequence< OUString > aNodeEntries( GetNodeNames( aNode ) ); if (lcl_SeqHasString( aNodeEntries, aCfgLocale )) { @@ -1662,7 +1662,7 @@ uno::Sequence< OUString > SAL_CALL } else if ( 0 == rServiceName.compareToAscii( SN_HYPHENATOR ) ) { - OUString aNode( RTL_CONSTASCII_USTRINGPARAM("ServiceManager/HyphenatorList")); + OUString aNode( "ServiceManager/HyphenatorList"); const uno::Sequence< OUString > aNodeEntries( GetNodeNames( aNode ) ); if (lcl_SeqHasString( aNodeEntries, aCfgLocale )) { @@ -1677,7 +1677,7 @@ uno::Sequence< OUString > SAL_CALL } else if ( 0 == rServiceName.compareToAscii( SN_THESAURUS ) ) { - OUString aNode( RTL_CONSTASCII_USTRINGPARAM("ServiceManager/ThesaurusList")); + OUString aNode( "ServiceManager/ThesaurusList"); const uno::Sequence< OUString > aNodeEntries( GetNodeNames( aNode ) ); if (lcl_SeqHasString( aNodeEntries, aCfgLocale )) { -- cgit