diff options
| -rw-r--r-- | editeng/source/misc/svxacorr.cxx | 6 | ||||
| -rw-r--r-- | include/editeng/svxacorr.hxx | 8 | ||||
| -rw-r--r-- | sw/inc/swacorr.hxx | 4 | ||||
| -rw-r--r-- | sw/source/core/sw3io/swacorr.cxx | 4 |
4 files changed, 11 insertions, 11 deletions
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index fce15768b79b..9d5fd1ddcca5 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -1582,7 +1582,7 @@ sal_Bool SvxAutoCorrect::CreateLanguageFile( LanguageType eLang, sal_Bool bNewFi return pLists != 0; } -sal_Bool SvxAutoCorrect::PutText( const String& rShort, const String& rLong, +sal_Bool SvxAutoCorrect::PutText( const OUString& rShort, const OUString& rLong, LanguageType eLang ) { boost::ptr_map<LanguageType, SvxAutoCorrectLanguageLists>::iterator nTmpVal = pLangTable->find(eLang); @@ -1614,14 +1614,14 @@ 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&, OUString& ) + const OUString&, const OUString&, 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&, OUString& ) + const OUString&, const OUString&, SfxObjectShell&, OUString& ) { return sal_False; } diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx index 085c1c708f63..b9dd6f4757e0 100644 --- a/include/editeng/svxacorr.hxx +++ b/include/editeng/svxacorr.hxx @@ -266,7 +266,7 @@ protected: // - Text with attribution (only the SWG - SWG format!) // rShort is the stream name - encrypted! virtual sal_Bool PutText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rStg, - const String& rFileName, const String& rShort, SfxObjectShell&, OUString& ); + const OUString& rFileName, const OUString& rShort, SfxObjectShell&, OUString& ); // required language in the table add if possible only when the file exists sal_Bool CreateLanguageFile(LanguageType eLang, sal_Bool bNewFile = sal_True); @@ -278,7 +278,7 @@ public: sal_Unicode GetQuote( sal_Unicode cInsChar, sal_Bool bSttQuote, LanguageType eLang ) const; virtual sal_Bool GetLongText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rStg, - const String& rFileName, const String& rShort, OUString& rLong ); + const OUString& rFileName, const OUString& rShort, OUString& rLong ); TYPEINFO(); @@ -352,9 +352,9 @@ public: // Save these directly in the storage. The word list is updated // accordingly! // - pure Text - sal_Bool PutText( const String& rShort, const String& rLong, LanguageType eLang = LANGUAGE_SYSTEM ); + sal_Bool PutText( const OUString& rShort, const OUString& rLong, LanguageType eLang = LANGUAGE_SYSTEM ); // - Text with attribution (only in the SWG - SWG format!) - sal_Bool PutText( const String& rShort, SfxObjectShell& rShell, + sal_Bool PutText( const OUString& rShort, SfxObjectShell& rShell, LanguageType eLang = LANGUAGE_SYSTEM ) { return _GetLanguageList( eLang ).PutText(rShort, rShell ); } diff --git a/sw/inc/swacorr.hxx b/sw/inc/swacorr.hxx index 98799465c98a..0c26eb08591e 100644 --- a/sw/inc/swacorr.hxx +++ b/sw/inc/swacorr.hxx @@ -32,12 +32,12 @@ protected: // Return replacement text (only for SWG-format, all others can be obtained from wordlist!). // rShort is stream-name - encrypted! virtual sal_Bool GetLongText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, - const String& rFileName, const String& rShort, OUString& rLong ); + const OUString& rFileName, const OUString& rShort, OUString& rLong ); // Text with attributes (only SWG-format!). // rShort is stream-name - encrypted! virtual sal_Bool PutText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, - const String& rFileName, const String& rShort, SfxObjectShell&, OUString& ); + const OUString& rFileName, const OUString& rShort, SfxObjectShell&, OUString& ); public: TYPEINFO(); diff --git a/sw/source/core/sw3io/swacorr.cxx b/sw/source/core/sw3io/swacorr.cxx index 92d3b4c12d59..7b38daee9933 100644 --- a/sw/source/core/sw3io/swacorr.cxx +++ b/sw/source/core/sw3io/swacorr.cxx @@ -36,7 +36,7 @@ TYPEINIT1( SwAutoCorrect, SvxAutoCorrect ); // rShort ist der Stream-Name - gecryptet! sal_Bool SwAutoCorrect::GetLongText( const uno::Reference < embed::XStorage >& rStg, - const String& rFileName, const String& rShort, OUString& rLong ) + const OUString& rFileName, const OUString& rShort, OUString& rLong ) { sal_uLong nRet = 0; if (rStg.is()) @@ -54,7 +54,7 @@ sal_Bool SwAutoCorrect::GetLongText( const uno::Reference < embed::XStorage >& r // - Text mit Attributierung (kann nur der SWG - SWG-Format!) // rShort ist der Stream-Name - gecryptet! sal_Bool SwAutoCorrect::PutText( const uno::Reference < embed::XStorage >& rStg, - const String& rFileName, const String& rShort, + const OUString& rFileName, const OUString& rShort, SfxObjectShell& rObjSh, OUString& rLong ) { if( !rObjSh.IsA( TYPE(SwDocShell) ) ) |