Tag: cws_src680_dba25 User: oj Date: 05/03/09 00:25:31 Modified: /dba/dbaccess/source/filter/xml/ xmlColumn.cxx, xmlEnums.hxx, xmlExport.cxx, xmlfilter.cxx
Log: #i44064# save the type as well File Changes: Directory: /dba/dbaccess/source/filter/xml/ =========================================== File [changed]: xmlColumn.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlColumn.cxx?r1=1.2.102.1&r2=1.2.102.2 Delta lines: +9 -10 -------------------- --- xmlColumn.cxx 4 Mar 2005 14:23:47 -0000 1.2.102.1 +++ xmlColumn.cxx 9 Mar 2005 08:25:27 -0000 1.2.102.2 @@ -2,9 +2,9 @@ * * $RCSfile: xmlColumn.cxx,v $ * - * $Revision: 1.2.102.1 $ + * $Revision: 1.2.102.2 $ * - * last change: $Author: oj $ $Date: 2005/03/04 14:23:47 $ + * last change: $Author: oj $ $Date: 2005/03/09 08:25:27 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -124,6 +124,7 @@ sal_Int16 nLength = (_xAttrList.is()) ? _xAttrList->getLength() : 0; sal_Bool bAutoEnabled = sal_False; + ::rtl::OUString sType; for(sal_Int16 i = 0; i < nLength; ++i) { OUString sLocalName; @@ -145,15 +146,13 @@ case XML_TOK_COLUMN_VISIBILITY: m_bHidden = !sValue.equalsAscii("visible"); break; + case XML_TOK_COLUMN_TYPE_NAME: + sType = sValue; + OSL_ENSURE(sType.getLength(),"No type name set"); + break; case XML_TOK_COLUMN_DEFAULT_VALUE: - if ( sValue.getLength() ) - { - double nValue = 0.0; - if ( rImport.GetMM100UnitConverter().convertDouble(nValue, sValue) ) - m_aDefaultValue <<= nValue; - else - m_aDefaultValue <<= sValue; - } + if ( sValue.getLength() && sType.getLength() ) + SvXMLUnitConverter::convertAny(m_aDefaultValue,sType,sValue); break; } } File [changed]: xmlEnums.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlEnums.hxx?r1=1.3.88.1&r2=1.3.88.2 Delta lines: +4 -3 ------------------- --- xmlEnums.hxx 4 Mar 2005 14:23:48 -0000 1.3.88.1 +++ xmlEnums.hxx 9 Mar 2005 08:25:28 -0000 1.3.88.2 @@ -2,9 +2,9 @@ * * $RCSfile: xmlEnums.hxx,v $ * - * $Revision: 1.3.88.1 $ + * $Revision: 1.3.88.2 $ * - * last change: $Author: oj $ $Date: 2005/03/04 14:23:48 $ + * last change: $Author: oj $ $Date: 2005/03/09 08:25:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -172,7 +172,8 @@ XML_TOK_COLUMN_STYLE_NAME, XML_TOK_COLUMN_HELP_MESSAGE, XML_TOK_COLUMN_VISIBILITY, - XML_TOK_COLUMN_DEFAULT_VALUE + XML_TOK_COLUMN_DEFAULT_VALUE, + XML_TOK_COLUMN_TYPE_NAME }; // ----------------------------------------------------------------------------- } // namespace dbaxml File [changed]: xmlExport.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlExport.cxx?r1=1.4.44.1&r2=1.4.44.2 Delta lines: +8 -3 ------------------- --- xmlExport.cxx 4 Mar 2005 14:23:48 -0000 1.4.44.1 +++ xmlExport.cxx 9 Mar 2005 08:25:28 -0000 1.4.44.2 @@ -2,9 +2,9 @@ * * $RCSfile: xmlExport.cxx,v $ * - * $Revision: 1.4.44.1 $ + * $Revision: 1.4.44.2 $ * - * last change: $Author: oj $ $Date: 2005/03/04 14:23:48 $ + * last change: $Author: oj $ $Date: 2005/03/09 08:25:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -801,7 +801,12 @@ AddAttribute(XML_NAMESPACE_DB, XML_HELP_MESSAGE,sValue); if ( aColumnDefault.hasValue() ) - AddAttribute(XML_NAMESPACE_DB, XML_DEFAULT_VALUE,implConvertAny(aColumnDefault)); + { + ::rtl::OUStringBuffer sValue,sType; + SvXMLUnitConverter::convertAny(sValue,sType,aColumnDefault); + AddAttribute(XML_NAMESPACE_DB, XML_TYPE_NAME,sType.makeStringAndClear()); + AddAttribute(XML_NAMESPACE_DB, XML_DEFAULT_VALUE,sValue.makeStringAndClear()); + } if ( pAtt->getLength() ) AddAttributeList(xAtt); File [changed]: xmlfilter.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlfilter.cxx?r1=1.7.50.1&r2=1.7.50.2 Delta lines: +3 -2 ------------------- --- xmlfilter.cxx 4 Mar 2005 14:23:48 -0000 1.7.50.1 +++ xmlfilter.cxx 9 Mar 2005 08:25:28 -0000 1.7.50.2 @@ -2,9 +2,9 @@ * * $RCSfile: xmlfilter.cxx,v $ * - * $Revision: 1.7.50.1 $ + * $Revision: 1.7.50.2 $ * - * last change: $Author: oj $ $Date: 2005/03/04 14:23:48 $ + * last change: $Author: oj $ $Date: 2005/03/09 08:25:28 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -722,6 +722,7 @@ { XML_NAMESPACE_DB, XML_HELP_MESSAGE, XML_TOK_COLUMN_HELP_MESSAGE }, { XML_NAMESPACE_DB, XML_VISIBILITY, XML_TOK_COLUMN_VISIBILITY }, { XML_NAMESPACE_DB, XML_DEFAULT_VALUE, XML_TOK_COLUMN_DEFAULT_VALUE}, + { XML_NAMESPACE_DB, XML_TYPE_NAME, XML_TOK_COLUMN_TYPE_NAME }, XML_TOKEN_MAP_END }; m_pColumnElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
