diff options
Diffstat (limited to 'framework/source/uielement/headermenucontroller.cxx')
| -rw-r--r-- | framework/source/uielement/headermenucontroller.cxx | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/framework/source/uielement/headermenucontroller.cxx b/framework/source/uielement/headermenucontroller.cxx index f10507f734..2ef71b8cfe 100644 --- a/framework/source/uielement/headermenucontroller.cxx +++ b/framework/source/uielement/headermenucontroller.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -35,9 +36,7 @@ #include <threadhelp/resetableguard.hxx> #include "services.h" -#ifndef __FRAMEWORK_CLASSES_RESOURCE_HRC_ #include <classes/resource.hrc> -#endif #include <classes/fwlresid.hxx> //_________________________________________________________________________________________________________________ @@ -55,14 +54,11 @@ // includes of other projects //_________________________________________________________________________________________________________________ -#ifndef _VCL_MENU_HXX_ #include <vcl/menu.hxx> -#endif #include <vcl/svapp.hxx> #include <vcl/i18nhelp.hxx> #include <tools/urlobj.hxx> #include <rtl/ustrbuf.hxx> -//#include <tools/solar.hrc> #include <dispatch/uieventloghelper.hxx> #include <vos/mutex.hxx> @@ -112,7 +108,7 @@ void HeaderMenuController::fillPopupMenu( const Reference< ::com::sun::star::fra VCLXPopupMenu* pPopupMenu = (VCLXPopupMenu *)VCLXMenu::GetImplementation( rPopupMenu ); PopupMenu* pVCLPopupMenu = 0; - vos::OGuard aSolarMutexGuard( Application::GetSolarMutex() ); + SolarMutexGuard aSolarMutexGuard; resetPopupMenu( rPopupMenu ); if ( pPopupMenu ) @@ -274,3 +270,5 @@ void SAL_CALL HeaderMenuController::updatePopupMenu() throw (::com::sun::star::u } } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |