summaryrefslogtreecommitdiff
path: root/framework/source/uielement
diff options
context:
space:
mode:
authorAndrea Gelmini <andrea.gelmini@gelma.net>2020-08-31 15:44:23 +0200
committerJulien Nabet <serval2412@yahoo.fr>2020-09-01 08:51:34 +0200
commit01b91d1597661cfc32c7b9f57d7837e25bd7d418 (patch)
tree2e5b9fd073e3b95a5e74f0c7bd9256154d7127b7 /framework/source/uielement
parent139f06fb3bc559f7773ddd8ccf15c133eeac7317 (diff)
Fix typo in code
It passed "make check" on linux Change-Id: I275334508796c38c7eaaf6a99e435b4ed7b56f4b Reviewed-on: https://gerrit.libreoffice.org/c/core/+/101787 Tested-by: Jenkins Reviewed-by: Julien Nabet <serval2412@yahoo.fr>
Diffstat (limited to 'framework/source/uielement')
-rw-r--r--framework/source/uielement/menubarmanager.cxx14
1 files changed, 7 insertions, 7 deletions
diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx
index 6b892148b29f..413f77fe3ed2 100644
--- a/framework/source/uielement/menubarmanager.cxx
+++ b/framework/source/uielement/menubarmanager.cxx
@@ -152,7 +152,7 @@ Any SAL_CALL MenuBarManager::getMenuHandle( const Sequence< sal_Int8 >& /*Proces
MenuBarManager::~MenuBarManager()
{
// stop asynchronous settings timer
- m_xDeferedItemContainer.clear();
+ m_xDeferredItemContainer.clear();
m_aAsyncSettingsTimer.Stop();
SAL_WARN_IF( OWeakObject::m_refCount != 0, "fwk.uielement", "Who wants to delete an object with refcount > 0!" );
@@ -168,7 +168,7 @@ void MenuBarManager::Destroy()
// stop asynchronous settings timer and
// release deferred item container reference
m_aAsyncSettingsTimer.Stop();
- m_xDeferedItemContainer.clear();
+ m_xDeferredItemContainer.clear();
RemoveListener();
m_aMenuItemHandlerVector.clear();
@@ -771,7 +771,7 @@ IMPL_LINK( MenuBarManager, Deactivate, Menu *, pMenu, bool )
if ( pMenu == m_pVCLMenu )
{
m_bActive = false;
- if ( pMenu->IsMenuBar() && m_xDeferedItemContainer.is() )
+ if ( pMenu->IsMenuBar() && m_xDeferredItemContainer.is() )
{
// Start timer to handle settings asynchronous
// Changing the menu inside this handler leads to
@@ -792,10 +792,10 @@ IMPL_LINK_NOARG( MenuBarManager, AsyncSettingsHdl, Timer*, void)
static_cast< ::cppu::OWeakObject* >( this ), UNO_QUERY_THROW );
m_aAsyncSettingsTimer.Stop();
- if ( !m_bActive && m_xDeferedItemContainer.is() )
+ if ( !m_bActive && m_xDeferredItemContainer.is() )
{
- SetItemContainer( m_xDeferedItemContainer );
- m_xDeferedItemContainer.clear();
+ SetItemContainer( m_xDeferredItemContainer );
+ m_xDeferredItemContainer.clear();
}
}
@@ -1536,7 +1536,7 @@ void MenuBarManager::SetItemContainer( const Reference< XIndexAccess >& rItemCon
// Check active state as we cannot change our VCL menu during activation by the user
if ( m_bActive )
{
- m_xDeferedItemContainer = rItemContainer;
+ m_xDeferredItemContainer = rItemContainer;
return;
}