#i99305#,#i99132# remove DOS lineends, remove solenv/unxmacxp/inc/poll.h

2 files changed, 502 insertions, 502 deletions

diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
index 6e76f28cdc12..56bf635b8749 100644
--- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
+++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.cxx
@@ -1,396 +1,396 @@
-/*************************************************************************

- *

- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

- * 

- * Copyright 2008 by Sun Microsystems, Inc.

- *

- * OpenOffice.org - a multi-platform office productivity suite

- *

- * $RCSfile: xmlExportDocumentHandler.cxx,v $

- * $Revision: 1.5 $

- *

- * This file is part of OpenOffice.org.

- *

- * OpenOffice.org is free software: you can redistribute it and/or modify

- * it under the terms of the GNU Lesser General Public License version 3

- * only, as published by the Free Software Foundation.

- *

- * OpenOffice.org is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU Lesser General Public License version 3 for more details

- * (a copy is included in the LICENSE file that accompanied this code).

- *

- * You should have received a copy of the GNU Lesser General Public License

- * version 3 along with OpenOffice.org.  If not, see

- * <http://www.openoffice.org/license.html>

- * for a copy of the LGPLv3 License.

- *

- ************************************************************************/

-#include "precompiled_reportdesign.hxx"

-

-#include "xmlExportDocumentHandler.hxx"

-#include <com/sun/star/sdb/CommandType.hpp>

-#include <com/sun/star/chart2/data/XDatabaseDataProvider.hpp>

-#include <com/sun/star/reflection/XProxyFactory.hpp>

-#include <com/sun/star/sdb/CommandType.hpp>

-#include <comphelper/sequence.hxx>

-#include <comphelper/sequenceashashmap.hxx>

-#include <comphelper/documentconstants.hxx>

-#include <xmloff/attrlist.hxx>

-#include <xmloff/xmltoken.hxx>

-#include <xmloff/xmlement.hxx>

-#include <xmloff/xmluconv.hxx>

-#include <svtools/saveopt.hxx>

-#include <rtl/ustrbuf.hxx>

-#include <connectivity/dbtools.hxx>

-#include <rtl/ustrbuf.hxx>

-

-namespace rptxml

-{

-using namespace ::com::sun::star;

-using namespace ::xmloff::token;

-

-void lcl_exportPrettyPrinting(const uno::Reference< xml::sax::XDocumentHandler >& _xDelegatee)

-{

-    SvtSaveOptions aSaveOpt;

-    if ( aSaveOpt.IsPrettyPrinting() )

-    {

-        static const ::rtl::OUString s_sWhitespaces(RTL_CONSTASCII_USTRINGPARAM(" "));

-        _xDelegatee->ignorableWhitespace(s_sWhitespaces);

-    }

-}

-

-::rtl::OUString lcl_createAttribute(const xmloff::token::XMLTokenEnum& _eNamespace,const xmloff::token::XMLTokenEnum& _eAttribute)

-{

-    ::rtl::OUStringBuffer sQName;

-    // ...if it's in our map, make the prefix

-    sQName.append ( xmloff::token::GetXMLToken(_eNamespace) );

-    sQName.append ( sal_Unicode(':') );

-    sQName.append ( xmloff::token::GetXMLToken(_eAttribute) );

-    return sQName.makeStringAndClear();

-}

-

-void lcl_correctCellAddress(const ::rtl::OUString & _sName, const uno::Reference< xml::sax::XAttributeList > & xAttribs)

-{

-    SvXMLAttributeList* pList = SvXMLAttributeList::getImplementation(xAttribs);

-    ::rtl::OUString sCellAddress = pList->getValueByName(_sName);

-    const sal_Int32 nPos = sCellAddress.lastIndexOf('$');

-    if ( nPos != -1 )

-    {

-        sCellAddress = sCellAddress.copy(0,nPos);

-        sCellAddress += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("$65535"));

-        pList->RemoveAttribute(_sName);

-        pList->AddAttribute(_sName,sCellAddress);

-    }

-}

-

-ExportDocumentHandler::ExportDocumentHandler(uno::Reference< uno::XComponentContext > const & context) :

-    m_xContext(context)

-    ,m_nCurrentCellIndex(0)

-    ,m_bTableRowsStarted(false)

-    ,m_bFirstRowExported(false)

-    ,m_bExportChar(false)

-{

-}

-// -----------------------------------------------------------------------------

-ExportDocumentHandler::~ExportDocumentHandler()

-{

-    if ( m_xProxy.is() )

-    {

-        m_xProxy->setDelegator( NULL );

-        m_xProxy.clear();

-    }

-}

-IMPLEMENT_GET_IMPLEMENTATION_ID(ExportDocumentHandler)

-IMPLEMENT_FORWARD_REFCOUNT( ExportDocumentHandler, ExportDocumentHandler_BASE )

-//------------------------------------------------------------------------

-::rtl::OUString SAL_CALL ExportDocumentHandler::getImplementationName(  ) throw(uno::RuntimeException)

-{

-    return getImplementationName_Static();

-}

-

-//------------------------------------------------------------------------

-sal_Bool SAL_CALL ExportDocumentHandler::supportsService( const ::rtl::OUString& ServiceName ) throw(uno::RuntimeException)

-{

-    return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_static());

-}

-

-//------------------------------------------------------------------------

-uno::Sequence< ::rtl::OUString > SAL_CALL ExportDocumentHandler::getSupportedServiceNames(  ) throw(uno::RuntimeException)

-{

-    uno::Sequence< ::rtl::OUString > aSupported;

-    if ( m_xServiceInfo.is() )

-        aSupported = m_xServiceInfo->getSupportedServiceNames();

-    return ::comphelper::concatSequences(getSupportedServiceNames_static(),aSupported);

-}

-

-//------------------------------------------------------------------------

-::rtl::OUString ExportDocumentHandler::getImplementationName_Static(  ) throw(uno::RuntimeException)

-{

-    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.ExportDocumentHandler"));

-}

-

-//------------------------------------------------------------------------

-uno::Sequence< ::rtl::OUString > ExportDocumentHandler::getSupportedServiceNames_static(  ) throw(uno::RuntimeException)

-{

-    uno::Sequence< ::rtl::OUString > aSupported(1);

-    aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.ExportDocumentHandler"));

-    return aSupported;

-}

-

-//------------------------------------------------------------------------

-uno::Reference< uno::XInterface > SAL_CALL ExportDocumentHandler::create( const uno::Reference< uno::XComponentContext >& _rxContext )

-{

-    return *(new ExportDocumentHandler( _rxContext ));

-}

-// xml::sax::XDocumentHandler:

-void SAL_CALL ExportDocumentHandler::startDocument() throw (uno::RuntimeException, xml::sax::SAXException)

-{

-    m_xDelegatee->startDocument();

-}

-

-void SAL_CALL ExportDocumentHandler::endDocument() throw (uno::RuntimeException, xml::sax::SAXException)

-{

-    m_xDelegatee->endDocument();

-}

-

-void SAL_CALL ExportDocumentHandler::startElement(const ::rtl::OUString & _sName, const uno::Reference< xml::sax::XAttributeList > & xAttribs) throw (uno::RuntimeException, xml::sax::SAXException)

-{    

-    bool bExport = true;

-    if ( _sName.equalsAscii("office:chart") )

-    {

-        SvXMLAttributeList* pList = new SvXMLAttributeList();

-        uno::Reference< xml::sax::XAttributeList > xNewAttribs = pList;

-        ::rtl::OUStringBuffer sValue;

-        static SvXMLEnumMapEntry aXML_CommnadTypeEnumMap[] =

-        {

-            { XML_TABLE, sdb::CommandType::TABLE },

-            { XML_QUERY, sdb::CommandType::QUERY },

-            // { XML_COMMAND, CommandType::COMMAND }, // default

-            { XML_TOKEN_INVALID, 0 }

-        };

-        if ( SvXMLUnitConverter::convertEnum( sValue, static_cast<sal_uInt16>(m_xDatabaseDataProvider->getCommandType()),aXML_CommnadTypeEnumMap ) )

-        {

-            pList->AddAttribute(lcl_createAttribute(XML_NP_RPT,XML_COMMAND_TYPE),sValue.makeStringAndClear());

-        }

-        const ::rtl::OUString sComamnd = m_xDatabaseDataProvider->getCommand();

-        if ( sComamnd.getLength() )

-            pList->AddAttribute(lcl_createAttribute(XML_NP_RPT,XML_COMMAND),sComamnd);

-

-        const ::rtl::OUString sFilter( m_xDatabaseDataProvider->getFilter() );

-        if ( sFilter.getLength() )

-            pList->AddAttribute(lcl_createAttribute(XML_NP_RPT,XML_FILTER),sFilter);

-

-        const sal_Bool bEscapeProcessing( m_xDatabaseDataProvider->getEscapeProcessing() );

-        if ( !bEscapeProcessing )

-            pList->AddAttribute(lcl_createAttribute(XML_NP_RPT,XML_ESCAPE_PROCESSING),::xmloff::token::GetXMLToken( XML_FALSE ));

-

-        pList->AddAttribute(lcl_createAttribute(XML_NP_OFFICE,XML_MIMETYPE),MIMETYPE_OASIS_OPENDOCUMENT_CHART);

-        

-        m_xDelegatee->startElement(lcl_createAttribute(XML_NP_OFFICE,XML_REPORT),xNewAttribs);

-        bExport = false;

-    }

-    else if ( _sName.equalsAscii("table:table") )

-    {

-        m_xDelegatee->startElement(lcl_createAttribute(XML_NP_RPT,XML_DETAIL),NULL);

-        lcl_exportPrettyPrinting(m_xDelegatee);

-    }

-    else if ( _sName.equalsAscii("table:table-rows") )

-    {

-        m_xDelegatee->startElement(_sName,xAttribs);

-        exportTableRows();

-        bExport = false;

-        m_bTableRowsStarted = true;

-        m_bFirstRowExported = true;

-    }        

-    else if ( m_bTableRowsStarted && m_bFirstRowExported && (_sName.equalsAscii("table:table-row") || _sName.equalsAscii("table:table-cell")) )

-        bExport = false;

-    else if ( _sName.equalsAscii("chart:plot-area"))

-    {

-        SvXMLAttributeList* pList = SvXMLAttributeList::getImplementation(xAttribs);

-        pList->RemoveAttribute(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("table:cell-range-address")));

-    }

-    else if ( _sName.equalsAscii("chart:categories"))

-    {

-        static ::rtl::OUString s_sCellAddress(lcl_createAttribute(XML_NP_TABLE,XML_CELL_RANGE_ADDRESS));

-        lcl_correctCellAddress(s_sCellAddress,xAttribs);

-    }

-    else if ( _sName.equalsAscii("chart:series"))

-    {

-        static ::rtl::OUString s_sCellAddress(lcl_createAttribute(XML_NP_CHART,XML_VALUES_CELL_RANGE_ADDRESS));

-        lcl_correctCellAddress(s_sCellAddress,xAttribs);        

-    }

-    else if ( m_bTableRowsStarted && !m_bFirstRowExported && _sName.equalsAscii("table:table-cell") )

-    {

-        SvXMLAttributeList* pList = SvXMLAttributeList::getImplementation(xAttribs);

-        static ::rtl::OUString s_sValue(lcl_createAttribute(XML_NP_OFFICE,XML_VALUE));

-        pList->RemoveAttribute(s_sValue);

-    }

-    else if ( m_bTableRowsStarted && _sName.equalsAscii("text:p") )

-    {

-        bExport = false;

-    }

-    if ( bExport )

-        m_xDelegatee->startElement(_sName,xAttribs);

-}

-// -----------------------------------------------------------------------------

-void SAL_CALL ExportDocumentHandler::endElement(const ::rtl::OUString & _sName) throw (uno::RuntimeException, xml::sax::SAXException)

