[Libreoffice-commits] core.git: sw/source
Ivan Timofeev
timofeev.i.s at gmail.com
Thu Jul 25 04:18:41 PDT 2013
sw/source/ui/ribbar/workctrl.cxx | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit a645a14cf46a1160c426052823772ad117f0bd8b
Author: Ivan Timofeev <timofeev.i.s at gmail.com>
Date: Thu Jul 25 14:58:42 2013 +0400
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
diff --git a/sw/source/ui/ribbar/workctrl.cxx b/sw/source/ui/ribbar/workctrl.cxx
index b7d959c..384db99 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();
More information about the Libreoffice-commits
mailing list