diff options
-rw-r--r-- | editeng/qa/lookuptree/lookuptree_test.cxx | 32 | ||||
-rw-r--r-- | editeng/source/editeng/eehtml.cxx | 2 | ||||
-rw-r--r-- | editeng/source/misc/acorrcfg.cxx | 2 | ||||
-rw-r--r-- | editeng/source/misc/svxacorr.cxx | 10 |
4 files changed, 23 insertions, 23 deletions
diff --git a/editeng/qa/lookuptree/lookuptree_test.cxx b/editeng/qa/lookuptree/lookuptree_test.cxx index e1a35f41d0ef..91228fdfd9f3 100644 --- a/editeng/qa/lookuptree/lookuptree_test.cxx +++ b/editeng/qa/lookuptree/lookuptree_test.cxx @@ -51,62 +51,62 @@ void LookupTreeTest::testTrie() trie.findSuggestions( OUString(), suggestions); CPPUNIT_ASSERT_EQUAL( (size_t) 0, suggestions.size() ); - trie.findSuggestions( OUString("a"), suggestions); + trie.findSuggestions( "a", suggestions); CPPUNIT_ASSERT_EQUAL( (size_t) 0, suggestions.size() ); - trie.insert( OUString("abc") ); - trie.insert( OUString("abcdefghijklmnopqrstuvwxyz") ); - trie.findSuggestions( OUString("a"), suggestions); + trie.insert( "abc" ); + trie.insert( "abcdefghijklmnopqrstuvwxyz" ); + trie.findSuggestions( "a", suggestions); CPPUNIT_ASSERT_EQUAL( (size_t) 2, suggestions.size() ); CPPUNIT_ASSERT_EQUAL( OUString("abc"), suggestions[0] ); CPPUNIT_ASSERT_EQUAL( OUString("abcdefghijklmnopqrstuvwxyz"), suggestions[1] ); suggestions.clear(); - trie.findSuggestions( OUString("abc"), suggestions); + trie.findSuggestions( "abc", suggestions); CPPUNIT_ASSERT_EQUAL( (size_t) 1, suggestions.size() ); CPPUNIT_ASSERT_EQUAL( OUString("abcdefghijklmnopqrstuvwxyz"), suggestions[0] ); suggestions.clear(); - trie.findSuggestions( OUString("abe"), suggestions); + trie.findSuggestions( "abe", suggestions); CPPUNIT_ASSERT_EQUAL( (size_t) 0, suggestions.size() ); suggestions.clear(); - trie.insert( OUString("abe") ); - trie.findSuggestions( OUString(""), suggestions); + trie.insert( "abe" ); + trie.findSuggestions( "", suggestions); CPPUNIT_ASSERT_EQUAL( (size_t) 3, suggestions.size() ); CPPUNIT_ASSERT_EQUAL( OUString("abc"), suggestions[0] ); CPPUNIT_ASSERT_EQUAL( OUString("abcdefghijklmnopqrstuvwxyz"), suggestions[1] ); CPPUNIT_ASSERT_EQUAL( OUString("abe"), suggestions[2] ); suggestions.clear(); - trie.insert( OUString("H31l0") ); - trie.findSuggestions( OUString("H"), suggestions); + trie.insert( "H31l0" ); + trie.findSuggestions( "H", suggestions); CPPUNIT_ASSERT_EQUAL( (size_t) 1, suggestions.size() ); CPPUNIT_ASSERT_EQUAL( OUString("H31l0"), suggestions[0] ); suggestions.clear(); - trie.insert( OUString("H1") ); - trie.findSuggestions( OUString("H"), suggestions); + trie.insert( "H1" ); + trie.findSuggestions( "H", suggestions); CPPUNIT_ASSERT_EQUAL( (size_t) 2, suggestions.size() ); CPPUNIT_ASSERT_EQUAL( OUString("H31l0"), suggestions[0] ); CPPUNIT_ASSERT_EQUAL( OUString("H1"), suggestions[1] ); suggestions.clear(); - trie.findSuggestions( OUString("H3"), suggestions); + trie.findSuggestions( "H3", suggestions); CPPUNIT_ASSERT_EQUAL( (size_t) 1, suggestions.size() ); CPPUNIT_ASSERT_EQUAL( OUString("H31l0"), suggestions[0] ); suggestions.clear(); trie.insert( OStringToOUString( "H\xC3\xA4llo", RTL_TEXTENCODING_UTF8 ) ); - trie.findSuggestions( OUString("H"), suggestions ); + trie.findSuggestions( "H", suggestions ); CPPUNIT_ASSERT_EQUAL( (size_t) 3, suggestions.size() ); CPPUNIT_ASSERT_EQUAL( OUString("H31l0"), suggestions[0] ); CPPUNIT_ASSERT_EQUAL( OUString("H1"), suggestions[1] ); CPPUNIT_ASSERT_EQUAL( OStringToOUString( "H\xC3\xA4llo", RTL_TEXTENCODING_UTF8 ), suggestions[2] ); suggestions.clear(); - trie.findSuggestions( OUString("H3"), suggestions ); + trie.findSuggestions( "H3", suggestions ); CPPUNIT_ASSERT_EQUAL( (size_t) 1, suggestions.size() ); CPPUNIT_ASSERT_EQUAL( OUString("H31l0"), suggestions[0] ); suggestions.clear(); @@ -116,7 +116,7 @@ void LookupTreeTest::testTrie() CPPUNIT_ASSERT_EQUAL( OStringToOUString("H\xC3\xA4llo", RTL_TEXTENCODING_UTF8), suggestions[0] ); suggestions.clear(); - trie.findSuggestions( OUString(""), suggestions); + trie.findSuggestions( "", suggestions); CPPUNIT_ASSERT_EQUAL( (size_t) 6, suggestions.size() ); suggestions.clear(); } diff --git a/editeng/source/editeng/eehtml.cxx b/editeng/source/editeng/eehtml.cxx index 5988983c2613..34b659cf4ede 100644 --- a/editeng/source/editeng/eehtml.cxx +++ b/editeng/source/editeng/eehtml.cxx @@ -170,7 +170,7 @@ void EditHTMLParser::NextToken( int nToken ) { if ( bInPara ) { - ImpInsertText( OUString( " " ) ); + ImpInsertText( " " ); } } break; diff --git a/editeng/source/misc/acorrcfg.cxx b/editeng/source/misc/acorrcfg.cxx index a42aa5c114e7..f63a44f5ad45 100644 --- a/editeng/source/misc/acorrcfg.cxx +++ b/editeng/source/misc/acorrcfg.cxx @@ -63,7 +63,7 @@ SvxAutoCorrCfg::SvxAutoCorrCfg() : for( sal_uInt16 n = 0; n < 2; ++n, pS = &sUserPath ) { INetURLObject aPath( *pS ); - aPath.insertName(OUString("acor")); + aPath.insertName("acor"); *pS = aPath.GetMainURL(INetURLObject::DECODE_TO_IURI); } pAutoCorrect = new SvxAutoCorrect( sSharePath, sUserPath ); diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index 113d67ef3ca6..0b700402de6c 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -2053,7 +2053,7 @@ void SvxAutoCorrectLanguageLists::SaveExceptList_Imp( OUString aMime( "text/xml" ); uno::Any aAny; aAny <<= aMime; - xStrm->SetProperty( OUString("MediaType"), aAny ); + xStrm->SetProperty( "MediaType", aAny ); uno::Reference< uno::XComponentContext > xContext = @@ -2325,7 +2325,7 @@ void SvxAutoCorrectLanguageLists::MakeUserStorage_Impl() aDest = INetURLObject ( sUserAutoCorrFile ); if ( SotStorage::IsOLEStorage ( sShareAutoCorrFile ) ) { - aDest.SetExtension ( OUString("bak") ); + aDest.SetExtension ( "bak" ); bConvert = true; } bCopy = true; @@ -2334,7 +2334,7 @@ void SvxAutoCorrectLanguageLists::MakeUserStorage_Impl() { aSource = INetURLObject ( sUserAutoCorrFile ); aDest = INetURLObject ( sUserAutoCorrFile ); - aDest.SetExtension ( OUString("bak") ); + aDest.SetExtension ( "bak" ); bCopy = bConvert = true; } if (bCopy) @@ -2353,7 +2353,7 @@ void SvxAutoCorrectLanguageLists::MakeUserStorage_Impl() aInfo.SourceURL = aSource.GetMainURL( INetURLObject::DECODE_TO_IURI ); aInfo.MoveData = sal_False; aAny <<= aInfo; - aNewContent.executeCommand( OUString ( "transfer" ), aAny); + aNewContent.executeCommand( "transfer", aAny); } catch (...) { @@ -2398,7 +2398,7 @@ void SvxAutoCorrectLanguageLists::MakeUserStorage_Impl() try { ::ucbhelper::Content aContent ( aDest.GetMainURL( INetURLObject::DECODE_TO_IURI ), uno::Reference < XCommandEnvironment >(), comphelper::getProcessComponentContext() ); - aContent.executeCommand ( OUString( "delete" ), makeAny ( true ) ); + aContent.executeCommand ( "delete", makeAny ( true ) ); } catch (...) { |