Kaydet (Commit) dd1c49d1 authored tarafından Michael Meeks's avatar Michael Meeks

Simplify autocorrect loading - removing redundant parameter.

Change-Id: Idc1ebba8d859ec79b6744228cfe3ef1f0992e41d
üst 720ee909
......@@ -129,7 +129,7 @@ SvXMLWordContext::SvXMLWordContext(
if( !bOnlyTxt )
{
const OUString sLongSave( sRight );
if( !rLocalRef.rAutoCorrect.GetLongText( rLocalRef.xStorage, OUString(), sWrong, sRight ) &&
if( !rLocalRef.rAutoCorrect.GetLongText( rLocalRef.xStorage, sWrong, sRight ) &&
!sLongSave.isEmpty() )
{
sRight = sLongSave;
......
......@@ -1620,18 +1620,17 @@ bool SvxAutoCorrect::MakeCombinedChanges( std::vector<SvxAutocorrWord>& aNewEntr
}
// - return the replacement text (only for SWG-Format, all other
// can be taken from the word list!)
// - return the replacement text (only for SWG-Format, all other
// can be taken from the word list!)
bool SvxAutoCorrect::GetLongText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&,
const OUString&, const OUString&, OUString& )
const OUString&, OUString& )
{
return false;
}
// Text with attribution (only the SWG - SWG format!)
// Text with attribution (only the SWG - SWG format!)
bool SvxAutoCorrect::PutText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&,
const OUString&, const OUString&, SfxObjectShell&, OUString& )
const OUString&, const OUString&, SfxObjectShell&, OUString& )
{
return false;
}
......
......@@ -276,7 +276,7 @@ public:
sal_Unicode GetQuote( sal_Unicode cInsChar, bool bSttQuote,
LanguageType eLang ) const;
virtual bool GetLongText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >& rStg,
const OUString& rFileName, const OUString& rShort, OUString& rLong );
const OUString& rShort, OUString& rLong );
TYPEINFO();
......
......@@ -32,7 +32,7 @@ protected:
// Return replacement text (only for SWG-format, all others can be obtained from wordlist!).
// rShort is stream-name - encrypted!
virtual bool GetLongText( const com::sun::star::uno::Reference < com::sun::star::embed::XStorage >&,
const OUString& rFileName, const OUString& rShort, OUString& rLong ) SAL_OVERRIDE;
const OUString& rShort, OUString& rLong ) SAL_OVERRIDE;
// Text with attributes (only SWG-format!).
// rShort is stream-name - encrypted!
......
......@@ -34,13 +34,13 @@ TYPEINIT1( SwAutoCorrect, SvxAutoCorrect );
// rShort ist der Stream-Name - gecryptet!
bool SwAutoCorrect::GetLongText( const uno::Reference < embed::XStorage >& rStg,
const OUString& rFileName, const OUString& rShort, OUString& rLong )
const OUString& rShort, OUString& rLong )
{
sal_uLong nRet = 0;
if (rStg.is())
{
// mba: relative URLs don't make sense here
SwXMLTextBlocks aBlk( rStg, rFileName );
SwXMLTextBlocks aBlk( rStg, OUString() );
nRet = aBlk.GetText( rShort, rLong );
}
else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment