diff options
| author | Ivan Timofeev <timofeev.i.s@gmail.com> | 2013-07-25 14:58:42 +0400 |
|---|---|---|
| committer | Fridrich Strba <fridrich@documentfoundation.org> | 2013-07-25 17:34:33 +0000 |
| commit | ab79f3def7ce98d27e096e6b40203787dde2f3fb (patch) | |
| tree | 57fd6bb96e154fc0b0c220a2f1a33bc2a96c4e1d | |
| parent | 7299db371e38d1a3ecd51eb3811344ee5bb3a086 (diff) | |
Related: fdo#67113 restore some code, it has side effects
these lines were removed in 8275c8fc33b63aa40a0a8a8c215f32b9986edab6
fixes missing AutoText menu entries and AutoText insertion via menu
Change-Id: Ifa498d1cbfc096cca7751de9c9667fda6f1b3b48
(cherry picked from commit a645a14cf46a1160c426052823772ad117f0bd8b)
Reviewed-on: https://gerrit.libreoffice.org/5111
Reviewed-by: Fridrich Strba <fridrich@documentfoundation.org>
Tested-by: Fridrich Strba <fridrich@documentfoundation.org>
| -rw-r--r-- | sw/source/ui/ribbar/workctrl.cxx | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx index b7d959c56717..384db9907ec5 100644 --- a/sw/source/ui/ribbar/workctrl.cxx +++ b/sw/source/ui/ribbar/workctrl.cxx @@ -207,6 +207,7 @@ SfxPopupWindow* SwTbxAutoTextCtrl::CreatePopupWindow() { // Acquire group name with path extension String sTitle; + pGlossaryList->GetGroupName(i - 1, sal_False, &sTitle); sal_uInt16 nBlockCount = pGlossaryList->GetBlockCount(i -1); if(nBlockCount) { @@ -303,6 +304,7 @@ IMPL_LINK(SwTbxAutoTextCtrl, PopupHdl, PopupMenu*, pMenu) SwGlossaryList* pGlossaryList = ::GetGlossaryList(); String sShortName; String sGroup = pGlossaryList->GetGroupName(nBlock - 1, false); + pGlossaryList->GetBlockName(nBlock - 1, nId - (100 * nBlock) - 1, sShortName); SwGlossaryHdl* pGlosHdl = pView->GetGlosHdl(); SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create(); |