diff options
author | Ingrid Halama [iha] <Ingrid.Halama@oracle.com> | 2011-02-15 13:28:01 +0100 |
---|---|---|
committer | Ingrid Halama [iha] <Ingrid.Halama@oracle.com> | 2011-02-15 13:28:01 +0100 |
commit | 8f9b8a80c32063ebe3d5d0e034e1d2432e87423e (patch) | |
tree | 5572a7235419cd34d37cdb06d8c3ac5d0209d6d5 /framework/source/uielement/objectmenucontroller.cxx | |
parent | 293b43ae4de478c550c8461de164f7cb8883daab (diff) | |
parent | cd0d6a5a6775f197fdb7e78b54c8133074a7a236 (diff) |
chart52: merge with DEV300_m100
Diffstat (limited to 'framework/source/uielement/objectmenucontroller.cxx')
-rw-r--r-- | framework/source/uielement/objectmenucontroller.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/framework/source/uielement/objectmenucontroller.cxx b/framework/source/uielement/objectmenucontroller.cxx index 80dccb76db05..7a0675ec84b2 100644 --- a/framework/source/uielement/objectmenucontroller.cxx +++ b/framework/source/uielement/objectmenucontroller.cxx @@ -108,7 +108,7 @@ void ObjectMenuController::fillPopupMenu( const Sequence< com::sun::star::embed: if ( pVCLPopupMenu ) { const rtl::OUString aVerbCommand( RTL_CONSTASCII_USTRINGPARAM( ".uno:ObjectMenue?VerbID:short=" )); - for ( USHORT i = 0; i < rVerbCommandSeq.getLength(); i++ ) + for ( sal_uInt16 i = 0; i < rVerbCommandSeq.getLength(); i++ ) { const com::sun::star::embed::VerbDescriptor& rVerb = pVerbCommandArray[i]; if ( rVerb.VerbAttributes & com::sun::star::embed::VerbAttributes::MS_VERBATTR_ONCONTAINERMENU ) |