Tag: cws_src680_oj14 User: oj Date: 2006/07/04 00:43:11 Modified: dba/dbaccess/source/filter/xml/xmlExport.cxx
Log: RESYNC: (1.8-1.9); FILE MERGED File Changes: Directory: /dba/dbaccess/source/filter/xml/ =========================================== File [changed]: xmlExport.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlExport.cxx?r1=1.8.4.1&r2=1.8.4.2 Delta lines: +14 -13 --------------------- --- xmlExport.cxx 20 Mar 2006 07:49:58 -0000 1.8.4.1 +++ xmlExport.cxx 4 Jul 2006 07:43:08 -0000 1.8.4.2 @@ -228,12 +228,12 @@ /** this method is called for every item that has the MID_FLAG_SPECIAL_ITEM_EXPORT flag set */ virtual void handleSpecialItem( - SvXMLAttributeList& rAttrList, - const XMLPropertyState& rProperty, - const SvXMLUnitConverter& rUnitConverter, - const SvXMLNamespaceMap& rNamespaceMap, - const ::std::vector< XMLPropertyState > *pProperties = 0, - sal_uInt32 nIdx = 0 ) const + SvXMLAttributeList& /*rAttrList*/, + const XMLPropertyState& /*rProperty*/, + const SvXMLUnitConverter& /*rUnitConverter*/, + const SvXMLNamespaceMap& /*rNamespaceMap*/, + const ::std::vector< XMLPropertyState > */*pProperties*/ = 0, + sal_uInt32 /*nIdx*/ = 0 ) const { // nothing to do here } @@ -332,6 +332,8 @@ // let the unit converter format is as string sValue = ::rtl::OUString::valueOf(getINT32(pIter->Value)); break; + default: + break; } ::xmloff::token::XMLTokenEnum eToken = XML_TOKEN_INVALID; @@ -791,10 +793,10 @@ if ( aColumnDefault.hasValue() ) { - ::rtl::OUStringBuffer sValue,sType; - SvXMLUnitConverter::convertAny(sValue,sType,aColumnDefault); + ::rtl::OUStringBuffer sColumnDefaultString,sType; + SvXMLUnitConverter::convertAny( sColumnDefaultString, sType, aColumnDefault ); AddAttribute(XML_NAMESPACE_DB, XML_TYPE_NAME,sType.makeStringAndClear()); - AddAttribute(XML_NAMESPACE_DB, XML_DEFAULT_VALUE,sValue.makeStringAndClear()); + AddAttribute(XML_NAMESPACE_DB, XML_DEFAULT_VALUE,sColumnDefaultString.makeStringAndClear()); } if ( pAtt->getLength() ) @@ -907,7 +909,6 @@ ::std::vector< XMLPropertyState >::iterator aItr = aPropStates.begin(); ::std::vector< XMLPropertyState >::iterator aEnd = aPropStates.end(); UniReference < XMLPropertySetMapper > pColumnStyle = GetColumnStylesPropertySetMapper(); - sal_Int32 nCount(0); while ( aItr != aEnd ) { if ( aItr->mnIndex != -1 ) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
