mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

convert GetText/PutText in SvxAutoCorrect from String to OUString

Browse Source 
Change-Id: Id3d2122d949a7ae940e908ee7c82e6f105b68f40
This commit is contained in:
Noel Grandin
2013-09-16 14:20:18 +02:00
parent d63c3f0cf8
commit cb4e009c45
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
editeng/source/misc/svxacorr.cxx
View File

@@ -1582,7 +1582,7 @@ sal_Bool SvxAutoCorrect::CreateLanguageFile( LanguageType eLang, sal_Bool bNewFi
return pLists != 0; 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 ) LanguageType eLang )
{ {
boost::ptr_map<LanguageType, SvxAutoCorrectLanguageLists>::iterator nTmpVal = pLangTable->find(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 // - return the replacement text (only for SWG-Format, all other
// can be taken from the word list!) // can be taken from the word list!)
sal_Bool SvxAutoCorrect::GetLongText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, 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; return sal_False;
} }
// Text with attribution (only the SWG - SWG format!) // Text with attribution (only the SWG - SWG format!)
sal_Bool SvxAutoCorrect::PutText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, 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; return sal_False;
} }

8
include/editeng/svxacorr.hxx
View File

@@ -266,7 +266,7 @@ protected:
// - Text with attribution (only the SWG - SWG format!) // - Text with attribution (only the SWG - SWG format!)
// rShort is the stream name - encrypted! // rShort is the stream name - encrypted!
virtual sal_Bool PutText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rStg, 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 // required language in the table add if possible only when the file exists
sal_Bool CreateLanguageFile(LanguageType eLang, sal_Bool bNewFile = sal_True); sal_Bool CreateLanguageFile(LanguageType eLang, sal_Bool bNewFile = sal_True);
@@ -278,7 +278,7 @@ public:
sal_Unicode GetQuote( sal_Unicode cInsChar, sal_Bool bSttQuote, sal_Unicode GetQuote( sal_Unicode cInsChar, sal_Bool bSttQuote,
LanguageType eLang ) const; LanguageType eLang ) const;
virtual sal_Bool GetLongText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rStg, 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(); TYPEINFO();
@@ -352,9 +352,9 @@ public:
// Save these directly in the storage. The word list is updated // Save these directly in the storage. The word list is updated
// accordingly! // accordingly!
// - pure Text // - 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!) // - 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 ) LanguageType eLang = LANGUAGE_SYSTEM )
{ return _GetLanguageList( eLang ).PutText(rShort, rShell ); } { return _GetLanguageList( eLang ).PutText(rShort, rShell ); }

4
sw/inc/swacorr.hxx
View File

@@ -32,12 +32,12 @@ protected:
// Return replacement text (only for SWG-format, all others can be obtained from wordlist!). // Return replacement text (only for SWG-format, all others can be obtained from wordlist!).
// rShort is stream-name - encrypted! // rShort is stream-name - encrypted!
virtual sal_Bool GetLongText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, 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!). // Text with attributes (only SWG-format!).
// rShort is stream-name - encrypted! // rShort is stream-name - encrypted!
virtual sal_Bool PutText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&, 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: public:
TYPEINFO(); TYPEINFO();

4
sw/source/core/sw3io/swacorr.cxx
View File

@@ -36,7 +36,7 @@ TYPEINIT1( SwAutoCorrect, SvxAutoCorrect );
// rShort ist der Stream-Name - gecryptet! // rShort ist der Stream-Name - gecryptet!
sal_Bool SwAutoCorrect::GetLongText( const uno::Reference < embed::XStorage >& rStg, 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; sal_uLong nRet = 0;
if (rStg.is()) 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!) // - Text mit Attributierung (kann nur der SWG - SWG-Format!)
// rShort ist der Stream-Name - gecryptet! // rShort ist der Stream-Name - gecryptet!
sal_Bool SwAutoCorrect::PutText( const uno::Reference < embed::XStorage >& rStg, 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 ) SfxObjectShell& rObjSh, OUString& rLong )
{ {
if( !rObjSh.IsA( TYPE(SwDocShell) ) ) if( !rObjSh.IsA( TYPE(SwDocShell) ) )