fix merge conflicts

This commit is contained in:
Caolán McNamara 2011-05-20 10:36:02 +01:00
parent 2e55cc6a9a
commit 06dc6870c7

View file

@ -745,7 +745,7 @@ void SwSpellPopup::Execute( sal_uInt16 nId )
must reside in the same undo group.*/
// record only if it's NOT already present in autocorrection
SvxAutoCorrect* pACorr = SvxAutoCorrCfg::Get()->GetAutoCorrect();
SvxAutoCorrect* pACorr = SvxAutoCorrCfg::Get().GetAutoCorrect();
String aOrigWord( bGrammarResults ? OUString() : xSpellAlt->getWord() ) ;
String aNewWord( aSuggestions[ nAltIdx ] );