diff options
author | Henry Castro <hcastro@collabora.com> | 2017-10-13 20:47:29 -0400 |
---|---|---|
committer | Henry Castro <hcastro@collabora.com> | 2017-10-14 13:39:05 +0200 |
commit | 59e9d163345e7a9eb68c1bae273593cd70c61153 (patch) | |
tree | 7594848c67904352f635e4fb142a6750ad5e32db /sd/source/ui/docshell | |
parent | 96a0adacab0c07b337b0d3ead69398a1a2a0425b (diff) |
sd lok: fix spell checking languages in Impress
Change-Id: I133c9b91521fa7f2b5f7e3a47396f7efa31e1a86
Reviewed-on: https://gerrit.libreoffice.org/43382
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Henry Castro <hcastro@collabora.com>
Diffstat (limited to 'sd/source/ui/docshell')
-rw-r--r-- | sd/source/ui/docshell/docshel3.cxx | 17 | ||||
-rw-r--r-- | sd/source/ui/docshell/docshell.cxx | 49 |
2 files changed, 60 insertions, 6 deletions
diff --git a/sd/source/ui/docshell/docshel3.cxx b/sd/source/ui/docshell/docshel3.cxx index db099f07ce45..463c2273ee00 100644 --- a/sd/source/ui/docshell/docshel3.cxx +++ b/sd/source/ui/docshell/docshel3.cxx @@ -120,7 +120,8 @@ static void lcl_setLanguage( const SdDrawDocument *pDoc, const OUString &rLangua for( size_t nObj = 0; nObj < nObjCount; ++nObj ) { SdrObject *pObj = pPage->GetObj( nObj ); - lcl_setLanguageForObj( pObj, nLang, bLanguageNone ); + if (pObj->GetObjIdentifier() != OBJ_PAGE) + lcl_setLanguageForObj( pObj, nLang, bLanguageNone ); } } } @@ -296,6 +297,7 @@ void DrawDocShell::Execute( SfxRequest& rReq ) const OUString aDocumentLangPrefix("Default_"); const OUString aStrNone("LANGUAGE_NONE"); const OUString aStrResetLangs("RESET_LANGUAGES"); + SdDrawDocument* pDoc = mpViewShell->GetDoc(); sal_Int32 nPos = -1; if (-1 != (nPos = aNewLangTxt.indexOf( aDocumentLangPrefix ))) { @@ -306,11 +308,18 @@ void DrawDocShell::Execute( SfxRequest& rReq ) break; } if (aNewLangTxt == aStrNone) - lcl_setLanguage( mpViewShell->GetDoc(), OUString() ); + lcl_setLanguage( pDoc, OUString(), true ); else if (aNewLangTxt == aStrResetLangs) - lcl_setLanguage( mpViewShell->GetDoc(), OUString(), true ); + lcl_setLanguage( pDoc, OUString() ); else - lcl_setLanguage( mpViewShell->GetDoc(), aNewLangTxt ); + lcl_setLanguage( pDoc, aNewLangTxt ); + + mpViewShell->GetFrame()->GetBindings().Invalidate( SID_LANGUAGE_STATUS ); + + if ( pDoc->GetOnlineSpell() ) + { + pDoc->StartOnlineSpelling(); + } } } } diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx index 3528f3dd4756..e7ae2542c9f1 100644 --- a/sd/source/ui/docshell/docshell.cxx +++ b/sd/source/ui/docshell/docshell.cxx @@ -31,9 +31,13 @@ #include <svx/svxids.hrc> #include <svl/srchitem.hxx> #include <svx/srchdlg.hxx> +#include <svx/svdoutl.hxx> +#include <svx/svditer.hxx> #include <editeng/flstitem.hxx> +#include <editeng/eeitem.hxx> #include <svl/eitem.hxx> #include <svl/intitem.hxx> +#include <svl/slstitm.hxx> #include <sfx2/printer.hxx> #include <sfx2/docfile.hxx> #include <svx/drawitem.hxx> @@ -41,8 +45,10 @@ #include <svl/whiter.hxx> #include <svl/itempool.hxx> #include <svtools/ctrltool.hxx> +#include <svtools/langtab.hxx> #include <vcl/graphicfilter.hxx> #include <comphelper/classids.hxx> +#include <comphelper/lok.hxx> #include <svl/cjkoptions.hxx> #include <svl/visitem.hxx> @@ -270,8 +276,47 @@ void DrawDocShell::GetState(SfxItemSet &rSet) break; case SID_LANGUAGE_STATUS: { - // Keeping this enabled for the time being - rSet.Put(SfxVisibilityItem(nWhich, true)); + if ( comphelper::LibreOfficeKit::isActive() ) + { + SdrObject* pObj = nullptr; + bool bLanguageFound = false; + OutlinerParaObject* pParaObj = nullptr; + LanguageType eLanguage( LANGUAGE_DONTKNOW ); + sal_uInt16 nCount = mpDoc->GetPageCount(); + for ( sal_uInt16 itPage = 0; itPage < nCount && !bLanguageFound; itPage++ ) + { + SdrObjListIter aListIter(*mpDoc->GetPage(itPage), SdrIterMode::DeepWithGroups); + while ( aListIter.IsMore() && !bLanguageFound ) + { + pObj = aListIter.Next(); + if ( pObj ) + { + pParaObj = pObj->GetOutlinerParaObject(); + if ( pParaObj ) + { + SdrOutliner aOutliner(&mpDoc->GetPool(), OutlinerMode::TextObject); + aOutliner.SetText(*pParaObj); + eLanguage = aOutliner.GetLanguage(0, 0); + bLanguageFound = eLanguage != LANGUAGE_DONTKNOW; + } + } + } + } + + if ( eLanguage == LANGUAGE_DONTKNOW ) + { + eLanguage = mpDoc->GetLanguage( EE_CHAR_LANGUAGE ); + } + + css::uno::Sequence< OUString > aSeq( 1 ); + aSeq[0] = SvtLanguageTable::GetLanguageString(eLanguage); + SfxStringListItem aItem( SID_LANGUAGE_STATUS ); + aItem.SetStringList( aSeq ); + rSet.Put(aItem); + } + else + // Keeping this enabled for the time being + rSet.Put(SfxVisibilityItem(nWhich, true)); } break; |