summaryrefslogtreecommitdiff
path: root/linguistic/source
diff options
context:
space:
mode:
Diffstat (limited to 'linguistic/source')
-rw-r--r--linguistic/source/convdic.cxx2
-rw-r--r--linguistic/source/convdiclist.cxx2
-rw-r--r--linguistic/source/gciterator.cxx2
-rw-r--r--linguistic/source/grammarchecker.cxx6
-rw-r--r--linguistic/source/lngopt.cxx12
-rw-r--r--linguistic/source/lngsvcmgr.cxx8
6 files changed, 13 insertions, 19 deletions
diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx
index c96a7484f38a..434ed1b368c8 100644
--- a/linguistic/source/convdic.cxx
+++ b/linguistic/source/convdic.cxx
@@ -305,7 +305,7 @@ void ConvDic::Save()
{
xSaxWriter = uno::Reference< io::XActiveDataSource >(
xServiceFactory->createInstance(
- OUString::createFromAscii( "com.sun.star.xml.sax.Writer" ) ), UNO_QUERY );
+ OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Writer")) ), UNO_QUERY );
}
catch (uno::Exception &)
{
diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx
index 62c7426ba6eb..3f17d8f43da5 100644
--- a/linguistic/source/convdiclist.cxx
+++ b/linguistic/source/convdiclist.cxx
@@ -320,7 +320,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::createFromAscii( "delete" ), makeAny( sal_Bool( sal_True ) ) );
+ aCnt.executeCommand( OUString(RTL_CONSTASCII_USTRINGPARAM("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 2519aa0cea89..d1627898637c 100644
--- a/linguistic/source/gciterator.cxx
+++ b/linguistic/source/gciterator.cxx
@@ -792,7 +792,7 @@ sal_Int32 GrammarCheckingIterator::GetSuggestedEndOfSentence(
uno::Reference< lang::XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
if ( xMSF.is() )
xBreakIterator = uno::Reference < i18n::XBreakIterator >( xMSF->createInstance(
- ::rtl::OUString::createFromAscii("com.sun.star.i18n.BreakIterator") ), uno::UNO_QUERY );
+ ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.i18n.BreakIterator")) ), uno::UNO_QUERY );
}
sal_Int32 nTextLen = rText.getLength();
sal_Int32 nEndPosition = nTextLen;
diff --git a/linguistic/source/grammarchecker.cxx b/linguistic/source/grammarchecker.cxx
index 3085ee54e0bc..bf782c0579fd 100644
--- a/linguistic/source/grammarchecker.cxx
+++ b/linguistic/source/grammarchecker.cxx
@@ -163,10 +163,10 @@ uno::Sequence< linguistic2::SingleGrammarError > GrammarChecker::GrammarChecking
Error_t aError;
uno::Sequence< OUString > aSuggestion(1);
OUString *pSeggestion = aSuggestion.getArray();
- pSeggestion[0] = OUString::createFromAscii("Modified");
+ pSeggestion[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("Modified"));
- aError[OUString::createFromAscii("GrammarError")] = aSuggestion;
- aError[OUString::createFromAscii("Grammar Error")] = aSuggestion;
+ aError[OUString(RTL_CONSTASCII_USTRINGPARAM("GrammarError"))] = aSuggestion;
+ aError[OUString(RTL_CONSTASCII_USTRINGPARAM("Grammar Error"))] = aSuggestion;
typedef std::vector< linguistic2::SingleGrammarError> ErrorVector_t;
ErrorVector_t aErrorVector;
diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx
index 179c61d6e934..4e102bf1aaa6 100644
--- a/linguistic/source/lngopt.cxx
+++ b/linguistic/source/lngopt.cxx
@@ -300,16 +300,10 @@ OUString LinguOptions::GetName( INT32 nWID )
OUString aRes;
INT32 nLen = SAL_N_ELEMENTS( aWID_Name );
- if (0 <= nWID && nWID < nLen
- && aWID_Name[ nWID ].nWID == nWID)
- {
- aRes = OUString( RTL_CONSTASCII_USTRINGPARAM(
- aWID_Name[ nWID ].pPropertyName ) );
- }
+ if (0 <= nWID && nWID < nLen && aWID_Name[ nWID ].nWID == nWID)
+ aRes = OUString::createFromAscii(aWID_Name[nWID].pPropertyName);
else
- {
- DBG_ASSERT( 0,"lng : unknown WID");
- }
+ OSL_ENSURE(false, "lng : unknown WID");
return aRes;
}
diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx
index 3d665b819f41..136d85d6bf27 100644
--- a/linguistic/source/lngsvcmgr.cxx
+++ b/linguistic/source/lngsvcmgr.cxx
@@ -1795,7 +1795,7 @@ uno::Sequence< OUString > SAL_CALL
OUString *pNames = aNames.getArray();
if ( 0 == rServiceName.compareToAscii( SN_SPELLCHECKER ) )
{
- OUString aNode( OUString::createFromAscii( "ServiceManager/SpellCheckerList" ));
+ OUString aNode( RTL_CONSTASCII_USTRINGPARAM("ServiceManager/SpellCheckerList"));
const uno::Sequence< OUString > aNodeEntries( GetNodeNames( aNode ) );
if (lcl_SeqHasString( aNodeEntries, aCfgLocale ))
{
@@ -1810,7 +1810,7 @@ uno::Sequence< OUString > SAL_CALL
}
else if ( 0 == rServiceName.compareToAscii( SN_GRAMMARCHECKER ) )
{
- OUString aNode( OUString::createFromAscii( "ServiceManager/GrammarCheckerList" ));
+ OUString aNode( RTL_CONSTASCII_USTRINGPARAM("ServiceManager/GrammarCheckerList"));
const uno::Sequence< OUString > aNodeEntries( GetNodeNames( aNode ) );
if (lcl_SeqHasString( aNodeEntries, aCfgLocale ))
{
@@ -1825,7 +1825,7 @@ uno::Sequence< OUString > SAL_CALL
}
else if ( 0 == rServiceName.compareToAscii( SN_HYPHENATOR ) )
{
- OUString aNode( OUString::createFromAscii( "ServiceManager/HyphenatorList" ));
+ OUString aNode( RTL_CONSTASCII_USTRINGPARAM("ServiceManager/HyphenatorList"));
const uno::Sequence< OUString > aNodeEntries( GetNodeNames( aNode ) );
if (lcl_SeqHasString( aNodeEntries, aCfgLocale ))
{
@@ -1840,7 +1840,7 @@ uno::Sequence< OUString > SAL_CALL
}
else if ( 0 == rServiceName.compareToAscii( SN_THESAURUS ) )
{
- OUString aNode( OUString::createFromAscii( "ServiceManager/ThesaurusList" ));
+ OUString aNode( RTL_CONSTASCII_USTRINGPARAM("ServiceManager/ThesaurusList"));
const uno::Sequence< OUString > aNodeEntries( GetNodeNames( aNode ) );
if (lcl_SeqHasString( aNodeEntries, aCfgLocale ))
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 16:45:38 +0000