diff options
Diffstat (limited to 'dbaccess/source/filter/xml/xmlExport.cxx')
| -rw-r--r-- | dbaccess/source/filter/xml/xmlExport.cxx | 77 |
1 files changed, 38 insertions, 39 deletions
diff --git a/dbaccess/source/filter/xml/xmlExport.cxx b/dbaccess/source/filter/xml/xmlExport.cxx index a3153c610244..7e8457d34c6e 100644 --- a/dbaccess/source/filter/xml/xmlExport.cxx +++ b/dbaccess/source/filter/xml/xmlExport.cxx @@ -1,3 +1,4 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. @@ -59,6 +60,7 @@ #include <tools/diagnose_ex.h> #include <connectivity/DriversConfig.hxx> #include <connectivity/dbtools.hxx> +#include <sal/macros.h> #include <boost/optional.hpp> @@ -116,13 +118,13 @@ namespace dbaxml //--------------------------------------------------------------------- ::rtl::OUString SAL_CALL ODBExportHelper::getImplementationName_Static( ) throw (RuntimeException) { - return ::rtl::OUString::createFromAscii("com.sun.star.comp.sdb.XMLSettingsExporter"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.sdb.XMLSettingsExporter")); } //--------------------------------------------------------------------- Sequence< ::rtl::OUString > SAL_CALL ODBExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException) { Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.document.ExportFilter"); + aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExportFilter")); return aSupported; } @@ -135,13 +137,13 @@ namespace dbaxml //--------------------------------------------------------------------- ::rtl::OUString SAL_CALL ODBFullExportHelper::getImplementationName_Static( ) throw (RuntimeException) { - return ::rtl::OUString::createFromAscii("com.sun.star.comp.sdb.XMLFullExporter"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.sdb.XMLFullExporter")); } //--------------------------------------------------------------------- Sequence< ::rtl::OUString > SAL_CALL ODBFullExportHelper::getSupportedServiceNames_Static( ) throw(RuntimeException) { Sequence< ::rtl::OUString > aSupported(1); - aSupported[0] = ::rtl::OUString::createFromAscii("com.sun.star.document.ExportFilter"); + aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExportFilter")); return aSupported; } @@ -177,7 +179,7 @@ namespace dbaxml return s_sTypeInteger; default: - OSL_ENSURE( false, "lcl_implGetPropertyXMLType: unsupported value type!" ); + OSL_FAIL( "lcl_implGetPropertyXMLType: unsupported value type!" ); return s_sTypeDouble; } } @@ -239,36 +241,32 @@ ODBExport::ODBExport(const Reference< XMultiServiceFactory >& _rxMSF,sal_uInt16 m_xExportHelper = new SvXMLExportPropertyMapper(GetTableStylesPropertySetMapper()); m_xColumnExportHelper = new OSpecialHanldeXMLExportPropertyMapper(GetColumnStylesPropertySetMapper()); - //UniReference < XMLPropertySetMapper > xCellStylesPropertySetMapper = new XMLPropertySetMapper(OXMLHelper::GetCellStylesPropertySetMapper(),m_xPropHdlFactory); - //m_xCellExportHelper = new OSpecialHanldeXMLExportPropertyMapper(xCellStylesPropertySetMapper); - //m_xCellExportHelper = new OSpecialHanldeXMLExportPropertyMapper(GetCellStylesPropertySetMapper()); - //m_xCellExportHelper->ChainExportMapper(XMLTextParagraphExport::CreateParaExtPropMapper(*this)); m_xCellExportHelper = new OSpecialHanldeXMLExportPropertyMapper(GetCellStylesPropertySetMapper()); m_xRowExportHelper = new OSpecialHanldeXMLExportPropertyMapper(OXMLHelper::GetRowStylesPropertySetMapper()); GetAutoStylePool()->AddFamily( XML_STYLE_FAMILY_TABLE_TABLE, - rtl::OUString::createFromAscii( XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME )), m_xExportHelper.get(), - rtl::OUString::createFromAscii( XML_STYLE_FAMILY_TABLE_TABLE_STYLES_PREFIX )); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_TABLE_STYLES_PREFIX ))); GetAutoStylePool()->AddFamily( XML_STYLE_FAMILY_TABLE_COLUMN, - rtl::OUString::createFromAscii( XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME )), m_xColumnExportHelper.get(), - rtl::OUString::createFromAscii( XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_PREFIX )); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_PREFIX ))); GetAutoStylePool()->AddFamily( XML_STYLE_FAMILY_TABLE_CELL, - rtl::OUString::createFromAscii( XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME )), m_xCellExportHelper.get(), - rtl::OUString::createFromAscii( XML_STYLE_FAMILY_TABLE_CELL_STYLES_PREFIX )); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_CELL_STYLES_PREFIX ))); GetAutoStylePool()->AddFamily( XML_STYLE_FAMILY_TABLE_ROW, - rtl::OUString::createFromAscii( XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME ), + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME )), m_xRowExportHelper.get(), - rtl::OUString::createFromAscii( XML_STYLE_FAMILY_TABLE_ROW_STYLES_PREFIX )); + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_ROW_STYLES_PREFIX ))); } // ----------------------------------------------------------------------------- IMPLEMENT_SERVICE_INFO1_STATIC( ODBExport, "com.sun.star.comp.sdb.DBExportFilter", "com.sun.star.document.ExportFilter") @@ -370,7 +368,7 @@ void ODBExport::exportDataSource() }; bool bIsXMLDefault = false; - for ( size_t i=0; i < sizeof( aTokens ) / sizeof( aTokens[0] ); ++i ) + for ( size_t i=0; i < SAL_N_ELEMENTS( aTokens ); ++i ) { if ( pProperties->Name == aTokens[i].sPropertyName ) { @@ -406,15 +404,15 @@ void ODBExport::exportDataSource() { sal_Int32 nValue = 0; aValue >>= nValue; - if ( sValue.equalsAscii("0") ) + if ( sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("0")) ) sValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("equal-integer")); - else if ( sValue.equalsAscii("1") ) + else if ( sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("1")) ) sValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("is-boolean")); - else if ( sValue.equalsAscii("2") ) + else if ( sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("2")) ) sValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("equal-boolean")); - else if ( sValue.equalsAscii("3") ) + else if ( sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("3")) ) sValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("equal-use-only-zero")); - if ( sValue.equalsAscii("equal-integer") ) + if ( sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("equal-integer")) ) continue; eToken = XML_BOOLEAN_COMPARISON_MODE; } @@ -504,7 +502,7 @@ void ODBExport::exportApplicationConnectionSettings(const TSettingsMap& _aSettin ,XML_MAX_ROW_COUNT ,XML_SUPPRESS_VERSION_COLUMNS }; - for (size_t i = 0; i< sizeof(pSettings)/sizeof(pSettings[0]); ++i) + for (size_t i = 0; i< SAL_N_ELEMENTS(pSettings); ++i) { TSettingsMap::const_iterator aFind = _aSettings.find(pSettings[i]); if ( aFind != _aSettings.end() ) @@ -537,7 +535,7 @@ void ODBExport::exportDriverSettings(const TSettingsMap& _aSettings) ,XML_IS_FIRST_ROW_HEADER_LINE ,XML_PARAMETER_NAME_SUBSTITUTION }; - for (size_t i = 0; i< sizeof(pSettings)/sizeof(pSettings[0]); ++i) + for (size_t i = 0; i< SAL_N_ELEMENTS(pSettings); ++i) { TSettingsMap::const_iterator aFind = _aSettings.find(pSettings[i]); if ( aFind != _aSettings.end() ) @@ -572,7 +570,7 @@ void ODBExport::exportConnectionData() sURL.append(sal_Unicode('/')); AddAttribute(XML_NAMESPACE_XLINK,XML_HREF,GetRelativeReference(sURL.makeStringAndClear())); - } // if ( sOrigUrl == sFileName ) + } else AddAttribute(XML_NAMESPACE_XLINK,XML_HREF,sOrigUrl); AddAttribute(XML_NAMESPACE_DB,XML_MEDIA_TYPE,m_aTypeCollection.getMediaType(sValue)); @@ -593,7 +591,6 @@ void ODBExport::exportConnectionData() } catch(const Exception&) { - // nii } SvXMLElementExport aFileBasedDB(*this,XML_NAMESPACE_DB, XML_FILE_BASED_DATABASE, sal_True, sal_True); } @@ -640,7 +637,7 @@ void ODBExport::exportConnectionData() }; for ( size_t i=0; - i < sizeof( aProperties ) / sizeof( aProperties[0] ); + i < SAL_N_ELEMENTS( aProperties ); ++i ) { @@ -742,7 +739,7 @@ void ODBExport::exportDataSourceSettings() pSequenceIterator.reset( new OSequenceIterator< Any >( aIter->Value ) ); break; default: - OSL_ENSURE(sal_False, "unsupported sequence type !"); + OSL_FAIL("unsupported sequence type !"); break; } if ( pSequenceIterator.get() ) @@ -1160,7 +1157,7 @@ void ODBExport::exportAutoStyle(XPropertySet* _xProp) }; ::std::vector< XMLPropertyState > aPropertyStates; - for (size_t i = 0 ; i < sizeof(pExportHelper)/sizeof(pExportHelper[0]); ++i) + for (size_t i = 0 ; i < SAL_N_ELEMENTS(pExportHelper); ++i) { aPropertyStates = pExportHelper[i].first->Filter(_xProp); if ( !aPropertyStates.empty() ) @@ -1192,7 +1189,7 @@ void ODBExport::exportAutoStyle(XPropertySet* _xProp) exportCollection(xCollection,XML_TOKEN_INVALID,XML_TOKEN_INVALID,sal_False,aMemFunc); } } - catch(Exception&) + catch(const Exception&) { DBG_UNHANDLED_EXCEPTION(); } @@ -1204,7 +1201,7 @@ void ODBExport::exportAutoStyle(XPropertySet* _xProp) TExportPropMapperPair(m_xColumnExportHelper,TEnumMapperPair(&m_aAutoStyleNames,XML_STYLE_FAMILY_TABLE_COLUMN )) ,TExportPropMapperPair(m_xCellExportHelper,TEnumMapperPair(&m_aCellAutoStyleNames,XML_STYLE_FAMILY_TABLE_CELL)) }; - for (size_t i = 0 ; i < sizeof(pExportHelper)/sizeof(pExportHelper[0]); ++i) + for (size_t i = 0 ; i < SAL_N_ELEMENTS(pExportHelper); ++i) { ::std::vector< XMLPropertyState > aPropStates = pExportHelper[i].first->Filter( _xProp ); if ( !aPropStates.empty() ) @@ -1232,9 +1229,9 @@ void ODBExport::exportAutoStyle(XPropertySet* _xProp) } } ++aItr; - } // while ( aItr != aEnd ) + } - } // if ( !aPropStates.empty() ) + } if ( XML_STYLE_FAMILY_TABLE_CELL == pExportHelper[i].second.second ) ::std::copy( m_aCurrentPropertyStates.begin(), m_aCurrentPropertyStates.end(), ::std::back_inserter( aPropStates )); if ( !aPropStates.empty() ) @@ -1326,9 +1323,9 @@ void ODBExport::GetViewSettings(Sequence<PropertyValue>& aProps) } aProps[nLength].Value <<= aQueries; } - catch(Exception) + catch(const Exception&) { - OSL_ENSURE(0,"ODBExport::GetViewSettings: Exception catched!"); + OSL_FAIL("ODBExport::GetViewSettings: Exception caught!"); } } } @@ -1353,9 +1350,9 @@ void ODBExport::GetConfigurationSettings(Sequence<PropertyValue>& aProps) aProps[nLength].Value = aValue; } } - catch(Exception) + catch(const Exception&) { - OSL_ENSURE(0,"Could not access layout information from the data source!"); + OSL_FAIL("Could not access layout information from the data source!"); } } } @@ -1386,7 +1383,7 @@ void ODBExport::GetConfigurationSettings(Sequence<PropertyValue>& aProps) GetMM100UnitConverter().convertNumber(aBuffer, getINT32(_rValue)); break; default: - OSL_ENSURE(0,"ODBExport::implConvertAny: Invalid type"); + OSL_FAIL("ODBExport::implConvertAny: Invalid type"); } return aBuffer.makeStringAndClear(); @@ -1453,3 +1450,5 @@ void ODBExport::collectComponentStyles() // ----------------------------------------------------------------------------- }// dbaxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |