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 5898e201)

Conflicts:
	svx/source/mnuctrls/SmartTagCtl.cxx

Change-Id: I91d50b94657c29db289864863ee752d4ce45db6c

offapi/com/sun/star/smarttags/XSmartTagAction.idl

@@ -82,7 +82,7 @@ interface XSmartTagAction: com::sun::star::lang::XInitialization
         @throws com::sun::star::lang::IndexOutOfBoundsException
                 if nSmartTagIndex is greater than SmartTagCount.
     */
-    string getSmartTagName( [in] long nSmartTagIndex )
+    string getSmartTagName( [in] long nSmartTagIndex)
         raises( com::sun::star::lang::IndexOutOfBoundsException );
 
 
@@ -104,7 +104,7 @@ interface XSmartTagAction: com::sun::star::lang::XInitialization
                 if nSmartTagIndex is greater than SmartTagCount
      */
     string getSmartTagCaption( [in] long nSmartTagIndex,
-                               [in] ::com::sun::star::lang::Locale aLocale )
+                               [in] ::com::sun::star::lang::Locale aLocale)
         raises( com::sun::star::lang::IndexOutOfBoundsException );
 
 
@@ -123,7 +123,8 @@ interface XSmartTagAction: com::sun::star::lang::XInitialization
                 type.
     */
     long getActionCount( [in] string aSmartTagName,
-                         [in] com::sun::star::frame::XController xController );
+                         [in] com::sun::star::frame::XController xController,
+                         [in] com::sun::star::container::XStringKeyMap xProperties);
 
     /** obtains a unique integer identifier for an action.
 
@@ -210,7 +211,7 @@ interface XSmartTagAction: com::sun::star::lang::XInitialization
                 if the ActionID is not recognized.
     */
     string getActionNameFromID( [in] long nActionID,
-                                [in] com::sun::star::frame::XController xController )
+                                [in] com::sun::star::frame::XController xController)
         raises( com::sun::star::lang::IllegalArgumentException );
 
 

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,

sw/source/ui/smartmenu/stmenu.cxx

@@ -104,7 +104,7 @@ SwSmartTagPopup::SwSmartTagPopup( SwView* pSwView,
         {
             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,