From 5e059c1ee53b6be058f66a7c43af0e75f3cadfa1 Mon Sep 17 00:00:00 2001 From: Jürgen Schmidt Date: Wed, 20 Mar 2013 14:15:58 +0000 Subject: Resolves: #i121731# extend XSmartTagAction->getActionCount... with additional parameter to increase flexibility of context menus Patch by: Kai Labusch Review by: arielch, jsc (cherry picked from commit 5898e201ae8bbc1203bf24629a389f8f3b3e02ee) Conflicts: svx/source/mnuctrls/SmartTagCtl.cxx Change-Id: I91d50b94657c29db289864863ee752d4ce45db6c --- svx/source/mnuctrls/SmartTagCtl.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'svx/source/mnuctrls') diff --git a/svx/source/mnuctrls/SmartTagCtl.cxx b/svx/source/mnuctrls/SmartTagCtl.cxx index 4f0f3fe523b8..8e9b05349646 100644 --- a/svx/source/mnuctrls/SmartTagCtl.cxx +++ b/svx/source/mnuctrls/SmartTagCtl.cxx @@ -92,7 +92,7 @@ void SvxSmartTagsControl::FillMenu() const sal_Int32 nSmartTagIndex = rActionIndices[0]; const OUString aSmartTagType = xAction->getSmartTagName( nSmartTagIndex ); - const OUString aSmartTagCaption = xAction->getSmartTagCaption( nSmartTagIndex, rLocale ); + const OUString aSmartTagCaption = xAction->getSmartTagCaption( nSmartTagIndex, rLocale); // no sub-menus if there's only one smart tag type listed: PopupMenu* pSbMenu = mpMenu; @@ -115,7 +115,7 @@ void SvxSmartTagsControl::FillMenu() { xAction = rActionComponents[i]; - for ( sal_Int32 k = 0; k < xAction->getActionCount( aSmartTagType, xController ); ++k ) + for ( sal_Int32 k = 0; k < xAction->getActionCount( aSmartTagType, xController, xSmartTagProperties ); ++k ) { const sal_uInt32 nActionID = xAction->getActionID( aSmartTagType, k, xController ); OUString aActionCaption = xAction->getActionCaptionFromID( nActionID, -- cgit