-{

-    bool bExport = true;

-    ::rtl::OUString sNewName = _sName;

-    if ( _sName.equalsAscii("office:chart") )

-    {

-        sNewName = lcl_createAttribute(XML_NP_OFFICE,XML_REPORT);

-    }

-    else if ( _sName.equalsAscii("table:table") )

-    {

-        m_xDelegatee->endElement(_sName);

-        lcl_exportPrettyPrinting(m_xDelegatee);

-        sNewName = lcl_createAttribute(XML_NP_RPT,XML_DETAIL);

-    }

-    else if ( _sName.equalsAscii("table:table-rows") )

-        m_bTableRowsStarted = false;

-    else if ( m_bTableRowsStarted && m_bFirstRowExported && (_sName.equalsAscii("table:table-row") || _sName.equalsAscii("table:table-cell")) )

-        bExport = false;

-    else if ( m_bTableRowsStarted && _sName.equalsAscii("table:table-row") )

-        m_bFirstRowExported = true;

-    else if ( m_bTableRowsStarted && _sName.equalsAscii("text:p") )

-    {

-        bExport = !m_bFirstRowExported;

-    }

-

-    if ( bExport )

-        m_xDelegatee->endElement(sNewName);

-}

-

-void SAL_CALL ExportDocumentHandler::characters(const ::rtl::OUString & aChars) throw (uno::RuntimeException, xml::sax::SAXException)

-{

-    if ( !(m_bTableRowsStarted || m_bFirstRowExported) )

-        m_xDelegatee->characters(aChars);

-    else if ( m_bExportChar )

-    {

-        static const ::rtl::OUString s_sZero(RTL_CONSTASCII_USTRINGPARAM("0"));

-        m_xDelegatee->characters(s_sZero);

-    }

-}

-

-void SAL_CALL ExportDocumentHandler::ignorableWhitespace(const ::rtl::OUString & aWhitespaces) throw (uno::RuntimeException, xml::sax::SAXException)

-{

-    m_xDelegatee->ignorableWhitespace(aWhitespaces);

-}

-

-void SAL_CALL ExportDocumentHandler::processingInstruction(const ::rtl::OUString & aTarget, const ::rtl::OUString & aData) throw (uno::RuntimeException, xml::sax::SAXException)

-{

-    m_xDelegatee->processingInstruction(aTarget,aData);

-}

-

-void SAL_CALL ExportDocumentHandler::setDocumentLocator(const uno::Reference< xml::sax::XLocator > & xLocator) throw (uno::RuntimeException, xml::sax::SAXException)

-{

-    m_xDelegatee->setDocumentLocator(xLocator);

-}

-void SAL_CALL ExportDocumentHandler::initialize( const uno::Sequence< uno::Any >& _aArguments ) throw (uno::Exception, uno::RuntimeException)

-{

-    ::osl::MutexGuard aGuard(m_aMutex);

-    comphelper::SequenceAsHashMap aArgs(_aArguments);

-    m_xDelegatee = aArgs.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentHandler")),m_xDelegatee);

-    m_xModel = aArgs.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Model")),m_xModel);

-

-    OSL_ENSURE(m_xDelegatee.is(),"No document handler avialable!");

-    if ( !m_xDelegatee.is() || !m_xModel.is() )

-        throw uno::Exception();

-

-    m_xDatabaseDataProvider.set(m_xModel->getDataProvider(),uno::UNO_QUERY);

-    if ( !m_xDatabaseDataProvider.is() )

-        throw uno::Exception();

-    

-    uno::Reference< reflection::XProxyFactory > xProxyFactory( m_xContext->getServiceManager()->createInstanceWithContext(

-        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.reflection.ProxyFactory")),m_xContext),

-        uno::UNO_QUERY);

-    m_xProxy = xProxyFactory->createProxy(m_xDelegatee.get());

-    ::comphelper::query_aggregation(m_xProxy,m_xDelegatee);

-    m_xTypeProvider.set(m_xDelegatee,uno::UNO_QUERY);

-    m_xServiceInfo.set(m_xDelegatee,uno::UNO_QUERY);

-

-    // set ourself as delegator

-    m_xProxy->setDelegator( *this );

-    

-    const ::rtl::OUString sCommand = m_xDatabaseDataProvider->getCommand();

-    if ( sCommand.getLength() )

-        m_aColumns = ::dbtools::getFieldNamesByCommandDescriptor(m_xDatabaseDataProvider->getActiveConnection()

-                    ,m_xDatabaseDataProvider->getCommandType()

-                    ,sCommand);

-}

-// --------------------------------------------------------------------------------

-uno::Any SAL_CALL ExportDocumentHandler::queryInterface( const uno::Type& _rType ) throw (uno::RuntimeException)

-{

-    uno::Any aReturn = ExportDocumentHandler_BASE::queryInterface(_rType);

-    return aReturn.hasValue() ? aReturn : (m_xProxy.is() ? m_xProxy->queryAggregation(_rType) : aReturn);

-}

-// --------------------------------------------------------------------------------

-uno::Sequence< uno::Type > SAL_CALL ExportDocumentHandler::getTypes(  ) throw (uno::RuntimeException)

-{

-    if ( m_xTypeProvider.is() )

-        return ::comphelper::concatSequences(

-            ExportDocumentHandler_BASE::getTypes(),

-            m_xTypeProvider->getTypes()

-        );

-    return ExportDocumentHandler_BASE::getTypes();

-}

-// -----------------------------------------------------------------------------

-void ExportDocumentHandler::exportTableRows()

-{

-    const ::rtl::OUString sRow( lcl_createAttribute(XML_NP_TABLE, XML_TABLE_ROW) );

-    m_xDelegatee->startElement(sRow,NULL);

-

-    const ::rtl::OUString sValueType( lcl_createAttribute(XML_NP_OFFICE, XML_VALUE_TYPE) );

-    

-    const static ::rtl::OUString s_sFieldPrefix(RTL_CONSTASCII_USTRINGPARAM("field:["));

-    const static ::rtl::OUString s_sFieldPostfix(RTL_CONSTASCII_USTRINGPARAM("]"));

-    const ::rtl::OUString sCell( lcl_createAttribute(XML_NP_TABLE, XML_TABLE_CELL) );

-    const ::rtl::OUString sP( lcl_createAttribute(XML_NP_TEXT, XML_P) );

-    const ::rtl::OUString sFtext(lcl_createAttribute(XML_NP_RPT,XML_FORMATTED_TEXT) );

-    const ::rtl::OUString sRElement(lcl_createAttribute(XML_NP_RPT,XML_REPORT_ELEMENT) );

-    const ::rtl::OUString sRComponent( lcl_createAttribute(XML_NP_RPT,XML_REPORT_COMPONENT) ) ;

-    const ::rtl::OUString sFormulaAttrib( lcl_createAttribute(XML_NP_RPT,XML_FORMULA) );

-    const static ::rtl::OUString s_sString(RTL_CONSTASCII_USTRINGPARAM("string"));

-    const static ::rtl::OUString s_sFloat(RTL_CONSTASCII_USTRINGPARAM("float"));

-

-    SvXMLAttributeList* pCellAtt = new SvXMLAttributeList();

-    uno::Reference< xml::sax::XAttributeList > xCellAtt = pCellAtt;

-    pCellAtt->AddAttribute(sValueType,s_sString);

-

-    ::rtl::OUString sFormula;

-    const sal_Int32 nCount = m_aColumns.getLength();

-    for(sal_Int32 i = 0; i < nCount ; ++i)

-    {

-        sFormula = s_sFieldPrefix;

-        sFormula += m_aColumns[i];

-        sFormula += s_sFieldPostfix;

-        SvXMLAttributeList* pList = new SvXMLAttributeList();

-        uno::Reference< xml::sax::XAttributeList > xAttribs = pList;

-        pList->AddAttribute(sFormulaAttrib,sFormula);

-

-        m_xDelegatee->startElement(sCell,xCellAtt);

-        if ( i == 0 )

-        {

-            pCellAtt->RemoveAttribute(sValueType);

-            pCellAtt->AddAttribute(sValueType,s_sFloat);

-        }

-        m_xDelegatee->startElement(sP,NULL);

-        m_xDelegatee->startElement(sFtext,xAttribs);

-        m_xDelegatee->startElement(sRElement,NULL);

-        m_xDelegatee->startElement(sRComponent,NULL);

-        

-        m_xDelegatee->endElement(sRComponent);

-        m_xDelegatee->endElement(sRElement);

-        m_xDelegatee->endElement(sFtext);

-        m_xDelegatee->endElement(sP);

-        m_xDelegatee->endElement(sCell);

-    } // for(sal_Int32 i = 0; i < nCount ; ++i)

-

-    m_xDelegatee->endElement(sRow);

-}

-// -----------------------------------------------------------------------------

-} // namespace rptxml

-// -----------------------------------------------------------------------------

+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: xmlExportDocumentHandler.cxx,v $
+ * $Revision: 1.5 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#include "precompiled_reportdesign.hxx"
+
+#include "xmlExportDocumentHandler.hxx"
+#include <com/sun/star/sdb/CommandType.hpp>
+#include <com/sun/star/chart2/data/XDatabaseDataProvider.hpp>
+#include <com/sun/star/reflection/XProxyFactory.hpp>
+#include <com/sun/star/sdb/CommandType.hpp>
+#include <comphelper/sequence.hxx>
+#include <comphelper/sequenceashashmap.hxx>
+#include <comphelper/documentconstants.hxx>
+#include <xmloff/attrlist.hxx>
+#include <xmloff/xmltoken.hxx>
+#include <xmloff/xmlement.hxx>
+#include <xmloff/xmluconv.hxx>
+#include <svtools/saveopt.hxx>
+#include <rtl/ustrbuf.hxx>
+#include <connectivity/dbtools.hxx>
+#include <rtl/ustrbuf.hxx>
+
+namespace rptxml
+{
+using namespace ::com::sun::star;
+using namespace ::xmloff::token;
+
+void lcl_exportPrettyPrinting(const uno::Reference< xml::sax::XDocumentHandler >& _xDelegatee)
+{
+    SvtSaveOptions aSaveOpt;
+    if ( aSaveOpt.IsPrettyPrinting() )
+    {
+        static const ::rtl::OUString s_sWhitespaces(RTL_CONSTASCII_USTRINGPARAM(" "));
+        _xDelegatee->ignorableWhitespace(s_sWhitespaces);
+    }
+}
+
+::rtl::OUString lcl_createAttribute(const xmloff::token::XMLTokenEnum& _eNamespace,const xmloff::token::XMLTokenEnum& _eAttribute)
+{
+    ::rtl::OUStringBuffer sQName;
+    // ...if it's in our map, make the prefix
+    sQName.append ( xmloff::token::GetXMLToken(_eNamespace) );
+    sQName.append ( sal_Unicode(':') );
+    sQName.append ( xmloff::token::GetXMLToken(_eAttribute) );
+    return sQName.makeStringAndClear();
+}
+
+void lcl_correctCellAddress(const ::rtl::OUString & _sName, const uno::Reference< xml::sax::XAttributeList > & xAttribs)
+{
+    SvXMLAttributeList* pList = SvXMLAttributeList::getImplementation(xAttribs);
+    ::rtl::OUString sCellAddress = pList->getValueByName(_sName);
+    const sal_Int32 nPos = sCellAddress.lastIndexOf('$');
+    if ( nPos != -1 )
+    {
+        sCellAddress = sCellAddress.copy(0,nPos);
+        sCellAddress += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("$65535"));
+        pList->RemoveAttribute(_sName);
+        pList->AddAttribute(_sName,sCellAddress);
+    }
+}
+
+ExportDocumentHandler::ExportDocumentHandler(uno::Reference< uno::XComponentContext > const & context) :
+    m_xContext(context)
+    ,m_nCurrentCellIndex(0)
+    ,m_bTableRowsStarted(false)
+    ,m_bFirstRowExported(false)
+    ,m_bExportChar(false)
+{
+}
+// -----------------------------------------------------------------------------
+ExportDocumentHandler::~ExportDocumentHandler()
+{
+    if ( m_xProxy.is() )
+    {
+        m_xProxy->setDelegator( NULL );
+        m_xProxy.clear();
+    }
+}
+IMPLEMENT_GET_IMPLEMENTATION_ID(ExportDocumentHandler)
+IMPLEMENT_FORWARD_REFCOUNT( ExportDocumentHandler, ExportDocumentHandler_BASE )
+//------------------------------------------------------------------------
+::rtl::OUString SAL_CALL ExportDocumentHandler::getImplementationName(  ) throw(uno::RuntimeException)
+{
+    return getImplementationName_Static();
+}
+
+//------------------------------------------------------------------------
+sal_Bool SAL_CALL ExportDocumentHandler::supportsService( const ::rtl::OUString& ServiceName ) throw(uno::RuntimeException)
+{
+    return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_static());
+}
+
+//------------------------------------------------------------------------
+uno::Sequence< ::rtl::OUString > SAL_CALL ExportDocumentHandler::getSupportedServiceNames(  ) throw(uno::RuntimeException)
+{
+    uno::Sequence< ::rtl::OUString > aSupported;
+    if ( m_xServiceInfo.is() )
+        aSupported = m_xServiceInfo->getSupportedServiceNames();
+    return ::comphelper::concatSequences(getSupportedServiceNames_static(),aSupported);
+}
+
+//------------------------------------------------------------------------
+::rtl::OUString ExportDocumentHandler::getImplementationName_Static(  ) throw(uno::RuntimeException)
+{
+    return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.ExportDocumentHandler"));
+}
+
+//------------------------------------------------------------------------
+uno::Sequence< ::rtl::OUString > ExportDocumentHandler::getSupportedServiceNames_static(  ) throw(uno::RuntimeException)
+{
+    uno::Sequence< ::rtl::OUString > aSupported(1);
+    aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.ExportDocumentHandler"));
+    return aSupported;
+}
+
+//------------------------------------------------------------------------
+uno::Reference< uno::XInterface > SAL_CALL ExportDocumentHandler::create( const uno::Reference< uno::XComponentContext >& _rxContext )
+{
+    return *(new ExportDocumentHandler( _rxContext ));
+}
+// xml::sax::XDocumentHandler:
+void SAL_CALL ExportDocumentHandler::startDocument() throw (uno::RuntimeException, xml::sax::SAXException)
+{
+    m_xDelegatee->startDocument();
+}
+
+void SAL_CALL ExportDocumentHandler::endDocument() throw (uno::RuntimeException, xml::sax::SAXException)
+{
+    m_xDelegatee->endDocument();
+}
+
+void SAL_CALL ExportDocumentHandler::startElement(const ::rtl::OUString & _sName, const uno::Reference< xml::sax::XAttributeList > & xAttribs) throw (uno::RuntimeException, xml::sax::SAXException)
+{
+    bool bExport = true;
+    if ( _sName.equalsAscii("office:chart") )
+    {
+        SvXMLAttributeList* pList = new SvXMLAttributeList();
+        uno::Reference< xml::sax::XAttributeList > xNewAttribs = pList;
+        ::rtl::OUStringBuffer sValue;
+        static SvXMLEnumMapEntry aXML_CommnadTypeEnumMap[] =
+        {
+            { XML_TABLE, sdb::CommandType::TABLE },
+            { XML_QUERY, sdb::CommandType::QUERY },
+            // { XML_COMMAND, CommandType::COMMAND }, // default
+            { XML_TOKEN_INVALID, 0 }
+        };
+        if ( SvXMLUnitConverter::convertEnum( sValue, static_cast<sal_uInt16>(m_xDatabaseDataProvider->getCommandType()),aXML_CommnadTypeEnumMap ) )
+        {
+            pList->AddAttribute(lcl_createAttribute(XML_NP_RPT,XML_COMMAND_TYPE),sValue.makeStringAndClear());
+        }
+        const ::rtl::OUString sComamnd = m_xDatabaseDataProvider->getCommand();
+        if ( sComamnd.getLength() )
+            pList->AddAttribute(lcl_createAttribute(XML_NP_RPT,XML_COMMAND),sComamnd);
+
+        const ::rtl::OUString sFilter( m_xDatabaseDataProvider->getFilter() );
+        if ( sFilter.getLength() )
+            pList->AddAttribute(lcl_createAttribute(XML_NP_RPT,XML_FILTER),sFilter);
+
+        const sal_Bool bEscapeProcessing( m_xDatabaseDataProvider->getEscapeProcessing() );
+        if ( !bEscapeProcessing )
+            pList->AddAttribute(lcl_createAttribute(XML_NP_RPT,XML_ESCAPE_PROCESSING),::xmloff::token::GetXMLToken( XML_FALSE ));
+
+        pList->AddAttribute(lcl_createAttribute(XML_NP_OFFICE,XML_MIMETYPE),MIMETYPE_OASIS_OPENDOCUMENT_CHART);
+
+        m_xDelegatee->startElement(lcl_createAttribute(XML_NP_OFFICE,XML_REPORT),xNewAttribs);
+        bExport = false;
+    }
+    else if ( _sName.equalsAscii("table:table") )
+    {
+        m_xDelegatee->startElement(lcl_createAttribute(XML_NP_RPT,XML_DETAIL),NULL);
+        lcl_exportPrettyPrinting(m_xDelegatee);
+    }
+    else if ( _sName.equalsAscii("table:table-rows") )
+    {
+        m_xDelegatee->startElement(_sName,xAttribs);
+        exportTableRows();
+        bExport = false;
+        m_bTableRowsStarted = true;
+        m_bFirstRowExported = true;
+    }
+    else if ( m_bTableRowsStarted && m_bFirstRowExported && (_sName.equalsAscii("table:table-row") || _sName.equalsAscii("table:table-cell")) )
+        bExport = false;
+    else if ( _sName.equalsAscii("chart:plot-area"))
+    {
+        SvXMLAttributeList* pList = SvXMLAttributeList::getImplementation(xAttribs);
+        pList->RemoveAttribute(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("table:cell-range-address")));
+    }
+    else if ( _sName.equalsAscii("chart:categories"))
+    {
+        static ::rtl::OUString s_sCellAddress(lcl_createAttribute(XML_NP_TABLE,XML_CELL_RANGE_ADDRESS));
+        lcl_correctCellAddress(s_sCellAddress,xAttribs);
+    }
+    else if ( _sName.equalsAscii("chart:series"))
+    {
+        static ::rtl::OUString s_sCellAddress(lcl_createAttribute(XML_NP_CHART,XML_VALUES_CELL_RANGE_ADDRESS));
+        lcl_correctCellAddress(s_sCellAddress,xAttribs);
+    }
+    else if ( m_bTableRowsStarted && !m_bFirstRowExported && _sName.equalsAscii("table:table-cell") )
+    {
+        SvXMLAttributeList* pList = SvXMLAttributeList::getImplementation(xAttribs);
+        static ::rtl::OUString s_sValue(lcl_createAttribute(XML_NP_OFFICE,XML_VALUE));
+        pList->RemoveAttribute(s_sValue);
+    }
+    else if ( m_bTableRowsStarted && _sName.equalsAscii("text:p") )
+    {
+        bExport = false;
+    }
+    if ( bExport )
+        m_xDelegatee->startElement(_sName,xAttribs);
+}
+// -----------------------------------------------------------------------------
+void SAL_CALL ExportDocumentHandler::endElement(const ::rtl::OUString & _sName) throw (uno::RuntimeException, xml::sax::SAXException)
+{
+    bool bExport = true;
+    ::rtl::OUString sNewName = _sName;
+    if ( _sName.equalsAscii("office:chart") )
+    {
+        sNewName = lcl_createAttribute(XML_NP_OFFICE,XML_REPORT);
+    }
+    else if ( _sName.equalsAscii("table:table") )
+    {
+        m_xDelegatee->endElement(_sName);
+        lcl_exportPrettyPrinting(m_xDelegatee);
+        sNewName = lcl_createAttribute(XML_NP_RPT,XML_DETAIL);
+    }
+    else if ( _sName.equalsAscii("table:table-rows") )
+        m_bTableRowsStarted = false;
+    else if ( m_bTableRowsStarted && m_bFirstRowExported && (_sName.equalsAscii("table:table-row") || _sName.equalsAscii("table:table-cell")) )
+        bExport = false;
+    else if ( m_bTableRowsStarted && _sName.equalsAscii("table:table-row") )
+        m_bFirstRowExported = true;
+    else if ( m_bTableRowsStarted && _sName.equalsAscii("text:p") )
+    {
+        bExport = !m_bFirstRowExported;
+    }
+
+    if ( bExport )
+        m_xDelegatee->endElement(sNewName);
+}
+
+void SAL_CALL ExportDocumentHandler::characters(const ::rtl::OUString & aChars) throw (uno::RuntimeException, xml::sax::SAXException)
+{
+    if ( !(m_bTableRowsStarted || m_bFirstRowExported) )
+        m_xDelegatee->characters(aChars);
+    else if ( m_bExportChar )
+    {
+        static const ::rtl::OUString s_sZero(RTL_CONSTASCII_USTRINGPARAM("0"));
+        m_xDelegatee->characters(s_sZero);
+    }
+}
+
+void SAL_CALL ExportDocumentHandler::ignorableWhitespace(const ::rtl::OUString & aWhitespaces) throw (uno::RuntimeException, xml::sax::SAXException)
+{
+    m_xDelegatee->ignorableWhitespace(aWhitespaces);
+}
+
+void SAL_CALL ExportDocumentHandler::processingInstruction(const ::rtl::OUString & aTarget, const ::rtl::OUString & aData) throw (uno::RuntimeException, xml::sax::SAXException)
+{
+    m_xDelegatee->processingInstruction(aTarget,aData);
+}
+
+void SAL_CALL ExportDocumentHandler::setDocumentLocator(const uno::Reference< xml::sax::XLocator > & xLocator) throw (uno::RuntimeException, xml::sax::SAXException)
+{
+    m_xDelegatee->setDocumentLocator(xLocator);
+}
+void SAL_CALL ExportDocumentHandler::initialize( const uno::Sequence< uno::Any >& _aArguments ) throw (uno::Exception, uno::RuntimeException)
+{
+    ::osl::MutexGuard aGuard(m_aMutex);
+    comphelper::SequenceAsHashMap aArgs(_aArguments);
+    m_xDelegatee = aArgs.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocumentHandler")),m_xDelegatee);
+    m_xModel = aArgs.getUnpackedValueOrDefault(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Model")),m_xModel);
+
+    OSL_ENSURE(m_xDelegatee.is(),"No document handler avialable!");
+    if ( !m_xDelegatee.is() || !m_xModel.is() )
+        throw uno::Exception();
+
+    m_xDatabaseDataProvider.set(m_xModel->getDataProvider(),uno::UNO_QUERY);
+    if ( !m_xDatabaseDataProvider.is() )
+        throw uno::Exception();
+
+    uno::Reference< reflection::XProxyFactory > xProxyFactory( m_xContext->getServiceManager()->createInstanceWithContext(
+        ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.reflection.ProxyFactory")),m_xContext),
+        uno::UNO_QUERY);
+    m_xProxy = xProxyFactory->createProxy(m_xDelegatee.get());
+    ::comphelper::query_aggregation(m_xProxy,m_xDelegatee);
+    m_xTypeProvider.set(m_xDelegatee,uno::UNO_QUERY);
+    m_xServiceInfo.set(m_xDelegatee,uno::UNO_QUERY);
+
+    // set ourself as delegator
+    m_xProxy->setDelegator( *this );
+
+    const ::rtl::OUString sCommand = m_xDatabaseDataProvider->getCommand();
+    if ( sCommand.getLength() )
+        m_aColumns = ::dbtools::getFieldNamesByCommandDescriptor(m_xDatabaseDataProvider->getActiveConnection()
+                    ,m_xDatabaseDataProvider->getCommandType()
+                    ,sCommand);
+}
+// --------------------------------------------------------------------------------
+uno::Any SAL_CALL ExportDocumentHandler::queryInterface( const uno::Type& _rType ) throw (uno::RuntimeException)
+{
+    uno::Any aReturn = ExportDocumentHandler_BASE::queryInterface(_rType);
+    return aReturn.hasValue() ? aReturn : (m_xProxy.is() ? m_xProxy->queryAggregation(_rType) : aReturn);
+}
+// --------------------------------------------------------------------------------
+uno::Sequence< uno::Type > SAL_CALL ExportDocumentHandler::getTypes(  ) throw (uno::RuntimeException)
+{
+    if ( m_xTypeProvider.is() )
+        return ::comphelper::concatSequences(
+            ExportDocumentHandler_BASE::getTypes(),
+            m_xTypeProvider->getTypes()
+        );
+    return ExportDocumentHandler_BASE::getTypes();
+}
+// -----------------------------------------------------------------------------
+void ExportDocumentHandler::exportTableRows()
+{
+    const ::rtl::OUString sRow( lcl_createAttribute(XML_NP_TABLE, XML_TABLE_ROW) );
+    m_xDelegatee->startElement(sRow,NULL);
+
+    const ::rtl::OUString sValueType( lcl_createAttribute(XML_NP_OFFICE, XML_VALUE_TYPE) );
+
+    const static ::rtl::OUString s_sFieldPrefix(RTL_CONSTASCII_USTRINGPARAM("field:["));
+    const static ::rtl::OUString s_sFieldPostfix(RTL_CONSTASCII_USTRINGPARAM("]"));
+    const ::rtl::OUString sCell( lcl_createAttribute(XML_NP_TABLE, XML_TABLE_CELL) );
+    const ::rtl::OUString sP( lcl_createAttribute(XML_NP_TEXT, XML_P) );
+    const ::rtl::OUString sFtext(lcl_createAttribute(XML_NP_RPT,XML_FORMATTED_TEXT) );
+    const ::rtl::OUString sRElement(lcl_createAttribute(XML_NP_RPT,XML_REPORT_ELEMENT) );
+    const ::rtl::OUString sRComponent( lcl_createAttribute(XML_NP_RPT,XML_REPORT_COMPONENT) ) ;
+    const ::rtl::OUString sFormulaAttrib( lcl_createAttribute(XML_NP_RPT,XML_FORMULA) );
+    const static ::rtl::OUString s_sString(RTL_CONSTASCII_USTRINGPARAM("string"));
+    const static ::rtl::OUString s_sFloat(RTL_CONSTASCII_USTRINGPARAM("float"));
+
+    SvXMLAttributeList* pCellAtt = new SvXMLAttributeList();
+    uno::Reference< xml::sax::XAttributeList > xCellAtt = pCellAtt;
+    pCellAtt->AddAttribute(sValueType,s_sString);
+
+    ::rtl::OUString sFormula;
+    const sal_Int32 nCount = m_aColumns.getLength();
+    for(sal_Int32 i = 0; i < nCount ; ++i)
+    {
+        sFormula = s_sFieldPrefix;
+        sFormula += m_aColumns[i];
+        sFormula += s_sFieldPostfix;
+        SvXMLAttributeList* pList = new SvXMLAttributeList();
+        uno::Reference< xml::sax::XAttributeList > xAttribs = pList;
+        pList->AddAttribute(sFormulaAttrib,sFormula);
+
+        m_xDelegatee->startElement(sCell,xCellAtt);
+        if ( i == 0 )
+        {
+            pCellAtt->RemoveAttribute(sValueType);
+            pCellAtt->AddAttribute(sValueType,s_sFloat);
+        }
+        m_xDelegatee->startElement(sP,NULL);
+        m_xDelegatee->startElement(sFtext,xAttribs);
+        m_xDelegatee->startElement(sRElement,NULL);
+        m_xDelegatee->startElement(sRComponent,NULL);
+
+        m_xDelegatee->endElement(sRComponent);
+        m_xDelegatee->endElement(sRElement);
+        m_xDelegatee->endElement(sFtext);
+        m_xDelegatee->endElement(sP);
+        m_xDelegatee->endElement(sCell);
+    } // for(sal_Int32 i = 0; i < nCount ; ++i)
+
+    m_xDelegatee->endElement(sRow);
+}
+// -----------------------------------------------------------------------------
+} // namespace rptxml
+// -----------------------------------------------------------------------------
diff --git a/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx b/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx
index be97bdc030f7..33cad946997a 100644
--- a/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx
+++ b/reportdesign/source/filter/xml/xmlExportDocumentHandler.hxx
@@ -1,106 +1,106 @@
-/*************************************************************************

- *

- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.

- * 

- * Copyright 2008 by Sun Microsystems, Inc.

- *

- * OpenOffice.org - a multi-platform office productivity suite

- *

- * $RCSfile: xmlExportDocumentHandler.hxx,v $

- * $Revision: 1.4 $

- *

- * This file is part of OpenOffice.org.

- *

- * OpenOffice.org is free software: you can redistribute it and/or modify

- * it under the terms of the GNU Lesser General Public License version 3

- * only, as published by the Free Software Foundation.

- *

- * OpenOffice.org is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

- * GNU Lesser General Public License version 3 for more details

- * (a copy is included in the LICENSE file that accompanied this code).

- *

- * You should have received a copy of the GNU Lesser General Public License

- * version 3 along with OpenOffice.org.  If not, see

- * <http://www.openoffice.org/license.html>

- * for a copy of the LGPLv3 License.

- *

- ************************************************************************/

-#ifndef RPT_EXPORTDOCUMENTHANDLER_HXX_INCLUDED

-#define RPT_EXPORTDOCUMENTHANDLER_HXX_INCLUDED

-

-#include "sal/config.h"

-#include "com/sun/star/uno/XComponentContext.hpp"

-#include <cppuhelper/implbase3.hxx>

-#include "com/sun/star/xml/sax/XDocumentHandler.hpp"

-#include <com/sun/star/lang/XInitialization.hpp>

-#include <com/sun/star/lang/XServiceInfo.hpp>

-#include <com/sun/star/lang/XTypeProvider.hpp>

-#include <com/sun/star/chart2/XChartDocument.hpp>

-#include "com/sun/star/chart2/data/XDatabaseDataProvider.hpp"

-#include <comphelper/uno3.hxx>

-

-namespace rptxml

-{

-typedef ::cppu::WeakAggImplHelper3< ::com::sun::star::xml::sax::XDocumentHandler

-                                ,   ::com::sun::star::lang::XInitialization

-                                ,   ::com::sun::star::lang::XServiceInfo>   ExportDocumentHandler_BASE;

-

-class ExportDocumentHandler : public ExportDocumentHandler_BASE

-{

-public:

-    // XServiceInfo - static versions

-    static ::rtl::OUString getImplementationName_Static(  ) throw(::com::sun::star::uno::RuntimeException);

-    static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static(  ) throw(::com::sun::star::uno::RuntimeException);

-    static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL

-                    create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&);

-public:

-    explicit ExportDocumentHandler(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & context);

-

-private:

-    // XServiceInfo

-    virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException);

-    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException);

-    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException);

-

-    DECLARE_XINTERFACE( )

-    DECLARE_XTYPEPROVIDER( )

-

-    // ::com::sun::star::xml::sax::XDocumentHandler:

-    virtual void SAL_CALL startDocument() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException);

-    virtual void SAL_CALL endDocument() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException);

-    virtual void SAL_CALL startElement(const ::rtl::OUString & aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttribs) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException);

-    virtual void SAL_CALL endElement(const ::rtl::OUString & aName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException);

-    virtual void SAL_CALL characters(const ::rtl::OUString & aChars) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException);

-    virtual void SAL_CALL ignorableWhitespace(const ::rtl::OUString & aWhitespaces) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException);

-    virtual void SAL_CALL processingInstruction(const ::rtl::OUString & aTarget, const ::rtl::OUString & aData) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException);

-    virtual void SAL_CALL setDocumentLocator(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > & xLocator) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException);

-

-    virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);

-

-    void exportTableRows();

-private:

-    ExportDocumentHandler(ExportDocumentHandler &); // not defined

-    void operator =(ExportDocumentHandler &); // not defined

-

-    virtual ~ExportDocumentHandler();

-

-    ::osl::Mutex                                                                        m_aMutex;

-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >        m_xContext;

