INTEGRATION: CWS dba09 (1.28.32); FILE MERGED

2004/04/27 06:17:04 fs 1.28.32.3: RESYNC: (1.30-1.32); FILE MERGED
2004/03/24 08:38:51 fs 1.28.32.2: RESYNC: (1.28-1.30); FILE MERGED
2004/03/17 11:51:06 fs 1.28.32.1: #92831# at runtime, don't use 'stardiv.one.form.control.*' service names - translate when writing old (binary) format
This commit is contained in:
Jens-Heiner Rechtien 2004-05-10 11:46:08 +00:00
parent 3785274ea8
commit 3339b90ae6

View file

@ -2,9 +2,9 @@
* *
* $RCSfile: ImageControl.cxx,v $ * $RCSfile: ImageControl.cxx,v $
* *
* $Revision: 1.33 $ * $Revision: 1.34 $
* *
* last change: $Author: rt $ $Date: 2004-05-07 16:07:40 $ * last change: $Author: hr $ $Date: 2004-05-10 12:46:08 $
* *
* The Contents of this file are made available subject to the terms of * The Contents of this file are made available subject to the terms of
* either of the following licenses * either of the following licenses
@ -185,7 +185,7 @@ Sequence<Type> OImageControlModel::_getTypes()
DBG_NAME(OImageControlModel) DBG_NAME(OImageControlModel)
//------------------------------------------------------------------ //------------------------------------------------------------------
OImageControlModel::OImageControlModel(const Reference<XMultiServiceFactory>& _rxFactory) OImageControlModel::OImageControlModel(const Reference<XMultiServiceFactory>& _rxFactory)
:OBoundControlModel( _rxFactory, VCL_CONTROLMODEL_IMAGECONTROL, FRM_CONTROL_IMAGECONTROL, sal_False, sal_False, sal_False ) :OBoundControlModel( _rxFactory, VCL_CONTROLMODEL_IMAGECONTROL, FRM_SUN_CONTROL_IMAGECONTROL, sal_False, sal_False, sal_False )
// use the old control name for compytibility reasons // use the old control name for compytibility reasons
,m_pImageProducer( NULL ) ,m_pImageProducer( NULL )
,m_bReadOnly( sal_False ) ,m_bReadOnly( sal_False )