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

#102246# Write prop types also when adding a prop not present in the layer before

Browse source
This commit is contained in:
Jörg Barfurth 2002-08-12 15:06:33 +00:00
parent 39dd01b0d7
commit 3783bf0f38
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
configmgr/source/backend/updatedata.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: updatedata.cxx,v $
*
* $Revision: 1.4 $
* $Revision: 1.5 $
*
* last change: $Author: jb $ $Date: 2002-07-11 16:58:31 $
* last change: $Author: jb $ $Date: 2002-08-12 16:06:31 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -333,6 +333,16 @@ bool PropertyUpdate::setValueFor(OUString const & _aLocale, uno::Any const & _aV
OSL_ENSURE(m_aValues.find(_aLocale) == m_aValues.end(),
"PropertyUpdate: Locale being added already has a value in this property.");
if (_aValueUpdate.hasValue())
{
if (m_aType == uno::Type())
m_aType = _aValueUpdate.getValueType();
else
OSL_ENSURE( m_aType == _aValueUpdate.getValueType() ||
m_aType.getTypeClass() == uno::TypeClass_ANY,
"ValueType mismatch in PropertyUpdate");
}
return m_aValues.insert( ValueList::value_type(_aLocale,_aValueUpdate) ).second;
}
// -----------------------------------------------------------------------------

6
configmgr/source/xml/layerwriter.cxx
View file

@ -2,9 +2,9 @@
*
* $RCSfile: layerwriter.cxx,v $
*
* $Revision: 1.4 $
* $Revision: 1.5 $
*
* last change: $Author: jb $ $Date: 2002-07-11 17:23:01 $
* last change: $Author: jb $ $Date: 2002-08-12 16:06:33 $
*
* The Contents of this file are made available subject to the terms of
* either of the following licenses
@ -258,7 +258,7 @@ void SAL_CALL LayerWriter::overrideProperty( const OUString& aName, sal_Int16 aA
m_aFormatter.prepareElement(aInfo);
this->startProp(aType, false);
this->startProp(aType, aType.getTypeClass() != uno::TypeClass_VOID);
}
// -----------------------------------------------------------------------------