strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS docking1 (1.4.4); FILE MERGED

Browse source 
2004/06/20 20:09:34 cd 1.4.4.1: #i30169# Support new interface in queryInterface
This commit is contained in:
Oliver Bolte 2004-07-06 11:02:05 +00:00
parent 70ad21b1d2
commit 670347f58e
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
toolkit/source/awt/vclxmenu.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: vclxmenu.cxx,v $
*
* $Revision: 1.4 $
* $Revision: 1.5 $
*
* last change: $Author: kz $ $Date: 2004-02-25 17:57:46 $
* last change: $Author: obo $ $Date: 2004-07-06 12:02:05 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -201,6 +201,7 @@ IMPL_LINK( VCLXMenu, MenuEventListener, VclSimpleEvent*, pEvent )
SAL_STATIC_CAST( ::com::sun::star::awt::XMenu*, (::com::sun::star::awt::XMenuBar*) this ),
SAL_STATIC_CAST( ::com::sun::star::awt::XMenuBar*, this ),
SAL_STATIC_CAST( ::com::sun::star::awt::XPopupMenu*, this ),
SAL_STATIC_CAST( ::com::sun::star::awt::XMenuExtended*, this ),
SAL_STATIC_CAST( ::com::sun::star::lang::XTypeProvider*, this ),
SAL_STATIC_CAST( ::com::sun::star::lang::XUnoTunnel*, this ) );
return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ));
@ -213,7 +214,8 @@ IMPL_XUNOTUNNEL( VCLXMenu )
IMPL_XTYPEPROVIDER_START( VCLXMenu )
getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMenu>* ) NULL ),
getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMenuBar>* ) NULL ),
getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu>* ) NULL )
getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPopupMenu>* ) NULL ),
getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XMenuExtended>* ) NULL )
IMPL_XTYPEPROVIDER_END
@ -345,7 +347,6 @@ void VCLXMenu::setPopupMenu( sal_Int16 nItemId, const ::com::sun::star::uno::Ref
return aRef;
}
// ::com::sun::star::awt::XPopupMenu
void VCLXMenu::insertSeparator( sal_Int16 nPos ) throw(::com::sun::star::uno::RuntimeException)
{