INTEGRATION: CWS qwizards1 (1.60.42); FILE MERGED

2004/02/13 18:15:31 tv 1.60.42.3: RESYNC: (1.61-1.62); FILE MERGED
2004/01/05 12:54:38 tv 1.60.42.2: RESYNC: (1.60-1.61); FILE MERGED
2003/11/07 15:10:16 bc 1.60.42.1: #111603# Roadmap API wrapper for Wizards added
This commit is contained in:
Kurt Zenker 2004-05-19 15:46:21 +00:00
parent ed37aaf3b4
commit 21837fc3f0

View file

@ -2,9 +2,9 @@
*
* $RCSfile: unocontrols.cxx,v $
*
* $Revision: 1.65 $
* $Revision: 1.66 $
*
* last change: $Author: hr $ $Date: 2004-05-10 13:41:58 $
* last change: $Author: kz $ $Date: 2004-05-19 16:46:21 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -77,10 +77,12 @@
#ifndef _COM_SUN_STAR_UTIL_DATE_HPP_
#include <com/sun/star/util/Date.hpp>
#endif
#ifndef TOOLKIT_FORMATTED_CONTROL_HXX
#include <toolkit/controls/formattedcontrol.hxx>
#endif
#ifndef TOOLKIT_ROADMAP_CONTROL_HXX
#include <toolkit/controls/roadmapcontrol.hxx>
#endif
#ifndef _TOOLKIT_HELPER_UNOCONTROLS_HXX_
#include <toolkit/controls/unocontrols.hxx>
#endif
@ -266,6 +268,8 @@ UnoEditControl::UnoEditControl()
{
maComponentInfos.nWidth = 100;
maComponentInfos.nHeight = 12;
mnMaxTextLen = 0;
mbSetMaxTextLenInPeer = FALSE;
}
uno::Any SAL_CALL UnoEditControl::queryAggregation( const uno::Type & rType ) throw(uno::RuntimeException)
@ -1041,6 +1045,7 @@ void UnoImageControlControl::ImplSetPeerProperty( const ::rtl::OUString& rPropNa
UnoControl::ImplSetPeerProperty( rPropName, rVal );
}
sal_Bool SAL_CALL UnoImageControlControl::setModel(const uno::Reference< awt::XControlModel >& _rModel) throw ( uno::RuntimeException )
{
// remove the peer as image consumer from the model