[Libreoffice-commits] .: dbaccess/source embeddedobj/source framework/source svx/source sw/source vcl/inc vcl/source vcl/win
Tor Lillqvist
tml at kemper.freedesktop.org
Wed Dec 7 01:51:25 PST 2011
dbaccess/source/ui/inc/dbu_resource.hrc | 2 +-
embeddedobj/source/general/docholder.cxx | 4 ++--
framework/source/uielement/langselectionmenucontroller.cxx | 2 +-
svx/source/mnuctrls/SmartTagCtl.cxx | 2 +-
sw/source/ui/smartmenu/stmenu.cxx | 2 +-
vcl/inc/svdata.hxx | 2 +-
vcl/inc/vcl/menu.hxx | 4 ++--
vcl/source/window/decoview.cxx | 2 +-
vcl/source/window/floatwin.cxx | 2 +-
vcl/source/window/menu.cxx | 4 ++--
vcl/source/window/window.cxx | 8 ++++----
vcl/source/window/winproc.cxx | 2 +-
vcl/win/source/window/salframe.cxx | 8 ++++----
vcl/win/source/window/salmenu.cxx | 8 ++++----
14 files changed, 26 insertions(+), 26 deletions(-)
New commits:
commit 181b1815f807635ecdd8e5f8bbd2c5798f8d7703
Author: Michael T. Whiteley <mike at whiteley.org>
Date: Tue Dec 6 23:04:19 2011 -0800
Change "menues" to "menus"
diff --git a/dbaccess/source/ui/inc/dbu_resource.hrc b/dbaccess/source/ui/inc/dbu_resource.hrc
index 7ba85bc..e2cb7fc 100644
--- a/dbaccess/source/ui/inc/dbu_resource.hrc
+++ b/dbaccess/source/ui/inc/dbu_resource.hrc
@@ -286,7 +286,7 @@
// free
//========================================================================
-// menues
+// menus
#define MENU_TABLETREE_POPUP RID_MENU_START + 0
#define MENU_DATASOURCELIST_POPUP RID_MENU_START + 1
diff --git a/embeddedobj/source/general/docholder.cxx b/embeddedobj/source/general/docholder.cxx
index 5e24643..036c2d6 100644
--- a/embeddedobj/source/general/docholder.cxx
+++ b/embeddedobj/source/general/docholder.cxx
@@ -747,11 +747,11 @@ sal_Bool DocumentHolder::ShowUI( const uno::Reference< ::com::sun::star::frame::
// as long as the LM is invisible and locked an empty tool space will be used on resizing
xOwnLM->setDockingAreaAcceptor( xDocAreaAcc );
- // try to merge menues; don't do anything else if it fails
+ // try to merge menus; don't do anything else if it fails
if ( MergeMenues_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 menues as we won't get the container menu otherwise
+ // this must be done after merging menus as we won't get the container menu otherwise
xContainerLM->setDockingAreaAcceptor( uno::Reference < ui::XDockingAreaAcceptor >() );
// prevent further changes at this LM
diff --git a/framework/source/uielement/langselectionmenucontroller.cxx b/framework/source/uielement/langselectionmenucontroller.cxx
index 4b04b5c..b5f1566 100644
--- a/framework/source/uielement/langselectionmenucontroller.cxx
+++ b/framework/source/uielement/langselectionmenucontroller.cxx
@@ -260,7 +260,7 @@ void LanguageSelectionMenuController::fillPopupMenu( Reference< css::awt::XPopup
m_nScriptType, m_aCurLang, m_aKeyboardLang, m_aGuessedTextLang );
// now add menu entries
- // the different menues purpose will be handled by the different string
+ // the different menus purpose will be handled by the different string
// for aCmd_Dialog and aCmd_Language
sal_Int16 nItemId = 1; // in this control the item id is not important for executing the command
diff --git a/svx/source/mnuctrls/SmartTagCtl.cxx b/svx/source/mnuctrls/SmartTagCtl.cxx
index 8d83ae3..ffe8ad3 100644
--- a/svx/source/mnuctrls/SmartTagCtl.cxx
+++ b/svx/source/mnuctrls/SmartTagCtl.cxx
@@ -103,7 +103,7 @@ void SvxSmartTagsControl::FillMenu()
const rtl::OUString aSmartTagType = xAction->getSmartTagName( nSmartTagIndex );
const rtl::OUString aSmartTagCaption = xAction->getSmartTagCaption( nSmartTagIndex, rLocale );
- // no sub-menues if there's only one smart tag type listed:
+ // no sub-menus if there's only one smart tag type listed:
PopupMenu* pSbMenu = mpMenu;
if ( 1 < rActionComponentsSequence.getLength() )
{
diff --git a/sw/source/ui/smartmenu/stmenu.cxx b/sw/source/ui/smartmenu/stmenu.cxx
index 144dcae..201ec88 100644
--- a/sw/source/ui/smartmenu/stmenu.cxx
+++ b/sw/source/ui/smartmenu/stmenu.cxx
@@ -95,7 +95,7 @@ SwSmartTagPopup::SwSmartTagPopup( SwView* pSwView,
const rtl::OUString aSmartTagType = xAction->getSmartTagName( nSmartTagIndex );
const rtl::OUString aSmartTagCaption = xAction->getSmartTagCaption( nSmartTagIndex, aLocale );
- // no sub-menues if there's only one smart tag type listed:
+ // no sub-menus if there's only one smart tag type listed:
PopupMenu* pSbMenu = this;
if ( 1 < aActionComponentsSequence.getLength() )
{
diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx
index 82a5aae..b6a31b0 100644
--- a/vcl/inc/svdata.hxx
+++ b/vcl/inc/svdata.hxx
@@ -241,7 +241,7 @@ struct ImplSVWinData
sal_uInt16 mnTrackFlags; // tracking flags
sal_uInt16 mnAutoScrollFlags; // auto scroll flags
sal_Bool mbNoDeactivate; // sal_True: keine Deactivate durchfuehren
- sal_Bool mbNoSaveFocus; // sal_True: menues must not save/restore focus
+ sal_Bool mbNoSaveFocus; // sal_True: menus must not save/restore focus
sal_Bool mbNoSaveBackground; // sal_True: save background is unnecessary or even less performant
};
diff --git a/vcl/inc/vcl/menu.hxx b/vcl/inc/vcl/menu.hxx
index 4137794..209aef6 100644
--- a/vcl/inc/vcl/menu.hxx
+++ b/vcl/inc/vcl/menu.hxx
@@ -152,7 +152,7 @@ private:
XubString aTitleText; // PopupMenu-Text
sal_uLong nEventId;
- sal_uInt16 mnHighlightedItemPos; // for native menues: keeps track of the highlighted item
+ sal_uInt16 mnHighlightedItemPos; // for native menus: keeps track of the highlighted item
sal_uInt16 nMenuFlags;
sal_uInt16 nDefaultItem; // Id vom Default-Item
sal_uInt16 nSelectedId;
@@ -339,7 +339,7 @@ public:
// Fuer Menu-'Funktionen'
MenuItemList* GetItemList() const { return pItemList; }
- // returns the system's menu handle if native menues are supported
+ // returns the system's menu handle if native menus are supported
// pData must point to a SystemMenuData structure
sal_Bool GetSystemMenuData( SystemMenuData* pData ) const;
diff --git a/vcl/source/window/decoview.cxx b/vcl/source/window/decoview.cxx
index c249a86..a1511ab 100644
--- a/vcl/source/window/decoview.cxx
+++ b/vcl/source/window/decoview.cxx
@@ -945,7 +945,7 @@ static void ImplDrawFrame( OutputDevice* pDev, Rectangle& rRect,
}
else
{
- // flat menues have no shadow border
+ // flat menus have no shadow border
if( !bMenuStyle || !rStyleSettings.GetUseFlatMenues() )
ImplDraw2ColorFrame( pDev, rRect,
rStyleSettings.GetLightColor(),
diff --git a/vcl/source/window/floatwin.cxx b/vcl/source/window/floatwin.cxx
index 6d1d0bd..894021e 100644
--- a/vcl/source/window/floatwin.cxx
+++ b/vcl/source/window/floatwin.cxx
@@ -732,7 +732,7 @@ void FloatingWindow::StartPopupMode( const Rectangle& rRect, sal_uLong nFlags )
pSVData->maWinData.mpFirstFloat = this;
if( nFlags & FLOATWIN_POPUPMODE_GRABFOCUS )
{
- // force key input even without focus (useful for menues)
+ // force key input even without focus (useful for menus)
mbGrabFocus = sal_True;
}
Show( sal_True, SHOW_NOACTIVATE );
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 11a8959..e143dfe 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -3695,7 +3695,7 @@ sal_uInt16 PopupMenu::ImplExecute( Window* pW, const Rectangle& rRect, sal_uLong
nMenuFlags &= ~MENU_FLAG_HIDEDISABLEDENTRIES;
}
else
- // #102790# context menues shall never show disabled entries
+ // #102790# context menus shall never show disabled entries
nMenuFlags |= MENU_FLAG_HIDEDISABLEDENTRIES;
@@ -4441,7 +4441,7 @@ void MenuFloatingWindow::MouseButtonDown( const MouseEvent& rMEvt )
{
// TH creates a ToTop on this window, but the active popup
// should stay on top...
- // due to focus change this would close all menues -> don't do it (#94123)
+ // due to focus change this would close all menus -> don't do it (#94123)
//if ( pActivePopup && pActivePopup->ImplGetWindow() && !pActivePopup->ImplGetFloatingWindow()->pActivePopup )
// pActivePopup->ImplGetFloatingWindow()->ToTop( TOTOP_NOGRABFOCUS );
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 1b4889a..2bdf5f4 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -6421,7 +6421,7 @@ void Window::Show( sal_Bool bVisible, sal_uInt16 nFlags )
// #107575#, if a floating windows is shown that grabs the focus, we have to notify the toolkit about it
// ImplGrabFocus() is not called in this case
// Because this might lead to problems the task will be shifted to 6.y
- // Note: top-level context menues are registered at the access bridge after being shown,
+ // Note: top-level context menus are registered at the access bridge after being shown,
// so this will probably not help here....
/*
if( mpWindowImpl->mbFloatWin && ((FloatingWindow*) this )->GrabsFocus() )
@@ -8499,7 +8499,7 @@ sal_Bool Window::ImplIsAccessibleCandidate() const
if( !mpWindowImpl->mbBorderWin )
return sal_True;
else
- // #101741 do not check for WB_CLOSEABLE because undecorated floaters (like menues!) are closeable
+ // #101741 do not check for WB_CLOSEABLE because undecorated floaters (like menus!) are closeable
if( mpWindowImpl->mbFrame && mpWindowImpl->mnStyle & (WB_MOVEABLE | WB_SIZEABLE) )
return sal_True;
else
@@ -8509,7 +8509,7 @@ sal_Bool Window::ImplIsAccessibleCandidate() const
sal_Bool Window::ImplIsAccessibleNativeFrame() const
{
if( mpWindowImpl->mbFrame )
- // #101741 do not check for WB_CLOSEABLE because undecorated floaters (like menues!) are closeable
+ // #101741 do not check for WB_CLOSEABLE because undecorated floaters (like menus!) are closeable
if( (mpWindowImpl->mnStyle & (WB_MOVEABLE | WB_SIZEABLE)) )
return sal_True;
else
@@ -8822,7 +8822,7 @@ sal_uInt16 Window::GetAccessibleRole() const
else if( IsScrollable() )
nRole = accessibility::AccessibleRole::SCROLL_PANE;
else if( ((Window*)this)->ImplGetWindow()->IsMenuFloatingWindow() )
- nRole = accessibility::AccessibleRole::WINDOW; // #106002#, contextmenues are windows (i.e. toplevel)
+ nRole = accessibility::AccessibleRole::WINDOW; // #106002#, contextmenus are windows (i.e. toplevel)
else
// #104051# WINDOW seems to be a bad default role, use LAYEREDPANE instead
// a WINDOW is interpreted as a top-level window, which is typically not the case
diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx
index 2428c0d..f6765ff 100644
--- a/vcl/source/window/winproc.cxx
+++ b/vcl/source/window/winproc.cxx
@@ -1658,7 +1658,7 @@ void ImplHandleResize( Window* pWindow, long nNewWidth, long nNewHeight )
if( bStartTimer )
pWindow->ImplGetWindowImpl()->mpFrameData->maResizeTimer.Start();
else
- pWindow->ImplCallResize(); // otherwise menues cannot be positioned
+ pWindow->ImplCallResize(); // otherwise menus cannot be positioned
}
else
pWindow->ImplGetWindowImpl()->mbCallResize = sal_True;
diff --git a/vcl/win/source/window/salframe.cxx b/vcl/win/source/window/salframe.cxx
index a306ac0..977cf1b 100644
--- a/vcl/win/source/window/salframe.cxx
+++ b/vcl/win/source/window/salframe.cxx
@@ -1205,12 +1205,12 @@ static void ImplSalShow( HWND hWnd, sal_Bool bVisible, sal_Bool bNoActivate )
HDC dc = GetDC( hWnd );
RECT aRect;
GetClientRect( hWnd, &aRect );
- FillRect( dc, &aRect, (HBRUSH) (COLOR_MENU+1) ); // choose the menucolor, because its mostly noticeable for menues
+ FillRect( dc, &aRect, (HBRUSH) (COLOR_MENU+1) ); // choose the menucolor, because its mostly noticeable for menus
ReleaseDC( hWnd, dc );
}
// #i4715, matrox centerpopup might have changed our position
- // reposition popups without caption (menues, dropdowns, tooltips)
+ // reposition popups without caption (menus, dropdowns, tooltips)
GetWindowRect( hWnd, &aRectPostMatrox );
if( (GetWindowStyle( hWnd ) & WS_POPUP) &&
!pFrame->mbCaption &&
@@ -4941,8 +4941,8 @@ static int ImplHandleMenuActivate( HWND hWnd, WPARAM wParam, LPARAM )
// WORD nPos = LOWORD (lParam);
// sal_Bool bWindowMenu = (sal_Bool) HIWORD(lParam);
- // Send activate and deactivate together, so we have not keep track of opened menues
- // this will be enough to have the menues updated correctly
+ // Send activate and deactivate together, so we have not keep track of opened menus
+ // this will be enough to have the menus updated correctly
SalMenuEvent aMenuEvt;
WinSalMenuItem *pSalMenuItem = ImplGetSalMenuItem( hMenu, 0 );
if( pSalMenuItem )
diff --git a/vcl/win/source/window/salmenu.cxx b/vcl/win/source/window/salmenu.cxx
index d0623cd..e3f4345 100644
--- a/vcl/win/source/window/salmenu.cxx
+++ b/vcl/win/source/window/salmenu.cxx
@@ -41,7 +41,7 @@
#include <impbmp.hxx>
#include <salgdi.hxx>
-// uncomment the following line to have ownerdrawn menues, ie, with bitmaps
+// uncomment the following line to have ownerdrawn menus, ie, with bitmaps
// however, this is incompatible with OLE inplace editing
// so it is not activated by default
//#define OWNERDRAW
@@ -174,12 +174,12 @@ WinSalMenu::~WinSalMenu()
sal_Bool WinSalMenu::VisibleMenuBar()
{
// The Win32 implementation never shows a native
- // menubar. Thus, native menues are only visible
+ // menubar. Thus, native menus are only visible
// when the menu is merged with an OLE container.
// The reason are missing tooltips, ownerdraw
// issues and accessibility which are better supported
- // by VCL menues.
- // Nevertheless, the native menues are always created
+ // by VCL menus.
+ // Nevertheless, the native menus are always created
// and the application will properly react to all native
// menu messages.
More information about the Libreoffice-commits
mailing list