diff options
| author | Matteo Casalin <matteo.casalin@yahoo.com> | 2013-07-26 15:37:08 +0200 |
|---|---|---|
| committer | Luboš Luňák <l.lunak@suse.cz> | 2013-07-30 13:35:28 +0000 |
| commit | 73a136945d50a207c9e1c552d02c90d5c862c470 (patch) | |
| tree | d34792f0a5f093aaee4255da994a05079ecb1fe2 /editeng | |
| parent | 9accbedad3648dca197439a8cc39c268cf34ea99 (diff) | |
String to OUString
Change-Id: Ia9bebaf92bf570c10d01a9ed3db437f70098a07d
Reviewed-on: https://gerrit.libreoffice.org/5185
Reviewed-by: Luboš Luňák <l.lunak@suse.cz>
Tested-by: Luboš Luňák <l.lunak@suse.cz>
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/misc/SvXMLAutoCorrectImport.cxx | 9 | ||||
| -rw-r--r-- | editeng/source/misc/svxacorr.cxx | 9 |
2 files changed, 10 insertions, 8 deletions
diff --git a/editeng/source/misc/SvXMLAutoCorrectImport.cxx b/editeng/source/misc/SvXMLAutoCorrectImport.cxx index 9b4de022c622..b338b95dd310 100644 --- a/editeng/source/misc/SvXMLAutoCorrectImport.cxx +++ b/editeng/source/misc/SvXMLAutoCorrectImport.cxx @@ -100,7 +100,8 @@ SvXMLWordContext::SvXMLWordContext( SvXMLImportContext ( rImport, nPrefix, rLocalName ), rLocalRef(rImport) { - String sRight, sWrong; + OUString sRight; + OUString sWrong; sal_Int16 nAttrCount = xAttrList.is() ? xAttrList->getLength() : 0; for (sal_Int16 i=0; i < nAttrCount; i++) @@ -121,15 +122,15 @@ SvXMLWordContext::SvXMLWordContext( } } } - if (!sWrong.Len() || !sRight.Len() ) + if (sWrong.isEmpty() || sRight.isEmpty()) return; sal_Bool bOnlyTxt = sRight != sWrong; if( !bOnlyTxt ) { - String sLongSave( sRight ); + const OUString sLongSave( sRight ); if( !rLocalRef.rAutoCorrect.GetLongText( rLocalRef.xStorage, String(), sWrong, sRight ) && - sLongSave.Len() ) + !sLongSave.isEmpty() ) { sRight = sLongSave; bOnlyTxt = sal_True; diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index d40f481ee606..8b651a6491cd 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -1609,14 +1609,15 @@ sal_Bool SvxAutoCorrect::MakeCombinedChanges( std::vector<SvxAutocorrWord>& aNew // - return the replacement text (only for SWG-Format, all other // can be taken from the word list!) -sal_Bool SvxAutoCorrect::GetLongText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const String&, const String& , String& ) +sal_Bool SvxAutoCorrect::GetLongText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, + const String&, const String&, OUString& ) { return sal_False; } // Text with attribution (only the SWG - SWG format!) -sal_Bool SvxAutoCorrect::PutText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, const String&, const String&, SfxObjectShell&, - String& ) +sal_Bool SvxAutoCorrect::PutText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, + const String&, const String&, SfxObjectShell&, OUString& ) { return sal_False; } @@ -2541,7 +2542,7 @@ sal_Bool SvxAutoCorrectLanguageLists::PutText( const String& rShort, MakeUserStorage_Impl(); sal_Bool bRet = sal_False; - String sLong; + OUString sLong; try { uno::Reference < embed::XStorage > xStg = comphelper::OStorageHelper::GetStorageFromURL( sUserAutoCorrFile, embed::ElementModes::READWRITE ); |