From 6773db03a657413a24b87e9ef3a6c68020936e0e Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Mon, 7 Jan 2013 12:04:04 +0000
Subject: allow menu items to be referred to by a name

Change-Id: I8bb1c082e3948f919232b81e0f1f869b88fcd852
---
 svx/source/mnuctrls/SmartTagCtl.cxx | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'svx/source/mnuctrls')

diff --git a/svx/source/mnuctrls/SmartTagCtl.cxx b/svx/source/mnuctrls/SmartTagCtl.cxx
index 1f9d52d75a84..36d43cc01581 100644
--- a/svx/source/mnuctrls/SmartTagCtl.cxx
+++ b/svx/source/mnuctrls/SmartTagCtl.cxx
@@ -98,17 +98,17 @@ void SvxSmartTagsControl::FillMenu()
         PopupMenu* pSbMenu = mpMenu;
         if ( 1 < rActionComponentsSequence.getLength() )
         {
-            mpMenu->InsertItem( nMenuId, aSmartTagCaption, 0, nMenuPos++);
+            mpMenu->InsertItem(nMenuId, aSmartTagCaption, 0, OString(), nMenuPos++);
             pSbMenu = new PopupMenu;
             mpMenu->SetPopupMenu( nMenuId++, pSbMenu );
         }
         pSbMenu->SetSelectHdl( LINK( this, SvxSmartTagsControl, MenuSelect ) );
 
         // sub-menu starts with smart tag caption and separator
-        const rtl::OUString aSmartTagCaption2 = aSmartTagCaption + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(": ")) + aRangeText;
+        const rtl::OUString aSmartTagCaption2 = aSmartTagCaption + OUString(": ") + aRangeText;
         nSubMenuPos = 0;
-        pSbMenu->InsertItem( nMenuId++, aSmartTagCaption2, MIB_NOSELECT, nSubMenuPos++ );
-        pSbMenu->InsertSeparator( nSubMenuPos++ );
+        pSbMenu->InsertItem(nMenuId++, aSmartTagCaption2, MIB_NOSELECT, OString(), nSubMenuPos++);
+        pSbMenu->InsertSeparator(OString(), nSubMenuPos++);
 
         // Add subitem for every action reference for the current smart tag type:
         for ( sal_uInt16 i = 0; i < rActionComponents.getLength(); ++i )
@@ -127,7 +127,7 @@ void SvxSmartTagsControl::FillMenu()
                                                                                 xController,
                                                                                 xTextRange );
 
-                pSbMenu->InsertItem( nSubMenuId++, aActionCaption, 0, nSubMenuPos++ );
+                pSbMenu->InsertItem( nSubMenuId++, aActionCaption, 0, OString(), nSubMenuPos++ );
                 InvokeAction aEntry( xAction, xSmartTagProperties, nActionID );
                 maInvokeActions.push_back( aEntry );
             }
-- 
cgit