diff options
Diffstat (limited to 'framework/source/uielement/menubarwrapper.cxx')
| -rwxr-xr-x[-rw-r--r--] | framework/source/uielement/menubarwrapper.cxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/framework/source/uielement/menubarwrapper.cxx b/framework/source/uielement/menubarwrapper.cxx index 2b771ac5d50d..d1aff13ee32d 100644..100755 --- a/framework/source/uielement/menubarwrapper.cxx +++ b/framework/source/uielement/menubarwrapper.cxx @@ -34,7 +34,7 @@ //_________________________________________________________________________________________________________________ #include <uielement/menubarwrapper.hxx> #include <threadhelp/resetableguard.hxx> -#include <helper/actiontriggerhelper.hxx> +#include <framework/actiontriggerhelper.hxx> #include <services.h> //_________________________________________________________________________________________________________________ @@ -182,7 +182,7 @@ void SAL_CALL MenuBarWrapper::initialize( const Sequence< Any >& aArguments ) th if ( m_xConfigData.is() ) { // Fill menubar with container contents - USHORT nId = 1; + sal_uInt16 nId = 1; MenuBarManager::FillMenuWithConfiguration( nId, pVCLMenuBar, aModuleIdentifier, m_xConfigData, xTrans ); } } |