convert include/sfx2/mnuitem.hxx from String to OUString

Change-Id: I33002a52e430429f491c6191b3f48c5eef9d69ee

2 files changed, 14 insertions, 14 deletions

diff --git a/include/sfx2/mnuitem.hxx b/include/sfx2/mnuitem.hxx
index 557e8764dfce..c2b7d2b3e5ad 100644
--- a/include/sfx2/mnuitem.hxx
+++ b/include/sfx2/mnuitem.hxx
@@ -38,7 +38,7 @@ struct SfxMenuCtrlFactory;
 
 class SFX2_DLLPUBLIC SfxMenuControl: public SfxControllerItem
 {
-    String                  aTitle;
+    OUString                aTitle;
     SfxVirtualMenu*         pOwnMenu;
     SfxVirtualMenu*         pSubMenu;
     sal_Bool                    b_ShowStrings;
@@ -55,12 +55,12 @@ public:
 
         using SfxControllerItem::Bind;
     void                    Bind( SfxVirtualMenu* pOwnMenu, sal_uInt16 nId,
-                                  const String& rTitle, SfxBindings& rBindings );
+                                  const OUString& rTitle, SfxBindings& rBindings );
     void                    Bind( SfxVirtualMenu* pOwnMenu, sal_uInt16 nId,
                                   SfxVirtualMenu& rSubMenu,
-                                  const String& rTitle, SfxBindings& rBindings );
+                                  const OUString& rTitle, SfxBindings& rBindings );
 
-    String                  GetTitle() const;
+    OUString                GetTitle() const;
     SfxVirtualMenu*         GetPopupMenu() const;
     virtual PopupMenu*      GetPopup() const;
 
@@ -68,7 +68,7 @@ public:
                                           const SfxPoolItem* pState );
 
     static SfxMenuControl*    CreateControl( sal_uInt16 nId, Menu &, SfxBindings & );
-    static SfxUnoMenuControl* CreateControl( const String&, sal_uInt16, Menu&, const String& sItemText, SfxBindings&, SfxVirtualMenu* );
+    static SfxUnoMenuControl* CreateControl( const OUString&, sal_uInt16, Menu&, const OUString& sItemText, SfxBindings&, SfxVirtualMenu* );
     static void             RegisterMenuControl(SfxModule*, SfxMenuCtrlFactory*);
 
 };
@@ -77,8 +77,8 @@ class SfxUnoMenuControl : public SfxMenuControl
 {
     SfxUnoControllerItem*   pUnoCtrl;
 public:
-                            SfxUnoMenuControl( const String&, sal_uInt16 nId, Menu&,
-                                               const String&,
+                            SfxUnoMenuControl( const OUString&, sal_uInt16 nId, Menu&,
+                                               const OUString&,
                                                 SfxBindings&, SfxVirtualMenu* );
                             ~SfxUnoMenuControl();
 };
@@ -99,7 +99,7 @@ struct SfxMenuCtrlFactory
     {}
 };
 
-inline String SfxMenuControl::GetTitle() const
+inline OUString SfxMenuControl::GetTitle() const
 {
     return aTitle;
 }
diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx
index f27a38813e8c..bce9158f4475 100644
--- a/sfx2/source/menu/mnuitem.cxx
+++ b/sfx2/source/menu/mnuitem.cxx
@@ -72,7 +72,7 @@ using namespace ::com::sun::star::util;
 void SfxMenuControl::Bind(
     SfxVirtualMenu* pOwn,
     sal_uInt16 nSlotId,
-    const String& rTitle,
+    const OUString& rTitle,
     SfxBindings &rBindings )
 {
     aTitle = rTitle;
@@ -95,7 +95,7 @@ void SfxMenuControl::Bind(
     SfxVirtualMenu* pOwn,
     sal_uInt16 nSlotId,
     SfxVirtualMenu& rMenu,
-    const String& rTitle,
+    const OUString& rTitle,
     SfxBindings &rBindings )
 {
     SetId( nSlotId );
@@ -384,16 +384,16 @@ IMPL_LINK( SfxAppMenuControl_Impl, Activate, Menu *, pActMenu )
     return sal_False;
 }
 
-SfxUnoMenuControl* SfxMenuControl::CreateControl( const String& rCmd,
-        sal_uInt16 nId, Menu& rMenu, const String& sItemText,
+SfxUnoMenuControl* SfxMenuControl::CreateControl( const OUString& rCmd,
+        sal_uInt16 nId, Menu& rMenu, const OUString& sItemText,
         SfxBindings& rBindings, SfxVirtualMenu* pVirt)
 {
     return new SfxUnoMenuControl( rCmd, nId, rMenu, sItemText, rBindings, pVirt);
 }
 
 SfxUnoMenuControl::SfxUnoMenuControl(
-    const String& rCmd, sal_uInt16 nSlotId, Menu& /*rMenu*/,
-    const String& rItemText,
+    const OUString& rCmd, sal_uInt16 nSlotId, Menu& /*rMenu*/,
+    const OUString& rItemText,
     SfxBindings& rBindings, SfxVirtualMenu* pVirt)
     : SfxMenuControl( nSlotId, rBindings )
 {