framework/inc/uielement/menubarmanager.hxx | 2 +-
framework/source/uielement/menubarmanager.cxx | 14 +++++++-------
2 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 01b91d1597661cfc32c7b9f57d7837e25bd7d418
Author: Andrea Gelmini <andrea.gelm...@gelma.net>
AuthorDate: Mon Aug 31 15:44:23 2020 +0200
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Tue Sep 1 08:51:34 2020 +0200
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 <serval2...@yahoo.fr>
diff --git a/framework/inc/uielement/menubarmanager.hxx
b/framework/inc/uielement/menubarmanager.hxx
index 60baef602fc7..eb2cb24a85b2 100644
--- a/framework/inc/uielement/menubarmanager.hxx
+++ b/framework/inc/uielement/menubarmanager.hxx
@@ -196,7 +196,7 @@ class MenuBarManager final :
css::uno::Reference< css::ui::XAcceleratorConfiguration >
m_xGlobalAcceleratorManager;
css::uno::Reference< css::uno::XComponentContext >
m_xContext;
css::uno::Reference< css::util::XURLTransformer >
m_xURLTransformer;
- css::uno::Reference< css::container::XIndexAccess >
m_xDeferedItemContainer;
+ css::uno::Reference< css::container::XIndexAccess >
m_xDeferredItemContainer;
OUString
m_sIconTheme;
Timer
m_aAsyncSettingsTimer;
};
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;
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
