Tag: cws_src680_dba25 User: oj Date: 05/03/04 06:23:51 Modified: /dba/dbaccess/source/filter/xml/ xmlColumn.cxx, xmlColumn.hxx, xmlEnums.hxx, xmlExport.cxx, xmlfilter.cxx
Log: #i44064# export control default 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&r2=1.2.102.1 Delta lines: +18 -2 -------------------- --- xmlColumn.cxx 2 Aug 2004 15:18:40 -0000 1.2 +++ xmlColumn.cxx 4 Mar 2005 14:23:47 -0000 1.2.102.1 @@ -2,9 +2,9 @@ * * $RCSfile: xmlColumn.cxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.2.102.1 $ * - * last change: $Author: hr $ $Date: 2004/08/02 15:18:40 $ + * last change: $Author: oj $ $Date: 2005/03/04 14:23:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -67,6 +67,9 @@ #ifndef _XMLOFF_XMLTOKEN_HXX #include <xmloff/xmltoken.hxx> #endif +#ifndef _XMLOFF_XMLUCONV_HXX +#include <xmloff/xmluconv.hxx> +#endif #ifndef _XMLOFF_XMLNMSPE_HXX #include <xmloff/xmlnmspe.hxx> #endif @@ -142,6 +145,16 @@ case XML_TOK_COLUMN_VISIBILITY: m_bHidden = !sValue.equalsAscii("visible"); 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; + } + break; } } OSL_ENSURE(m_sName.getLength(),"Invalid column name of length: ZERO"); @@ -164,6 +177,9 @@ xProp->setPropertyValue(PROPERTY_HIDDEN,makeAny(m_bHidden)); if ( m_sHelpMessage.getLength() ) xProp->setPropertyValue(PROPERTY_HELPTEXT,makeAny(m_sHelpMessage)); + + if ( m_aDefaultValue.hasValue() ) + xProp->setPropertyValue(PROPERTY_CONTROLDEFAULT,m_aDefaultValue); if ( m_sStyleName.getLength() ) { File [changed]: xmlColumn.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlColumn.hxx?r1=1.2&r2=1.2.102.1 Delta lines: +3 -2 ------------------- --- xmlColumn.hxx 2 Aug 2004 15:18:50 -0000 1.2 +++ xmlColumn.hxx 4 Mar 2005 14:23:47 -0000 1.2.102.1 @@ -2,9 +2,9 @@ * * $RCSfile: xmlColumn.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.2.102.1 $ * - * last change: $Author: hr $ $Date: 2004/08/02 15:18:50 $ + * last change: $Author: oj $ $Date: 2005/03/04 14:23:47 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -78,6 +78,7 @@ ::rtl::OUString m_sName; ::rtl::OUString m_sStyleName; ::rtl::OUString m_sHelpMessage; + ::com::sun::star::uno::Any m_aDefaultValue; sal_Bool m_bHidden; ODBFilter& GetOwnImport(); File [changed]: xmlEnums.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlEnums.hxx?r1=1.3&r2=1.3.88.1 Delta lines: +5 -4 ------------------- --- xmlEnums.hxx 20 Sep 2004 13:35:27 -0000 1.3 +++ xmlEnums.hxx 4 Mar 2005 14:23:48 -0000 1.3.88.1 @@ -2,9 +2,9 @@ * * $RCSfile: xmlEnums.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.3.88.1 $ * - * last change: $Author: rt $ $Date: 2004/09/20 13:35:27 $ + * last change: $Author: oj $ $Date: 2005/03/04 14:23:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -171,7 +171,8 @@ XML_TOK_COLUMN_NAME, XML_TOK_COLUMN_STYLE_NAME, XML_TOK_COLUMN_HELP_MESSAGE, - XML_TOK_COLUMN_VISIBILITY + XML_TOK_COLUMN_VISIBILITY, + XML_TOK_COLUMN_DEFAULT_VALUE }; // ----------------------------------------------------------------------------- } // namespace dbaxml File [changed]: xmlExport.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlExport.cxx?r1=1.4&r2=1.4.44.1 Delta lines: +9 -4 ------------------- --- xmlExport.cxx 5 Jan 2005 12:31:05 -0000 1.4 +++ xmlExport.cxx 4 Mar 2005 14:23:48 -0000 1.4.44.1 @@ -2,9 +2,9 @@ * * $RCSfile: xmlExport.cxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.4.44.1 $ * - * last change: $Author: obo $ $Date: 2005/01/05 12:31:05 $ + * last change: $Author: oj $ $Date: 2005/03/04 14:23:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -788,8 +788,10 @@ ::rtl::OUString sValue; xProp->getPropertyValue(PROPERTY_HELPTEXT) >>= sValue; + Any aColumnDefault; + aColumnDefault = xProp->getPropertyValue(PROPERTY_CONTROLDEFAULT); - if ( bHidden || sValue.getLength() || pAtt->getLength() ) + if ( bHidden || sValue.getLength() || aColumnDefault.hasValue() || pAtt->getLength() ) { AddAttribute(XML_NAMESPACE_DB, XML_NAME,*pIter); if ( bHidden ) @@ -797,6 +799,9 @@ if ( sValue.getLength() ) AddAttribute(XML_NAMESPACE_DB, XML_HELP_MESSAGE,sValue); + + if ( aColumnDefault.hasValue() ) + AddAttribute(XML_NAMESPACE_DB, XML_DEFAULT_VALUE,implConvertAny(aColumnDefault)); 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&r2=1.7.50.1 Delta lines: +4 -3 ------------------- --- xmlfilter.cxx 17 Nov 2004 14:45:28 -0000 1.7 +++ xmlfilter.cxx 4 Mar 2005 14:23:48 -0000 1.7.50.1 @@ -2,9 +2,9 @@ * * $RCSfile: xmlfilter.cxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.7.50.1 $ * - * last change: $Author: obo $ $Date: 2004/11/17 14:45:28 $ + * last change: $Author: oj $ $Date: 2005/03/04 14:23:48 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -721,6 +721,7 @@ { XML_NAMESPACE_DB, XML_STYLE_NAME, XML_TOK_COLUMN_STYLE_NAME }, { 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_TOKEN_MAP_END }; m_pColumnElemTokenMap.reset(new SvXMLTokenMap( aElemTokenMap )); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