-    ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >    m_xDelegatee;

-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation >             m_xProxy;

-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider >           m_xTypeProvider;

-    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XServiceInfo >            m_xServiceInfo;

-    ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >        m_xModel;

-    ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDatabaseDataProvider >   m_xDatabaseDataProvider;

-    ::com::sun::star::uno::Sequence< ::rtl::OUString >                                  m_aColumns;

-    sal_Int32                                                                           m_nCurrentCellIndex;

-    bool m_bTableRowsStarted;

-    bool m_bFirstRowExported;

-    bool m_bExportChar;

-};

-// -----------------------------------------------------------------------------

-} // namespace rptxml

-// -----------------------------------------------------------------------------

-#endif // RPT_EXPORTDOCUMENTHANDLER_HXX_INCLUDED

+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: xmlExportDocumentHandler.hxx,v $
+ * $Revision: 1.4 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+#ifndef RPT_EXPORTDOCUMENTHANDLER_HXX_INCLUDED
+#define RPT_EXPORTDOCUMENTHANDLER_HXX_INCLUDED
+
+#include "sal/config.h"
+#include "com/sun/star/uno/XComponentContext.hpp"
+#include <cppuhelper/implbase3.hxx>
+#include "com/sun/star/xml/sax/XDocumentHandler.hpp"
+#include <com/sun/star/lang/XInitialization.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/lang/XTypeProvider.hpp>
+#include <com/sun/star/chart2/XChartDocument.hpp>
+#include "com/sun/star/chart2/data/XDatabaseDataProvider.hpp"
+#include <comphelper/uno3.hxx>
+
+namespace rptxml
+{
+typedef ::cppu::WeakAggImplHelper3< ::com::sun::star::xml::sax::XDocumentHandler
+                                ,   ::com::sun::star::lang::XInitialization
+                                ,   ::com::sun::star::lang::XServiceInfo>   ExportDocumentHandler_BASE;
+
+class ExportDocumentHandler : public ExportDocumentHandler_BASE
+{
+public:
+    // XServiceInfo - static versions
+    static ::rtl::OUString getImplementationName_Static(  ) throw(::com::sun::star::uno::RuntimeException);
+    static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_static(  ) throw(::com::sun::star::uno::RuntimeException);
+    static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL
+                    create(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >&);
+public:
+    explicit ExportDocumentHandler(::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > const & context);
+
+private:
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName(  ) throw(::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames(  ) throw(::com::sun::star::uno::RuntimeException);
+
+    DECLARE_XINTERFACE( )
+    DECLARE_XTYPEPROVIDER( )
+
+    // ::com::sun::star::xml::sax::XDocumentHandler:
+    virtual void SAL_CALL startDocument() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException);
+    virtual void SAL_CALL endDocument() throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException);
+    virtual void SAL_CALL startElement(const ::rtl::OUString & aName, const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttribs) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException);
+    virtual void SAL_CALL endElement(const ::rtl::OUString & aName) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException);
+    virtual void SAL_CALL characters(const ::rtl::OUString & aChars) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException);
+    virtual void SAL_CALL ignorableWhitespace(const ::rtl::OUString & aWhitespaces) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException);
+    virtual void SAL_CALL processingInstruction(const ::rtl::OUString & aTarget, const ::rtl::OUString & aData) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException);
+    virtual void SAL_CALL setDocumentLocator(const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XLocator > & xLocator) throw (::com::sun::star::uno::RuntimeException, ::com::sun::star::xml::sax::SAXException);
+
+    virtual void SAL_CALL initialize( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aArguments ) throw (::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException);
+
+    void exportTableRows();
+private:
+    ExportDocumentHandler(ExportDocumentHandler &); // not defined
+    void operator =(ExportDocumentHandler &); // not defined
+
+    virtual ~ExportDocumentHandler();
+
+    ::osl::Mutex                                                                        m_aMutex;
+    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >        m_xContext;
+    ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XDocumentHandler >    m_xDelegatee;
+    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation >             m_xProxy;
+    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XTypeProvider >           m_xTypeProvider;
+    ::com::sun::star::uno::Reference< ::com::sun::star::lang::XServiceInfo >            m_xServiceInfo;
+    ::com::sun::star::uno::Reference< ::com::sun::star::chart2::XChartDocument >        m_xModel;
+    ::com::sun::star::uno::Reference< ::com::sun::star::chart2::data::XDatabaseDataProvider >   m_xDatabaseDataProvider;
+    ::com::sun::star::uno::Sequence< ::rtl::OUString >                                  m_aColumns;
+    sal_Int32                                                                           m_nCurrentCellIndex;
+    bool m_bTableRowsStarted;
+    bool m_bFirstRowExported;
+    bool m_bExportChar;
+};
+// -----------------------------------------------------------------------------
+} // namespace rptxml
+// -----------------------------------------------------------------------------
+#endif // RPT_EXPORTDOCUMENTHANDLER_HXX_INCLUDED