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

tdf#92341 Make Autocorrect entry actually work

Browse Source 
Change-Id: I83e028428933e2153b639ca6b34fd69db88fb53f
This commit is contained in:
Samuel Mehrbrodt
2015-10-01 14:54:13 +02:00
parent 0cc41a033f
commit a8a812997f
5 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
editeng/source/editeng/editview.cxx
View File

@@ -762,7 +762,6 @@ bool EditView::IsWrongSpelledWordAtPos( const Point& rPosPixel, bool bMarkIfWron
void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link<SpellCallbackInfo&,void>* pCallBack ) void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link<SpellCallbackInfo&,void>* pCallBack )
{ {
Point aPos ( pImpEditView->GetWindow()->PixelToLogic( rPosPixel ) ); Point aPos ( pImpEditView->GetWindow()->PixelToLogic( rPosPixel ) );
aPos = pImpEditView->GetDocPos( aPos ); aPos = pImpEditView->GetDocPos( aPos );
EditPaM aPaM = pImpEditView->pEditEngine->GetPaM(aPos, false); EditPaM aPaM = pImpEditView->pEditEngine->GetPaM(aPos, false);
@@ -989,6 +988,11 @@ void EditView::ExecuteSpellPopup( const Point& rPosPixel, Link<SpellCallbackInfo
pCallBack->Call( aInf ); pCallBack->Call( aInf );
} }
} }
else if ( nId == MN_AUTO_CORRECT_DLG && pCallBack)
{
SpellCallbackInfo aInf( SpellCallbackCommand::AUTOCORRECT_OPTIONS, OUString() );
pCallBack->Call( aInf );
}
else if ( nId >= MN_DICTSTART || nId == MN_INSERT_SINGLE ) else if ( nId >= MN_DICTSTART || nId == MN_INSERT_SINGLE )
{ {
OUString aDicName; OUString aDicName;

11
include/editeng/editstat.hxx
View File

@@ -136,11 +136,12 @@ public:
enum class SpellCallbackCommand enum class SpellCallbackCommand
{ {
IGNOREWORD = 0x0001, IGNOREWORD = 0x0001,
STARTSPELLDLG = 0x0002, STARTSPELLDLG = 0x0002,
ADDTODICTIONARY = 0x0003, ADDTODICTIONARY = 0x0003,
WORDLANGUAGE = 0x0004, WORDLANGUAGE = 0x0004,
PARALANGUAGE = 0x0005, PARALANGUAGE = 0x0005,
AUTOCORRECT_OPTIONS = 0x0006,
}; };
struct SpellCallbackInfo struct SpellCallbackInfo

2
sc/source/ui/view/gridwin.cxx
View File

@@ -587,6 +587,8 @@ IMPL_LINK_TYPED( ScGridWindow, PopupSpellingHdl, SpellCallbackInfo&, rInfo, void
{ {
if( rInfo.nCommand == SpellCallbackCommand::STARTSPELLDLG ) if( rInfo.nCommand == SpellCallbackCommand::STARTSPELLDLG )
pViewData->GetDispatcher().Execute( SID_SPELL_DIALOG, SfxCallMode::ASYNCHRON ); pViewData->GetDispatcher().Execute( SID_SPELL_DIALOG, SfxCallMode::ASYNCHRON );
else if (rInfo.nCommand == SpellCallbackCommand::AUTOCORRECT_OPTIONS)
pViewData->GetDispatcher().Execute( SID_AUTO_CORRECT_DLG, SfxCallMode::ASYNCHRON );
} }
void ScGridWindow::ExecPageFieldSelect( SCCOL nCol, SCROW nRow, bool bHasSelection, const OUString& rStr ) void ScGridWindow::ExecPageFieldSelect( SCCOL nCol, SCROW nRow, bool bHasSelection, const OUString& rStr )

7
sd/source/core/drawdoc4.cxx
View File

@@ -988,10 +988,9 @@ void SdDrawDocument::ImpOnlineSpellCallback(SpellCallbackInfo* pInfo, SdrObject*
StartOnlineSpelling(); StartOnlineSpelling();
} }
else if (nCommand == SpellCallbackCommand::STARTSPELLDLG) else if (nCommand == SpellCallbackCommand::STARTSPELLDLG)
{ SfxViewFrame::Current()->GetDispatcher()->Execute( SID_SPELL_DIALOG, SfxCallMode::ASYNCHRON );
SfxViewFrame::Current()->GetDispatcher()->Execute( SID_SPELL_DIALOG, else if (nCommand == SpellCallbackCommand::AUTOCORRECT_OPTIONS)
SfxCallMode::ASYNCHRON ); SfxViewFrame::Current()->GetDispatcher()->Execute( SID_AUTO_CORRECT_DLG, SfxCallMode::ASYNCHRON );
}
} }
// Replace the unambiguous names of the default layers by their names in the // Replace the unambiguous names of the default layers by their names in the

2
sw/source/uibase/uiview/viewdraw.cxx
View File

@@ -729,6 +729,8 @@ IMPL_LINK_TYPED(SwView, OnlineSpellCallback, SpellCallbackInfo&, rInfo, void)
{ {
if (rInfo.nCommand == SpellCallbackCommand::STARTSPELLDLG) if (rInfo.nCommand == SpellCallbackCommand::STARTSPELLDLG)
GetViewFrame()->GetDispatcher()->Execute( FN_SPELL_GRAMMAR_DIALOG, SfxCallMode::ASYNCHRON); GetViewFrame()->GetDispatcher()->Execute( FN_SPELL_GRAMMAR_DIALOG, SfxCallMode::ASYNCHRON);
else if (rInfo.nCommand == SpellCallbackCommand::AUTOCORRECT_OPTIONS)
GetViewFrame()->GetDispatcher()->Execute( SID_AUTO_CORRECT_DLG, SfxCallMode::ASYNCHRON );
} }
bool SwView::ExecDrwTextSpellPopup(const Point& rPt) bool SwView::ExecDrwTextSpellPopup(const Point& rPt)