User: hr Date: 05/09/23 05:10:52 Modified: /dba/dbaccess/source/filter/xml/ xmlExport.cxx
Log: INTEGRATION: CWS dba201b (1.6.38); FILE MERGED 2005/09/21 07:29:08 oj 1.6.38.4: RESYNC: (1.6-1.7); FILE MERGED 2005/07/11 13:37:06 fs 1.6.38.3: merging CWS dba201 into CWS dba201b 2005/06/06 06:47:18 oj 1.6.38.2: #i50347# insert unit convert for 10thmm 2005/06/03 09:59:50 oj 1.6.38.1: #i50273# export fo_compat name 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.7&r2=1.8 Delta lines: +19 -9 -------------------- --- xmlExport.cxx 8 Sep 2005 14:06:15 -0000 1.7 +++ xmlExport.cxx 23 Sep 2005 12:10:50 -0000 1.8 @@ -87,6 +87,9 @@ #ifndef _COM_SUN_STAR_SDBCX_XTABLESSUPPLIER_HPP_ #include <com/sun/star/sdbcx/XTablesSupplier.hpp> #endif +#ifndef _COM_SUN_STAR_AWT_TEXTALIGN_HPP_ +#include <com/sun/star/awt/TextAlign.hpp> +#endif #ifndef _XMLOFF_XMLUCONV_HXX #include <xmloff/xmluconv.hxx> #endif @@ -237,6 +240,7 @@ { setExportFlags( EXPORT_OASIS | nExportFlag); GetMM100UnitConverter().setCoreMeasureUnit(MAP_10TH_MM); + GetMM100UnitConverter().setXMLMeasureUnit(MAP_CM); _GetNamespaceMap().Add( GetXMLToken(XML_NP_OFFICE), GetXMLToken((getExportFlags() & EXPORT_CONTENT) != 0 ? XML_N_OOO : XML_N_OFFICE), XML_NAMESPACE_OFFICE ); _GetNamespaceMap().Add( GetXMLToken(XML_NP_OOO), GetXMLToken(XML_N_OOO), XML_NAMESPACE_OOO ); @@ -244,7 +248,7 @@ _GetNamespaceMap().Add( GetXMLToken(XML_NP_DB), GetXMLToken(XML_N_DB), XML_NAMESPACE_DB ); if( (nExportFlag & (EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_FONTDECLS) ) != 0 ) - _GetNamespaceMap().Add( GetXMLToken(XML_NP_FO), GetXMLToken(XML_N_FO), XML_NAMESPACE_FO ); + _GetNamespaceMap().Add( GetXMLToken(XML_NP_FO), GetXMLToken(XML_N_FO_COMPAT), XML_NAMESPACE_FO ); if( (nExportFlag & (EXPORT_META|EXPORT_STYLES|EXPORT_MASTERSTYLES|EXPORT_AUTOSTYLES|EXPORT_CONTENT|EXPORT_SCRIPTS|EXPORT_SETTINGS) ) != 0 ) { @@ -587,15 +591,17 @@ Reference<XPropertySet> xProp(getDataSource()); ::rtl::OUString sValue; xProp->getPropertyValue(PROPERTY_USER) >>= sValue; - if ( sValue.getLength() ) - { + sal_Bool bAddLogin = sal_False; + if ( bAddLogin = sValue.getLength() > 0 ) AddAttribute(XML_NAMESPACE_DB, XML_USER_NAME,sValue); sal_Bool bValue = sal_False; - xProp->getPropertyValue(PROPERTY_ISPASSWORDREQUIRED) >>= bValue; + if ( xProp->getPropertyValue(PROPERTY_ISPASSWORDREQUIRED) >>= bValue ) + { + bAddLogin = sal_True; AddAttribute(XML_NAMESPACE_DB, XML_IS_PASSWORD_REQUIRED,bValue ? XML_TRUE : XML_FALSE); - - SvXMLElementExport aElem(*this,XML_NAMESPACE_DB, XML_LOGIN, sal_True, sal_True); } + if ( bAddLogin ) + SvXMLElementExport aElem(*this,XML_NAMESPACE_DB, XML_LOGIN, sal_True, sal_True); } // ----------------------------------------------------------------------------- void ODBExport::exportCollection(const Reference< XNameAccess >& _xCollection @@ -899,6 +905,10 @@ addDataStyle(nNumberFormat); } break; + case CTF_DB_COLUMN_TEXT_ALIGN: + if ( !aItr->maValue.hasValue() ) + aItr->maValue <<= ::com::sun::star::awt::TextAlign::LEFT; + break; } } ++aItr; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
