diff options
| author | Thomas Arnhold <thomas@arnhold.org> | 2013-02-21 12:32:16 +0100 |
|---|---|---|
| committer | Thomas Arnhold <thomas@arnhold.org> | 2013-02-22 11:55:29 +0000 |
| commit | 5c89214a80f0284eafaf4eba23243dfe3c9f7193 (patch) | |
| tree | f7ec4dfd817ff589e8cebf5e92dcdee902a10996 /toolkit | |
| parent | def619581f3a833c4c476548c6d17a76d204dd28 (diff) | |
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>
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/inc/toolkit/awt/vclxmenu.hxx | 2 | ||||
| -rw-r--r-- | toolkit/source/awt/vclxmenu.cxx | 12 |
2 files changed, 7 insertions, 7 deletions
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() ) { |