diff options
Diffstat (limited to 'dbaccess/source/filter/xml/xmlColumn.cxx')
| -rw-r--r-- | dbaccess/source/filter/xml/xmlColumn.cxx | 40 |
1 files changed, 7 insertions, 33 deletions
diff --git a/dbaccess/source/filter/xml/xmlColumn.cxx b/dbaccess/source/filter/xml/xmlColumn.cxx index 4c9e20ba3b45..0517e9b13282 100644 --- a/dbaccess/source/filter/xml/xmlColumn.cxx +++ b/dbaccess/source/filter/xml/xmlColumn.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. @@ -27,49 +28,21 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_dbaxml.hxx" -#ifndef DBA_XMLCOLUMN_HXX #include "xmlColumn.hxx" -#endif -#ifndef DBA_XMLFILTER_HXX #include "xmlfilter.hxx" -#endif -#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 -#ifndef _XMLOFF_NMSPMAP_HXX #include <xmloff/nmspmap.hxx> -#endif -#ifndef DBA_XMLENUMS_HXX #include "xmlEnums.hxx" -#endif -#ifndef DBACCESS_SHARED_XMLSTRINGS_HRC #include "xmlstrings.hrc" -#endif -#ifndef _COM_SUN_STAR_SDBCX_XDATADESCRIPTORFACTORY_HPP_ #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBCX_XAPPEND_HPP_ #include <com/sun/star/sdbcx/XAppend.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include <com/sun/star/beans/PropertyValue.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_ #include <com/sun/star/container/XNameContainer.hpp> -#endif #include <com/sun/star/container/XChild.hpp> -#ifndef DBA_XMLSTYLEIMPORT_HXX #include "xmlStyleImport.hxx" -#endif -#ifndef _TOOLS_DEBUG_HXX #include <tools/debug.hxx> -#endif namespace dbaxml { @@ -119,7 +92,7 @@ OXMLColumn::OXMLColumn( ODBFilter& rImport m_sHelpMessage = sValue; break; case XML_TOK_COLUMN_VISIBILITY: - m_bHidden = !sValue.equalsAscii("visible"); + m_bHidden = !sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("visible")); break; case XML_TOK_COLUMN_TYPE_NAME: sType = sValue; @@ -128,10 +101,9 @@ OXMLColumn::OXMLColumn( ODBFilter& rImport case XML_TOK_COLUMN_DEFAULT_VALUE: if ( sValue.getLength() && sType.getLength() ) m_aDefaultValue <<= sValue; - // SvXMLUnitConverter::convertAny(m_aDefaultValue,sType,sValue); break; case XML_TOK_COLUMN_VISIBLE: - m_bHidden = sValue.equalsAscii("false"); + m_bHidden = sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("false")); break; case XML_TOK_DEFAULT_CELL_STYLE_NAME: m_sCellStyleName = sValue; @@ -179,7 +151,7 @@ void OXMLColumn::EndElement() pAutoStyle->FillPropertySet(xProp); } } - } // if ( m_sStyleName.getLength() ) + } if ( m_sCellStyleName.getLength() ) { const SvXMLStylesContext* pAutoStyles = GetOwnImport().GetAutoStyles(); @@ -196,7 +168,7 @@ void OXMLColumn::EndElement() } } - } // if ( xFac.is() && m_sName.getLength() ) + } else if ( m_sCellStyleName.getLength() ) { const SvXMLStylesContext* pAutoStyles = GetOwnImport().GetAutoStyles(); @@ -219,3 +191,5 @@ ODBFilter& OXMLColumn::GetOwnImport() //---------------------------------------------------------------------------- } // namespace dbaxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |