diff options
| author | Daniel Sikeler <d.sikeler94@gmail.com> | 2014-10-30 14:53:48 +0000 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-11-05 11:50:42 +0000 |
| commit | 4404b718bdb547cb9b7b17c73a53574724cdeeb7 (patch) | |
| tree | 037ad212198f98bf7dc243cf5e86bebb58b4050f /editeng | |
| parent | fc4d04d51b34cf81e0f69f7210071f795c81fee1 (diff) | |
fdo#79761: parse BlockList.xml only once
Change-Id: I3cfc5b66ee73b0e4d07a84c8255c5a006e4fbb25
Reviewed-on: https://gerrit.libreoffice.org/12210
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'editeng')
| -rw-r--r-- | editeng/source/misc/SvXMLAutoCorrectImport.cxx | 3 | ||||
| -rw-r--r-- | editeng/source/misc/svxacorr.cxx | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/editeng/source/misc/SvXMLAutoCorrectImport.cxx b/editeng/source/misc/SvXMLAutoCorrectImport.cxx index 8f2f69e05fe2..e68362e472de 100644 --- a/editeng/source/misc/SvXMLAutoCorrectImport.cxx +++ b/editeng/source/misc/SvXMLAutoCorrectImport.cxx @@ -56,6 +56,7 @@ SvXMLWordListContext::SvXMLWordListContext( SvXMLImportContext ( rImport ), rLocalRef(rImport) { + rLocalRef.rAutoCorrect.refreshBlockList( rLocalRef.xStorage ); } com::sun::star::uno::Reference<XFastContextHandler> SAL_CALL SvXMLWordListContext::createFastChildContext( @@ -94,7 +95,7 @@ SvXMLWordContext::SvXMLWordContext( if( !bOnlyTxt ) { const OUString sLongSave( sRight ); - if( !rLocalRef.rAutoCorrect.GetLongText( rLocalRef.xStorage, sWrong, sRight ) && + if( !rLocalRef.rAutoCorrect.GetLongText( sWrong, sRight ) && !sLongSave.isEmpty() ) { sRight = sLongSave; diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx index 9b840f32ae8b..6b235de53de1 100644 --- a/editeng/source/misc/svxacorr.cxx +++ b/editeng/source/misc/svxacorr.cxx @@ -1627,12 +1627,15 @@ bool SvxAutoCorrect::MakeCombinedChanges( std::vector<SvxAutocorrWord>& aNewEntr // - 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&, OUString& ) +bool SvxAutoCorrect::GetLongText( const OUString&, OUString& ) { return false; } +void SvxAutoCorrect::refreshBlockList( const uno::Reference< embed::XStorage >& ) +{ +} + // 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& ) |