You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by js...@apache.org on 2013/03/20 16:15:59 UTC
svn commit: r1458877 - in /openoffice/trunk/main:
offapi/com/sun/star/smarttags/XSmartTagAction.idl
svx/source/mnuctrls/SmartTagCtl.cxx sw/source/ui/smartmenu/stmenu.cxx
Author: jsc
Date: Wed Mar 20 15:15:58 2013
New Revision: 1458877
URL: http://svn.apache.org/r1458877
Log:
#121731# extend XSmartTagAction->getActionCount with additional parameter to increase flexibility of context menus
Patch by: Kai Labusch
Review by: arielch, jsc
Modified:
openoffice/trunk/main/offapi/com/sun/star/smarttags/XSmartTagAction.idl
openoffice/trunk/main/svx/source/mnuctrls/SmartTagCtl.cxx
openoffice/trunk/main/sw/source/ui/smartmenu/stmenu.cxx
Modified: openoffice/trunk/main/offapi/com/sun/star/smarttags/XSmartTagAction.idl
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/offapi/com/sun/star/smarttags/XSmartTagAction.idl?rev=1458877&r1=1458876&r2=1458877&view=diff
==============================================================================
--- openoffice/trunk/main/offapi/com/sun/star/smarttags/XSmartTagAction.idl (original)
+++ openoffice/trunk/main/offapi/com/sun/star/smarttags/XSmartTagAction.idl Wed Mar 20 15:15:58 2013
@@ -112,7 +112,7 @@ interface XSmartTagAction: com::sun::sta
@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 );
@@ -135,7 +135,7 @@ interface XSmartTagAction: com::sun::sta
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 );
@@ -155,7 +155,8 @@ interface XSmartTagAction: com::sun::sta
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.
@@ -245,7 +246,7 @@ interface XSmartTagAction: com::sun::sta
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 );
Modified: openoffice/trunk/main/svx/source/mnuctrls/SmartTagCtl.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/svx/source/mnuctrls/SmartTagCtl.cxx?rev=1458877&r1=1458876&r2=1458877&view=diff
==============================================================================
--- openoffice/trunk/main/svx/source/mnuctrls/SmartTagCtl.cxx (original)
+++ openoffice/trunk/main/svx/source/mnuctrls/SmartTagCtl.cxx Wed Mar 20 15:15:58 2013
@@ -104,7 +104,7 @@ void SvxSmartTagsControl::FillMenu()
const sal_Int32 nSmartTagIndex = rActionIndices[0];
const rtl::OUString aSmartTagType = xAction->getSmartTagName( nSmartTagIndex );
- const rtl::OUString aSmartTagCaption = xAction->getSmartTagCaption( nSmartTagIndex, rLocale );
+ const rtl::OUString aSmartTagCaption = xAction->getSmartTagCaption( nSmartTagIndex, rLocale);
// no sub-menues if there's only one smart tag type listed:
PopupMenu* pSbMenu = mpMenu;
@@ -127,7 +127,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 );
rtl::OUString aActionCaption = xAction->getActionCaptionFromID( nActionID,
Modified: openoffice/trunk/main/sw/source/ui/smartmenu/stmenu.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/sw/source/ui/smartmenu/stmenu.cxx?rev=1458877&r1=1458876&r2=1458877&view=diff
==============================================================================
--- openoffice/trunk/main/sw/source/ui/smartmenu/stmenu.cxx (original)
+++ openoffice/trunk/main/sw/source/ui/smartmenu/stmenu.cxx Wed Mar 20 15:15:58 2013
@@ -118,7 +118,7 @@ SwSmartTagPopup::SwSmartTagPopup( SwView
{
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 );
rtl::OUString aActionCaption = xAction->getActionCaptionFromID( nActionID,