fdo#39674: Rename menues to menu

Change-Id: Idc22167d1a0dc518b3f9e96884213140d07b565b
Reviewed-on: https://gerrit.libreoffice.org/2316
Reviewed-by: Thomas Arnhold <thomas@arnhold.org>
Tested-by: Thomas Arnhold <thomas@arnhold.org>

10 files changed, 30 insertions, 30 deletions

diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx
index 6a812908f917..79e48973c277 100644
--- a/embeddedobj/source/general/docholder.cxx
+++ b/embeddedobj/source/general/docholder.cxx
@@ -601,7 +601,7 @@ void DocumentHolder::FindConnectPoints(
 }
 
 //---------------------------------------------------------------------------
-uno::Reference< container::XIndexAccess > DocumentHolder::MergeMenuesForInplace(
+uno::Reference< container::XIndexAccess > DocumentHolder::MergeMenusForInplace(
         const uno::Reference< container::XIndexAccess >& xContMenu,
         const uno::Reference< frame::XDispatchProvider >& xContDisp,
         const ::rtl::OUString& aContModuleName,
@@ -648,7 +648,7 @@ uno::Reference< container::XIndexAccess > DocumentHolder::MergeMenuesForInplace(
 }
 
 //---------------------------------------------------------------------------
-sal_Bool DocumentHolder::MergeMenues_Impl( const uno::Reference< ::com::sun::star::frame::XLayoutManager >& xOwnLM,
+sal_Bool DocumentHolder::MergeMenus_Impl( const uno::Reference< ::com::sun::star::frame::XLayoutManager >& xOwnLM,
                                                const uno::Reference< ::com::sun::star::frame::XLayoutManager >& xContLM,
                                             const uno::Reference< frame::XDispatchProvider >& xContDisp,
                                             const ::rtl::OUString& aContModuleName )
@@ -667,7 +667,7 @@ sal_Bool DocumentHolder::MergeMenues_Impl( const uno::Reference< ::com::sun::sta
         uno::Reference< container::XIndexAccess > xOwnMenu = RetrieveOwnMenu_Impl();
         uno::Reference< frame::XDispatchProvider > xOwnDisp( m_xFrame, uno::UNO_QUERY_THROW );
 
-        uno::Reference< container::XIndexAccess > xMergedMenu = MergeMenuesForInplace( xContMenu, xContDisp, aContModuleName, xOwnMenu, xOwnDisp );
+        uno::Reference< container::XIndexAccess > xMergedMenu = MergeMenusForInplace( xContMenu, xContDisp, aContModuleName, xOwnMenu, xOwnDisp );
         uno::Reference< ::com::sun::star::frame::XMenuBarMergingAcceptor > xMerge( xOwnLM,
                                                                                          uno::UNO_QUERY_THROW );
         bMenuMerged = xMerge->setMergedMenuBar( xMergedMenu );
@@ -709,7 +709,7 @@ sal_Bool DocumentHolder::ShowUI( const uno::Reference< ::com::sun::star::frame::
                 xOwnLM->setDockingAreaAcceptor( xDocAreaAcc );
 
                 // try to merge menus; don't do anything else if it fails
-                if ( MergeMenues_Impl( xOwnLM, xContainerLM, xContainerDP, aContModuleName ) )
+                if ( MergeMenus_Impl( xOwnLM, xContainerLM, xContainerDP, aContModuleName ) )
                 {
                     // make sure that the container LM does not control the size of the containers window anymore
                     // this must be done after merging menus as we won't get the container menu otherwise
diff --git a/embeddedobj/source/inc/docholder.hxx b/embeddedobj/source/inc/docholder.hxx
index a76faae55597..a04dbb64fd6c 100644
--- a/embeddedobj/source/inc/docholder.hxx
+++ b/embeddedobj/source/inc/docholder.hxx
@@ -93,7 +93,7 @@ private:
     void ResizeWindows_Impl( const ::com::sun::star::awt::Rectangle& aHatchRect );
 
     ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > RetrieveOwnMenu_Impl();
-    sal_Bool MergeMenues_Impl(
+    sal_Bool MergeMenus_Impl(
                 const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& xOwnLM,
                    const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XLayoutManager >& xContLM,
                 const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xContDisp,
@@ -106,7 +106,7 @@ public:
         sal_Int32 nConnectPoints[2] )
             throw ( ::com::sun::star::uno::Exception );
 
-    static ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > MergeMenuesForInplace(
+    static ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > MergeMenusForInplace(
         const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& xContMenu,
         const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider >& xContDisp,
         const ::rtl::OUString& aContModuleName,
diff --git a/sc/source/ui/inc/gridwin.hxx b/sc/source/ui/inc/gridwin.hxx
index 965242a326b6..0909f413c9b5 100644
--- a/sc/source/ui/inc/gridwin.hxx
+++ b/sc/source/ui/inc/gridwin.hxx
@@ -320,7 +320,7 @@ public:
     void            UpdateFormulas();
 
     void            LaunchDataSelectMenu( SCCOL nCol, SCROW nRow, bool bDataSelect );
-    void            DoScenarioMenue( const ScRange& rScenRange );
+    void            DoScenarioMenu( const ScRange& rScenRange );
 
     void            LaunchAutoFilterMenu(SCCOL nCol, SCROW nRow);
     void            RefreshAutoFilterButton(const ScAddress& rPos);
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index ec87bd25a1f8..9aebe4bab7fe 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -914,7 +914,7 @@ void ScGridWindow::LaunchDPFieldMenu( SCCOL nCol, SCROW nRow )
     DPLaunchFieldPopupMenu(OutputToScreenPixel(aScrPos), aScrSize, ScAddress(nCol, nRow, nTab), pDPObj);
 }
 
-void ScGridWindow::DoScenarioMenue( const ScRange& rScenRange )
+void ScGridWindow::DoScenarioMenu( const ScRange& rScenRange )
 {
     delete pFilterBox;
     delete pFilterFloat;
@@ -1862,7 +1862,7 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt, MouseEventSta
     ScRange aScenRange;
     if ( rMEvt.IsLeft() && HasScenarioButton( aPos, aScenRange ) )
     {
-        DoScenarioMenue( aScenRange );
+        DoScenarioMenu( aScenRange );
         return;
     }
 
diff --git a/toolkit/inc/toolkit/awt/vclxmenu.hxx b/toolkit/inc/toolkit/awt/vclxmenu.hxx
index 361ba46b72d7..ba8e1764c261 100644
--- a/toolkit/inc/toolkit/awt/vclxmenu.hxx
+++ b/toolkit/inc/toolkit/awt/vclxmenu.hxx
@@ -58,7 +58,7 @@ private:
     ::osl::Mutex            maMutex;
     Menu*                   mpMenu;
     MenuListenerMultiplexer maMenuListeners;
-    PopupMenuRefList        maPopupMenueRefs;
+    PopupMenuRefList        maPopupMenuRefs;
 
 protected:
     ::osl::Mutex&           GetMutex() { return maMutex; }
diff --git a/toolkit/source/awt/vclxmenu.cxx b/toolkit/source/awt/vclxmenu.cxx
index aa7bcc1361e2..fbda6cd1e5ca 100644
--- a/toolkit/source/awt/vclxmenu.cxx
+++ b/toolkit/source/awt/vclxmenu.cxx
@@ -84,8 +84,8 @@ VCLXMenu::VCLXMenu( Menu* pMenu ) : maMenuListeners( *this )
 VCLXMenu::~VCLXMenu()
 {
     DBG_DTOR( VCLXMenu, 0 );
-    for ( size_t n = maPopupMenueRefs.size(); n; ) {
-        delete maPopupMenueRefs[ --n ];
+    for ( size_t n = maPopupMenuRefs.size(); n; ) {
+        delete maPopupMenuRefs[ --n ];
     }
     if ( mpMenu )
     {
@@ -499,7 +499,7 @@ void VCLXMenu::setPopupMenu( sal_Int16 nItemId, const ::com::sun::star::uno::Ref
         // Selbst eine Ref halten!
         ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu > * pNewRef = new ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu > ;
         *pNewRef = rxPopupMenu;
-        maPopupMenueRefs.push_back( pNewRef );
+        maPopupMenuRefs.push_back( pNewRef );
 
         mpMenu->SetPopupMenu( nItemId, (PopupMenu*) pVCLMenu->GetMenu() );
     }
@@ -514,9 +514,9 @@ void VCLXMenu::setPopupMenu( sal_Int16 nItemId, const ::com::sun::star::uno::Ref
     Menu* pMenu = mpMenu ? mpMenu->GetPopupMenu( nItemId ) : NULL;
     if ( pMenu )
     {
-        for ( size_t n = maPopupMenueRefs.size(); n; )
+        for ( size_t n = maPopupMenuRefs.size(); n; )
         {
-            ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu > * pRef = maPopupMenueRefs[ --n ];
+            ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu > * pRef = maPopupMenuRefs[ --n ];
             Menu* pM = ((VCLXMenu*)pRef->get())->GetMenu();
             if ( pM == pMenu )
             {
@@ -524,7 +524,7 @@ void VCLXMenu::setPopupMenu( sal_Int16 nItemId, const ::com::sun::star::uno::Ref
                 break;
             }
         }
-        // it seems the popup menu is not insert into maPopupMenueRefs
+        // it seems the popup menu is not insert into maPopupMenuRefs
         // if the popup men is not created by stardiv.Toolkit.VCLXPopupMenu
         if( !aRef.is() )
         {
diff --git a/vcl/inc/vcl/settings.hxx b/vcl/inc/vcl/settings.hxx
index 9d99ad051c1f..1866bac60af5 100644
--- a/vcl/inc/vcl/settings.hxx
+++ b/vcl/inc/vcl/settings.hxx
@@ -325,7 +325,7 @@ private:
     sal_uLong                           mnLogoDisplayTime;
     sal_uLong                           mnDisplayOptions;
     sal_uLong                           mnToolbarIconSize;
-    sal_uLong                           mnUseFlatMenues;
+    sal_uLong                           mnUseFlatMenus;
     sal_uLong                           mnOptions;
     sal_uInt16                          mnScreenZoom;
     sal_uInt16                          mnScreenFontZoom;
@@ -630,10 +630,10 @@ public:
                                         { CopyData(); mpData->mnUseFlatBorders = bUseFlatBorders; }
     sal_Bool                            GetUseFlatBorders() const
                                         { return (sal_Bool) mpData->mnUseFlatBorders; }
-    void                            SetUseFlatMenues( sal_Bool bUseFlatMenues )
-                                        { CopyData(); mpData->mnUseFlatMenues = bUseFlatMenues; }
-    sal_Bool                            GetUseFlatMenues() const
-                                        { return (sal_Bool) mpData->mnUseFlatMenues; }
+    void                            SetUseFlatMenus( sal_Bool bUseFlatMenus )
+                                        { CopyData(); mpData->mnUseFlatMenus = bUseFlatMenus; }
+    sal_Bool                            GetUseFlatMenus() const
+                                        { return (sal_Bool) mpData->mnUseFlatMenus; }
     void                            SetUseImagesInMenus( sal_Bool bUseImagesInMenus )
                                         { CopyData(); mpData->mnUseImagesInMenus = bUseImagesInMenus; }
     sal_Bool                            GetUseImagesInMenus() const;
diff --git a/vcl/source/app/settings.cxx b/vcl/source/app/settings.cxx
index caedc9d35197..4f41add760e4 100644
--- a/vcl/source/app/settings.cxx
+++ b/vcl/source/app/settings.cxx
@@ -333,7 +333,7 @@ ImplStyleData::ImplStyleData( const ImplStyleData& rData ) :
     mnHighContrast              = rData.mnHighContrast;
     mnUseSystemUIFonts          = rData.mnUseSystemUIFonts;
     mnUseFlatBorders            = rData.mnUseFlatBorders;
-    mnUseFlatMenues             = rData.mnUseFlatMenues;
+    mnUseFlatMenus              = rData.mnUseFlatMenus;
     mnAutoMnemonic              = rData.mnAutoMnemonic;
     mnUseImagesInMenus          = rData.mnUseImagesInMenus;
     mbPreferredUseImagesInMenus = rData.mbPreferredUseImagesInMenus;
@@ -426,7 +426,7 @@ void ImplStyleData::SetStandardStyles()
     mnHighContrast              = 0;
     mnUseSystemUIFonts          = 1;
     mnUseFlatBorders            = 0;
-    mnUseFlatMenues             = 0;
+    mnUseFlatMenus              = 0;
     mbPreferredUseImagesInMenus = sal_True;
     mnSkipDisabledInMenus       = (sal_uInt16)sal_False;
     mbHideDisabledMenuItems     = sal_False;
@@ -879,7 +879,7 @@ sal_Bool StyleSettings::operator ==( const StyleSettings& rSet ) const
          (mpData->mnHighContrast            == rSet.mpData->mnHighContrast)             &&
          (mpData->mnUseSystemUIFonts        == rSet.mpData->mnUseSystemUIFonts)         &&
          (mpData->mnUseFlatBorders          == rSet.mpData->mnUseFlatBorders)           &&
-         (mpData->mnUseFlatMenues           == rSet.mpData->mnUseFlatMenues)            &&
+         (mpData->mnUseFlatMenus            == rSet.mpData->mnUseFlatMenus)             &&
          (mpData->mnSymbolsStyle            == rSet.mpData->mnSymbolsStyle)             &&
          (mpData->mnPreferredSymbolsStyle   == rSet.mpData->mnPreferredSymbolsStyle)    &&
          (mpData->maFaceColor               == rSet.mpData->maFaceColor)                &&
diff --git a/vcl/source/window/decoview.cxx b/vcl/source/window/decoview.cxx
index 5dd18e7cede9..77c0e9c8cb8c 100644
--- a/vcl/source/window/decoview.cxx
+++ b/vcl/source/window/decoview.cxx
@@ -796,7 +796,7 @@ void ImplDrawFrame( OutputDevice *const pDev, Rectangle& rRect,
                         ImplDraw2ColorFrame( pDev, rRect,
                                              rStyleSettings.GetMenuBorderColor(),
                                              rStyleSettings.GetDarkShadowColor() );
-                        if ( !rStyleSettings.GetUseFlatMenues() )
+                        if ( !rStyleSettings.GetUseFlatMenus() )
                         {
                             ImplDraw2ColorFrame( pDev, rRect,
                                                  rStyleSettings.GetLightColor(),
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index 32f43b93f154..7dd816c09832 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -2779,7 +2779,7 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings )
     aStyleSettings.SetMenuBarColor( aStyleSettings.GetMenuColor() );
     aStyleSettings.SetMenuBorderColor( aStyleSettings.GetLightBorderColor() ); // overriden below for flat menus
     aStyleSettings.SetUseFlatBorders( FALSE );
-    aStyleSettings.SetUseFlatMenues( FALSE );
+    aStyleSettings.SetUseFlatMenus( FALSE );
     aStyleSettings.SetMenuTextColor( ImplWinColorToSal( GetSysColor( COLOR_MENUTEXT ) ) );
     aStyleSettings.SetMenuBarTextColor( ImplWinColorToSal( GetSysColor( COLOR_MENUTEXT ) ) );
     aStyleSettings.SetActiveColor( ImplWinColorToSal( GetSysColor( COLOR_ACTIVECAPTION ) ) );
@@ -2789,11 +2789,11 @@ void WinSalFrame::UpdateSettings( AllSettings& rSettings )
     if ( aSalShlData.mbWXP )
     {
         // only xp supports a different menu bar color
-        long bFlatMenues = 0;
-        SystemParametersInfo( SPI_GETFLATMENU, 0, &bFlatMenues, 0);
-        if( bFlatMenues )
+        long bFlatMenus = 0;
+        SystemParametersInfo( SPI_GETFLATMENU, 0, &bFlatMenus, 0);
+        if( bFlatMenus )
         {
-            aStyleSettings.SetUseFlatMenues( TRUE );
+            aStyleSettings.SetUseFlatMenus( TRUE );
             aStyleSettings.SetMenuBarColor( ImplWinColorToSal( GetSysColor( COLOR_MENUBAR ) ) );
             aStyleSettings.SetMenuHighlightColor( ImplWinColorToSal( GetSysColor( COLOR_MENUHILIGHT ) ) );
             aStyleSettings.SetMenuBorderColor( ImplWinColorToSal( GetSysColor( COLOR_3DSHADOW ) ) );