diff options
Diffstat (limited to 'dbaccess/source/filter/xml')
52 files changed, 258 insertions, 958 deletions
diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx index 1f9aab64b817..210c5c9f7937 100644 --- a/dbaccess/source/filter/xml/dbloader2.cxx +++ b/dbaccess/source/filter/xml/dbloader2.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. @@ -121,7 +122,7 @@ public: // static methods static ::rtl::OUString getImplementationName_Static() throw( ) { - return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbflt.DBTypeDetection"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbflt.DBTypeDetection")); } static Sequence< ::rtl::OUString> getSupportedServiceNames_Static(void) throw( ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > @@ -167,7 +168,7 @@ DBTypeDetection::DBTypeDetection(const Reference< XMultiServiceFactory >& _rxFac { ::rtl::OUString sMediaType; xStorageProperties->getPropertyValue( INFO_MEDIATYPE ) >>= sMediaType; - if ( sMediaType.equalsAscii(MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII) || sMediaType.equalsAscii(MIMETYPE_VND_SUN_XML_BASE_ASCII) ) + if ( sMediaType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(MIMETYPE_OASIS_OPENDOCUMENT_DATABASE_ASCII)) || sMediaType.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(MIMETYPE_VND_SUN_XML_BASE_ASCII)) ) { if ( bStreamFromDescr && sURL.compareTo( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:stream" ) ), 14 ) != COMPARE_EQUAL ) { @@ -230,7 +231,7 @@ Sequence< ::rtl::OUString > SAL_CALL DBTypeDetection::getSupportedServiceNames(v Sequence< ::rtl::OUString > DBTypeDetection::getSupportedServiceNames_Static(void) throw( ) { Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS.getArray()[0] = ::rtl::OUString::createFromAscii("com.sun.star.document.ExtendedTypeDetection"); + aSNS.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.ExtendedTypeDetection")); return aSNS; } // ------------------------------------------------------------------------- @@ -261,7 +262,7 @@ public: // static methods static ::rtl::OUString getImplementationName_Static() throw( ) { - return ::rtl::OUString::createFromAscii("org.openoffice.comp.dbflt.DBContentLoader2"); + return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.dbflt.DBContentLoader2")); } static Sequence< ::rtl::OUString> getSupportedServiceNames_Static(void) throw( ); static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > @@ -329,7 +330,7 @@ Sequence< ::rtl::OUString > SAL_CALL DBContentLoader::getSupportedServiceNames(v Sequence< ::rtl::OUString > DBContentLoader::getSupportedServiceNames_Static(void) throw( ) { Sequence< ::rtl::OUString > aSNS( 1 ); - aSNS.getArray()[0] = ::rtl::OUString::createFromAscii("com.sun.star.frame.FrameLoader"); + aSNS.getArray()[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.FrameLoader")); return aSNS; } @@ -348,12 +349,12 @@ namespace URL aURL; aURL.Complete = _rURL; xTransformer->parseStrict( aURL ); - bDoesAllow = aURL.Arguments.equalsAscii( "Interactive" ); + bDoesAllow = aURL.Arguments.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "Interactive" ) ); } } catch( const Exception& ) { - OSL_ENSURE( sal_False, "lcl_urlAllowsInteraction: caught an exception while analyzing the URL!" ); + OSL_FAIL( "lcl_urlAllowsInteraction: caught an exception while analyzing the URL!" ); } return bDoesAllow; } @@ -618,14 +619,14 @@ IMPL_LINK( DBContentLoader, OnStartTableWizard, void*, /*NOTINTERESTEDIN*/ ) aValue.Value <<= m_sCurrentURL; aWizArgs[0] <<= aValue; - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; Reference< XJobExecutor > xTableWizard; if ( m_aContext.createComponentWithArguments( "com.sun.star.wizards.table.CallTableWizard", aWizArgs, xTableWizard ) ) xTableWizard->trigger(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("start"))); } catch(const Exception&) { - OSL_ENSURE(sal_False, "caught an exception while starting the table wizard!"); + OSL_FAIL("caught an exception while starting the table wizard!"); } m_xMySelf = NULL; return 0L; @@ -642,17 +643,18 @@ extern "C" void SAL_CALL writeDBLoaderInfo2(void* pRegistryKey) Reference< XRegistryKey> xKey(reinterpret_cast< XRegistryKey*>(pRegistryKey)); // register content loader for dispatch - ::rtl::OUString aImpl = ::rtl::OUString::createFromAscii("/"); + ::rtl::OUString aImpl(RTL_CONSTASCII_USTRINGPARAM("/")); aImpl += ::dbaxml::DBContentLoader::getImplementationName_Static(); ::rtl::OUString aImpltwo = aImpl; - aImpltwo += ::rtl::OUString::createFromAscii("/UNO/Loader"); + aImpltwo += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/Loader")); Reference< XRegistryKey> xNewKey = xKey->createKey( aImpltwo ); aImpltwo = aImpl; - aImpltwo += ::rtl::OUString::createFromAscii("/Loader"); + aImpltwo += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/Loader")); Reference< XRegistryKey > xLoaderKey = xKey->createKey( aImpltwo ); - xNewKey = xLoaderKey->createKey( ::rtl::OUString::createFromAscii("Pattern") ); - xNewKey->setAsciiValue( ::rtl::OUString::createFromAscii("private:factory/sdatabase") ); + xNewKey = xLoaderKey->createKey( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Pattern")) ); + xNewKey->setAsciiValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:factory/sdatabase")) ); } // ----------------------------------------------------------------------------- +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/makefile.mk b/dbaccess/source/filter/xml/makefile.mk deleted file mode 100644 index e36173f5abac..000000000000 --- a/dbaccess/source/filter/xml/makefile.mk +++ /dev/null @@ -1,122 +0,0 @@ -#************************************************************************* -# -# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -# -# Copyright 2000, 2010 Oracle and/or its affiliates. -# -# OpenOffice.org - a multi-platform office productivity suite -# -# 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. -# -#************************************************************************* - -PRJ=..$/..$/.. -PRJINC=$(PRJ)$/source -PRJNAME=dbaccess -TARGET=dbaxml - -ENABLE_EXCEPTIONS=TRUE - -# --- Settings ---------------------------------- - -.INCLUDE : settings.mk - -# --- Files ------------------------------------- - -SLOFILES= $(SLO)$/xmlfilter.obj \ - $(SLO)$/dbloader2.obj \ - $(SLO)$/xmlDatabase.obj \ - $(SLO)$/xmlDataSource.obj \ - $(SLO)$/xmlTableFilterPattern.obj \ - $(SLO)$/xmlTableFilterList.obj \ - $(SLO)$/xmlDataSourceInfo.obj \ - $(SLO)$/xmlDataSourceSetting.obj \ - $(SLO)$/xmlDataSourceSettings.obj \ - $(SLO)$/xmlDocuments.obj \ - $(SLO)$/xmlComponent.obj \ - $(SLO)$/xmlHierarchyCollection.obj \ - $(SLO)$/xmlLogin.obj \ - $(SLO)$/xmlExport.obj \ - $(SLO)$/xmlQuery.obj \ - $(SLO)$/xmlTable.obj \ - $(SLO)$/xmlColumn.obj \ - $(SLO)$/xmlStyleImport.obj \ - $(SLO)$/xmlHelper.obj \ - $(SLO)$/xmlAutoStyle.obj \ - $(SLO)$/xmlConnectionData.obj \ - $(SLO)$/xmlDatabaseDescription.obj \ - $(SLO)$/xmlFileBasedDatabase.obj \ - $(SLO)$/xmlServerDatabase.obj \ - $(SLO)$/xmlConnectionResource.obj \ - $(SLO)$/xmlservices.obj - -# --- Library ----------------------------------- -LIB1TARGET=$(SLB)$/dba_flt.lib -LIB1FILES=\ - $(SLB)$/fltshared.lib \ - $(SLB)$/$(TARGET).lib - -SHL1TARGET=$(TARGET)$(DLLPOSTFIX) - -SHL1STDLIBS=\ - $(XMLOFFLIB) \ - $(VCLLIB) \ - $(TOOLSLIB) \ - $(TKLIB) \ - $(COMPHELPERLIB) \ - $(CPPUHELPERLIB) \ - $(CPPULIB) \ - $(SFXLIB) \ - $(SVLLIB) \ - $(DBTOOLSLIB) \ - $(UNOTOOLSLIB) \ - $(SO2LIB) \ - $(SALLIB) - -.IF "$(GUI)"=="OS2" -SHL1STDLIBS+= \ - idba.lib -.ELIF "$(GUI)"!="WNT" || "$(COM)"=="GCC" -SHL1STDLIBS+= \ - -ldba$(DLLPOSTFIX) -.ELSE -SHL1STDLIBS+= \ - idba.lib -.ENDIF - - -SHL1DEPN= -SHL1LIBS=$(LIB1TARGET) -SHL1IMPLIB= i$(SHL1TARGET) -# SHL1LIBS= $(SLB)$/$(TARGET).lib -SHL1VERSIONMAP=$(SOLARENV)/src/component.map -SHL1DEF= $(MISC)$/$(SHL1TARGET).def - -DEF1NAME=$(SHL1TARGET) - -# --- Targets ---------------------------------- - -.INCLUDE : target.mk - -ALLTAR : $(MISC)/dbaxml.component - -$(MISC)/dbaxml.component .ERRREMOVE : $(SOLARENV)/bin/createcomponent.xslt \ - dbaxml.component - $(XSLTPROC) --nonet --stringparam uri \ - '$(COMPONENTPREFIX_BASIS_NATIVE)$(SHL1TARGETN:f)' -o $@ \ - $(SOLARENV)/bin/createcomponent.xslt dbaxml.component diff --git a/dbaccess/source/filter/xml/xmlAutoStyle.cxx b/dbaccess/source/filter/xml/xmlAutoStyle.cxx index 351ed7b7d075..0d0f2ba75381 100644 --- a/dbaccess/source/filter/xml/xmlAutoStyle.cxx +++ b/dbaccess/source/filter/xml/xmlAutoStyle.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,21 +28,11 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_dbaxml.hxx" -#ifndef DBA_XMLAUTOSTYLE_HXX #include "xmlAutoStyle.hxx" -#endif -#ifndef DBA_XMLHELPER_HXX #include "xmlHelper.hxx" -#endif -#ifndef DBA_XMLEXPORT_HXX #include "xmlExport.hxx" -#endif -#ifndef _XMLOFF_FAMILIES_HXX_ #include <xmloff/families.hxx> -#endif -#ifndef _TOOLS_DEBUG_HXX #include <tools/debug.hxx> -#endif namespace dbaxml { using namespace ::com::sun::star::uno; @@ -107,3 +98,5 @@ OXMLAutoStylePoolP::~OXMLAutoStylePoolP() //---------------------------------------------------------------------------- } // namespace dbaxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlAutoStyle.hxx b/dbaccess/source/filter/xml/xmlAutoStyle.hxx index b966d68908d5..6d3da1fa34aa 100644 --- a/dbaccess/source/filter/xml/xmlAutoStyle.hxx +++ b/dbaccess/source/filter/xml/xmlAutoStyle.hxx @@ -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. @@ -26,18 +27,10 @@ ************************************************************************/ #ifndef DBA_XMLAUTOSTYLE_HXX #define DBA_XMLAUTOSTYLE_HXX -#ifndef _XMLOFF_PROPMAPPINGTYPES_HXX #include <xmloff/maptype.hxx> -#endif -#ifndef _XMLOFF_XMLASTPLP_HXX #include <xmloff/xmlaustp.hxx> -#endif -#ifndef _XMLOFF_XMLTYPES_HXX #include <xmloff/xmltypes.hxx> -#endif -#ifndef _XMLOFF_PROPERTYSETMAPPER_HXX #include <xmloff/xmlprmap.hxx> -#endif namespace dbaxml { @@ -64,3 +57,4 @@ namespace dbaxml // ----------------------------------------------------------------------------- #endif // DBA_XMLAUTOSTYLE_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ 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: */ diff --git a/dbaccess/source/filter/xml/xmlColumn.hxx b/dbaccess/source/filter/xml/xmlColumn.hxx index d4b9c9f5bc3b..e417e0398825 100644 --- a/dbaccess/source/filter/xml/xmlColumn.hxx +++ b/dbaccess/source/filter/xml/xmlColumn.hxx @@ -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. @@ -64,3 +65,5 @@ namespace dbaxml // ----------------------------------------------------------------------------- #endif // DBA_XMLCOLUMN_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlComponent.cxx b/dbaccess/source/filter/xml/xmlComponent.cxx index 9426a097adc3..88b08533e439 100644 --- a/dbaccess/source/filter/xml/xmlComponent.cxx +++ b/dbaccess/source/filter/xml/xmlComponent.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,39 +28,17 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_dbaxml.hxx" -#ifndef DBA_XMLCOMPONENT_HXX #include "xmlComponent.hxx" -#endif -#ifndef DBA_XMLFILTER_HXX #include "xmlfilter.hxx" -#endif -#ifndef _XMLOFF_XMLTOKEN_HXX #include <xmloff/xmltoken.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_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 -#ifndef _TOOLS_DEBUG_HXX #include <tools/debug.hxx> -#endif -#ifndef TOOLS_DIAGNOSE_EX_H #include <tools/diagnose_ex.h> -#endif namespace dbaxml { @@ -153,3 +132,5 @@ OXMLComponent::~OXMLComponent() //---------------------------------------------------------------------------- } // namespace dbaxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlComponent.hxx b/dbaccess/source/filter/xml/xmlComponent.hxx index 2523bad6d112..1d950173b1b4 100644 --- a/dbaccess/source/filter/xml/xmlComponent.hxx +++ b/dbaccess/source/filter/xml/xmlComponent.hxx @@ -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,12 +28,8 @@ #ifndef DBA_XMLCOMPONENT_HXX #define DBA_XMLCOMPONENT_HXX -#ifndef _XMLOFF_XMLICTXT_HXX #include <xmloff/xmlictxt.hxx> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include <com/sun/star/container/XNameAccess.hpp> -#endif namespace dbaxml @@ -62,3 +59,5 @@ namespace dbaxml // ----------------------------------------------------------------------------- #endif // DBA_XMLCOMPONENT_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlConnectionData.cxx b/dbaccess/source/filter/xml/xmlConnectionData.cxx index fbf909a7a7af..c843312e633e 100644 --- a/dbaccess/source/filter/xml/xmlConnectionData.cxx +++ b/dbaccess/source/filter/xml/xmlConnectionData.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,37 +28,19 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_dbaxml.hxx" -#ifndef DBA_XMLCONNECTIONDATA_HXX_INCLUDED #include "xmlConnectionData.hxx" -#endif -#ifndef DBA_XMLLOGIN_HXX #include "xmlLogin.hxx" -#endif -#ifndef DBA_XMLTABLEFILTERLIST_HXX #include "xmlTableFilterList.hxx" -#endif -#ifndef DBA_XMLFILTER_HXX #include "xmlfilter.hxx" -#endif -#ifndef _XMLOFF_XMLTOKEN_HXX #include <xmloff/xmltoken.hxx> -#endif -#ifndef _XMLOFF_XMLNMSPE_HXX #include <xmloff/xmlnmspe.hxx> -#endif -#ifndef _XMLOFF_NMSPMAP_HXX #include <xmloff/nmspmap.hxx> -#endif #include "xmlEnums.hxx" #include "xmlDatabaseDescription.hxx" #include "xmlConnectionResource.hxx" #include "xmlstrings.hrc" -#ifndef _TOOLS_DEBUG_HXX #include <tools/debug.hxx> -#endif -#ifndef TOOLS_DIAGNOSE_EX_H #include <tools/diagnose_ex.h> -#endif namespace dbaxml { @@ -116,7 +99,7 @@ SvXMLImportContext* OXMLConnectionData::CreateChildContext( if ( !m_bFoundOne ) { m_bFoundOne = true; - OSL_ENSURE(0,"Not supported yet!"); + OSL_FAIL("Not supported yet!"); } break; } @@ -135,3 +118,5 @@ ODBFilter& OXMLConnectionData::GetOwnImport() //---------------------------------------------------------------------------- } // namespace dbaxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlConnectionData.hxx b/dbaccess/source/filter/xml/xmlConnectionData.hxx index 6dac18107c30..2cf32047c99c 100644 --- a/dbaccess/source/filter/xml/xmlConnectionData.hxx +++ b/dbaccess/source/filter/xml/xmlConnectionData.hxx @@ -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,12 +28,8 @@ #ifndef DBA_XMLCONNECTIONDATA_HXX_INCLUDED #define DBA_XMLCONNECTIONDATA_HXX_INCLUDED -#ifndef _XMLOFF_XMLICTXT_HXX #include <xmloff/xmlictxt.hxx> -#endif -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include <com/sun/star/beans/PropertyValue.hpp> -#endif #include <vector> namespace dbaxml @@ -58,3 +55,5 @@ namespace dbaxml // ----------------------------------------------------------------------------- #endif // DBA_XMLCONNECTIONDATA_HXX_INCLUDED + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlConnectionResource.cxx b/dbaccess/source/filter/xml/xmlConnectionResource.cxx index bd3756bbd4eb..1f490360dd61 100644 --- a/dbaccess/source/filter/xml/xmlConnectionResource.cxx +++ b/dbaccess/source/filter/xml/xmlConnectionResource.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,33 +28,15 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_dbaxml.hxx" -#ifndef DBA_XMLCONNECTIONRESOURCE_HXX_INCLUDED #include "xmlConnectionResource.hxx" -#endif -#ifndef DBA_XMLFILTER_HXX #include "xmlfilter.hxx" -#endif -#ifndef _XMLOFF_XMLTOKEN_HXX #include <xmloff/xmltoken.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 _TOOLS_DEBUG_HXX #include <tools/debug.hxx> -#endif -#ifndef TOOLS_DIAGNOSE_EX_H #include <tools/diagnose_ex.h> -#endif namespace dbaxml { @@ -94,7 +77,7 @@ OXMLConnectionResource::OXMLConnectionResource( ODBFilter& rImport, { xDataSource->setPropertyValue(PROPERTY_URL,makeAny(sValue)); } - catch(Exception) + catch(const Exception&) { DBG_UNHANDLED_EXCEPTION(); } @@ -128,3 +111,5 @@ OXMLConnectionResource::~OXMLConnectionResource() //---------------------------------------------------------------------------- } // namespace dbaxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlConnectionResource.hxx b/dbaccess/source/filter/xml/xmlConnectionResource.hxx index 2645dba69bb2..ea6be03655fb 100644 --- a/dbaccess/source/filter/xml/xmlConnectionResource.hxx +++ b/dbaccess/source/filter/xml/xmlConnectionResource.hxx @@ -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,12 +28,8 @@ #ifndef DBA_XMLCONNECTIONRESOURCE_HXX_INCLUDED #define DBA_XMLCONNECTIONRESOURCE_HXX_INCLUDED -#ifndef _XMLOFF_XMLICTXT_HXX #include <xmloff/xmlictxt.hxx> -#endif -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include <com/sun/star/beans/PropertyValue.hpp> -#endif #include <vector> namespace dbaxml @@ -53,3 +50,4 @@ namespace dbaxml #endif // DBA_XMLCONNECTIONRESOURCE_HXX_INCLUDED +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlDataSource.cxx b/dbaccess/source/filter/xml/xmlDataSource.cxx index 7fe9ee914ba6..62431e9b01a4 100644 --- a/dbaccess/source/filter/xml/xmlDataSource.cxx +++ b/dbaccess/source/filter/xml/xmlDataSource.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,48 +28,20 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_dbaxml.hxx" -#ifndef DBA_XMLDATASOURCE_HXX #include "xmlDataSource.hxx" -#endif -#ifndef DBA_XMLLOGIN_HXX #include "xmlLogin.hxx" -#endif -#ifndef DBA_XMLTABLEFILTERLIST_HXX #include "xmlTableFilterList.hxx" -#endif -#ifndef DBA_XMLDATASOURCEINFO_HXX #include "xmlDataSourceInfo.hxx" -#endif -#ifndef DBA_XMLDATASOURCESETTINGS_HXX #include "xmlDataSourceSettings.hxx" -#endif -#ifndef DBA_XMLDATASOURCESETTING_HXX #include "xmlDataSourceSetting.hxx" -#endif -#ifndef DBA_XMLFILTER_HXX #include "xmlfilter.hxx" -#endif -#ifndef _XMLOFF_XMLTOKEN_HXX #include <xmloff/xmltoken.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 _TOOLS_DEBUG_HXX #include <tools/debug.hxx> -#endif -#ifndef TOOLS_DIAGNOSE_EX_H #include <tools/diagnose_ex.h> -#endif #include "xmlConnectionData.hxx" namespace dbaxml @@ -115,7 +88,7 @@ OXMLDataSource::OXMLDataSource( ODBFilter& rImport, { xDataSource->setPropertyValue(PROPERTY_URL,makeAny(sValue)); } - catch(Exception) + catch(const Exception&) { DBG_UNHANDLED_EXCEPTION(); } @@ -126,7 +99,7 @@ OXMLDataSource::OXMLDataSource( ODBFilter& rImport, xDataSource->setPropertyValue(PROPERTY_SUPPRESSVERSIONCL,makeAny(sValue == s_sTRUE ? sal_True : sal_False)); bFoundSuppressVersionColumns = true; } - catch(Exception) + catch(const Exception&) { DBG_UNHANDLED_EXCEPTION(); } @@ -173,13 +146,13 @@ OXMLDataSource::OXMLDataSource( ODBFilter& rImport, break; case XML_TOK_BOOLEAN_COMPARISON_MODE: aProperty.Name = PROPERTY_BOOLEANCOMPARISONMODE; - if ( sValue.equalsAscii("equal-integer") ) + if ( sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("equal-integer")) ) aProperty.Value <<= sal_Int32(0); - else if ( sValue.equalsAscii("is-boolean") ) + else if ( sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("is-boolean")) ) aProperty.Value <<= sal_Int32(1); - else if ( sValue.equalsAscii("equal-boolean") ) + else if ( sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("equal-boolean")) ) aProperty.Value <<= sal_Int32(2); - else if ( sValue.equalsAscii("equal-use-only-zero") ) + else if ( sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("equal-use-only-zero")) ) aProperty.Value <<= sal_Int32(3); break; case XML_TOK_USE_CATALOG: @@ -230,7 +203,7 @@ OXMLDataSource::OXMLDataSource( ODBFilter& rImport, { xDataSource->setPropertyValue(PROPERTY_SUPPRESSVERSIONCL,makeAny(sal_True)); } - catch(Exception) + catch(const Exception&) { DBG_UNHANDLED_EXCEPTION(); } @@ -307,3 +280,5 @@ ODBFilter& OXMLDataSource::GetOwnImport() //---------------------------------------------------------------------------- } // namespace dbaxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlDataSource.hxx b/dbaccess/source/filter/xml/xmlDataSource.hxx index 2b6a640f6576..87038f05ef30 100644 --- a/dbaccess/source/filter/xml/xmlDataSource.hxx +++ b/dbaccess/source/filter/xml/xmlDataSource.hxx @@ -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,12 +28,8 @@ #ifndef DBA_XMLDATASOURCE_HXX #define DBA_XMLDATASOURCE_HXX -#ifndef _XMLOFF_XMLICTXT_HXX #include <xmloff/xmlictxt.hxx> -#endif -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include <com/sun/star/beans/PropertyValue.hpp> -#endif #include <vector> namespace dbaxml @@ -64,3 +61,5 @@ namespace dbaxml // ----------------------------------------------------------------------------- #endif // DBA_XMLDATASOURCE_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx b/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx index 440703b967f5..c1039f76c82b 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx +++ b/dbaccess/source/filter/xml/xmlDataSourceInfo.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,36 +28,16 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_dbaxml.hxx" -#ifndef DBA_XMLDATASOURCEINFO_HXX #include "xmlDataSourceInfo.hxx" -#endif -#ifndef DBA_XMLDATASOURCE_HXX #include "xmlDataSource.hxx" -#endif -#ifndef DBA_XMLFILTER_HXX #include "xmlfilter.hxx" -#endif -#ifndef _XMLOFF_XMLTOKEN_HXX #include <xmloff/xmltoken.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_BEANS_PROPERTYVALUE_HPP_ #include <com/sun/star/beans/PropertyValue.hpp> -#endif -#ifndef _TOOLS_DEBUG_HXX #include <tools/debug.hxx> -#endif #include <vector> namespace dbaxml @@ -150,7 +131,7 @@ OXMLDataSourceInfo::OXMLDataSourceInfo( ODBFilter& rImport aProperty.Name = INFO_THOUSANDSDELIMITER; aProperty.Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(",")); rImport.addInfo(aProperty); - } // if ( !bFoundThousand ) + } } if ( XML_TOK_FONT_CHARSET == _nToken && !bFoundCharset ) { @@ -171,3 +152,5 @@ OXMLDataSourceInfo::~OXMLDataSourceInfo() //---------------------------------------------------------------------------- } // namespace dbaxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx b/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx index 86832af5de77..89f9dde6a242 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx +++ b/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx @@ -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,9 +28,7 @@ #ifndef DBA_XMLDATASOURCEINFO_HXX #define DBA_XMLDATASOURCEINFO_HXX -#ifndef _XMLOFF_XMLICTXT_HXX #include <xmloff/xmlictxt.hxx> -#endif namespace dbaxml { @@ -50,3 +49,5 @@ namespace dbaxml // ----------------------------------------------------------------------------- #endif // DBA_XMLDATASOURCEINFO_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx b/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx index 3732d3a6ca78..2be63bdd00d5 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceSetting.cxx +++ b/dbaccess/source/filter/xml/xmlDataSourceSetting.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,36 +28,16 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_dbaxml.hxx" -#ifndef DBA_XMLDATASOURCESETTING_HXX #include "xmlDataSourceSetting.hxx" -#endif -#ifndef DBA_XMLDATASOURCE_HXX #include "xmlDataSource.hxx" -#endif -#ifndef _XMLOFF_XMLUCONV_HXX #include <xmloff/xmluconv.hxx> -#endif -#ifndef DBA_XMLFILTER_HXX #include "xmlfilter.hxx" -#endif -#ifndef _XMLOFF_XMLTOKEN_HXX #include <xmloff/xmltoken.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 _TOOLS_DEBUG_HXX #include <tools/debug.hxx> -#endif namespace dbaxml { @@ -92,7 +73,7 @@ OXMLDataSourceSetting::OXMLDataSourceSetting( ODBFilter& rImport switch( rTokenMap.Get( nPrefix, sLocalName ) ) { case XML_TOK_DATA_SOURCE_SETTING_IS_LIST: - m_bIsList = sValue.equalsAscii("true"); + m_bIsList = sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("true")); break; case XML_TOK_DATA_SOURCE_SETTING_TYPE: { @@ -207,7 +188,7 @@ Any OXMLDataSourceSetting::convertString(const ::com::sun::star::uno::Type& _rEx { case TypeClass_BOOLEAN: // sal_Bool { - sal_Bool bValue; + bool bValue; #if OSL_DEBUG_LEVEL > 0 sal_Bool bSuccess = #endif @@ -239,7 +220,7 @@ Any OXMLDataSourceSetting::convertString(const ::com::sun::star::uno::Type& _rEx } case TypeClass_HYPER: { - OSL_ENSURE(sal_False, "OXMLDataSourceSetting::convertString: 64-bit integers not implemented yet!"); + OSL_FAIL("OXMLDataSourceSetting::convertString: 64-bit integers not implemented yet!"); } break; case TypeClass_DOUBLE: @@ -260,7 +241,7 @@ Any OXMLDataSourceSetting::convertString(const ::com::sun::star::uno::Type& _rEx aReturn <<= _rReadCharacters; break; default: - OSL_ENSURE(sal_False, "OXMLDataSourceSetting::convertString: invalid type class!"); + OSL_FAIL("OXMLDataSourceSetting::convertString: invalid type class!"); } return aReturn; @@ -269,3 +250,5 @@ Any OXMLDataSourceSetting::convertString(const ::com::sun::star::uno::Type& _rEx //---------------------------------------------------------------------------- } // namespace dbaxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx b/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx index e1e0891069a8..4740a7834306 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx +++ b/dbaccess/source/filter/xml/xmlDataSourceSetting.hxx @@ -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,15 +28,9 @@ #ifndef DBA_XMLDATASOURCESETTING_HXX #define DBA_XMLDATASOURCESETTING_HXX -#ifndef _XMLOFF_XMLICTXT_HXX #include <xmloff/xmlictxt.hxx> -#endif -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include <com/sun/star/beans/PropertyValue.hpp> -#endif -#ifndef _COM_SUN_STAR_UNO_SEQUENCE_HXX_ #include <com/sun/star/uno/Sequence.hxx> -#endif namespace dbaxml { @@ -79,3 +74,5 @@ namespace dbaxml // ----------------------------------------------------------------------------- #endif // DBA_XMLDATASOURCESETTING_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx b/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx index b52abdbb5b3e..c4458924452c 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceSettings.cxx +++ b/dbaccess/source/filter/xml/xmlDataSourceSettings.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,36 +28,16 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_dbaxml.hxx" -#ifndef DBA_XMLDATASOURCESETTINGS_HXX #include "xmlDataSourceSettings.hxx" -#endif -#ifndef DBA_XMLDATASOURCESETTING_HXX #include "xmlDataSourceSetting.hxx" -#endif -#ifndef DBA_XMLFILTER_HXX #include "xmlfilter.hxx" -#endif -#ifndef _XMLOFF_XMLTOKEN_HXX #include <xmloff/xmltoken.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_BEANS_PROPERTYVALUE_HPP_ #include <com/sun/star/beans/PropertyValue.hpp> -#endif -#ifndef _TOOLS_DEBUG_HXX #include <tools/debug.hxx> -#endif #include <vector> @@ -112,3 +93,5 @@ ODBFilter& OXMLDataSourceSettings::GetOwnImport() //---------------------------------------------------------------------------- } // namespace dbaxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlDataSourceSettings.hxx b/dbaccess/source/filter/xml/xmlDataSourceSettings.hxx index df9690dafd0f..67d3f02e432d 100644 --- a/dbaccess/source/filter/xml/xmlDataSourceSettings.hxx +++ b/dbaccess/source/filter/xml/xmlDataSourceSettings.hxx @@ -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,9 +28,7 @@ #ifndef DBA_XMLDATASOURCESETTINGS_HXX #define DBA_XMLDATASOURCESETTINGS_HXX -#ifndef _XMLOFF_XMLICTXT_HXX #include <xmloff/xmlictxt.hxx> -#endif namespace dbaxml { @@ -51,3 +50,5 @@ namespace dbaxml // ----------------------------------------------------------------------------- #endif // DBA_XMLDATASOURCESETTINGS_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlDatabase.cxx b/dbaccess/source/filter/xml/xmlDatabase.cxx index 179495869190..6795103be666 100644 --- a/dbaccess/source/filter/xml/xmlDatabase.cxx +++ b/dbaccess/source/filter/xml/xmlDatabase.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. @@ -156,3 +157,5 @@ void OXMLDatabase::EndElement() //---------------------------------------------------------------------------- } // namespace dbaxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlDatabase.hxx b/dbaccess/source/filter/xml/xmlDatabase.hxx index 3a41f3d01c7f..ed70500fdca3 100644 --- a/dbaccess/source/filter/xml/xmlDatabase.hxx +++ b/dbaccess/source/filter/xml/xmlDatabase.hxx @@ -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,9 +28,7 @@ #ifndef DBA_XMLDATABASE_HXX #define DBA_XMLDATABASE_HXX -#ifndef _XMLOFF_XMLICTXT_HXX #include <xmloff/xmlictxt.hxx> -#endif namespace dbaxml { @@ -54,3 +53,5 @@ namespace dbaxml // ----------------------------------------------------------------------------- #endif // DBA_XMLDATABASE_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx b/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx index 6c423b26d4ad..efe2e7237c6c 100644 --- a/dbaccess/source/filter/xml/xmlDatabaseDescription.cxx +++ b/dbaccess/source/filter/xml/xmlDatabaseDescription.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,34 +28,18 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_dbaxml.hxx" -#ifndef DBA_XMLDATABASEDESCRIPTION_HXX_INCLUDED #include "xmlDatabaseDescription.hxx" -#endif -#ifndef DBA_XMLLOGIN_HXX #include "xmlLogin.hxx" -#endif -#ifndef DBA_XMLFILTER_HXX #include "xmlfilter.hxx" -#endif -#ifndef _XMLOFF_XMLTOKEN_HXX #include <xmloff/xmltoken.hxx> -#endif -#ifndef _XMLOFF_XMLNMSPE_HXX #include <xmloff/xmlnmspe.hxx> -#endif -#ifndef _XMLOFF_NMSPMAP_HXX #include <xmloff/nmspmap.hxx> -#endif #include "xmlEnums.hxx" #include "xmlFileBasedDatabase.hxx" #include "xmlServerDatabase.hxx" #include "xmlstrings.hrc" -#ifndef _TOOLS_DEBUG_HXX #include <tools/debug.hxx> -#endif -#ifndef TOOLS_DIAGNOSE_EX_H #include <tools/diagnose_ex.h> -#endif namespace dbaxml { @@ -120,3 +105,5 @@ ODBFilter& OXMLDatabaseDescription::GetOwnImport() //---------------------------------------------------------------------------- } // namespace dbaxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx b/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx index 03c4cd94a8ec..6a056412e57a 100644 --- a/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx +++ b/dbaccess/source/filter/xml/xmlDatabaseDescription.hxx @@ -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,12 +28,8 @@ #ifndef DBA_XMLDATABASEDESCRIPTION_HXX_INCLUDED #define DBA_XMLDATABASEDESCRIPTION_HXX_INCLUDED -#ifndef _XMLOFF_XMLICTXT_HXX #include <xmloff/xmlictxt.hxx> -#endif -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include <com/sun/star/beans/PropertyValue.hpp> -#endif #include <vector> namespace dbaxml @@ -58,3 +55,5 @@ namespace dbaxml // ----------------------------------------------------------------------------- #endif // DBA_XMLDATABASEDESCRIPTION_HXX_INCLUDED + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlDocuments.cxx b/dbaccess/source/filter/xml/xmlDocuments.cxx index 0cdd485a9787..6a0251a48420 100644 --- a/dbaccess/source/filter/xml/xmlDocuments.cxx +++ b/dbaccess/source/filter/xml/xmlDocuments.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,39 +28,17 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_dbaxml.hxx" -#ifndef DBA_XMLDOCUMENTS_HXX #include "xmlDocuments.hxx" -#endif -#ifndef DBA_XMLFILTER_HXX #include "xmlfilter.hxx" -#endif -#ifndef _XMLOFF_XMLTOKEN_HXX #include <xmloff/xmltoken.hxx> -#endif -#ifndef _XMLOFF_XMLNMSPE_HXX #include <xmloff/xmlnmspe.hxx> -#endif -#ifndef DBA_XMLQUERY_HXX #include "xmlQuery.hxx" -#endif -#ifndef DBA_XMLTABLE_HXX #include "xmlTable.hxx" -#endif -#ifndef DBA_XMLCOMPONENT_HXX #include "xmlComponent.hxx" -#endif -#ifndef DBA_XMLHIERARCHYCOLLECTION_HXX #include "xmlHierarchyCollection.hxx" -#endif -#ifndef DBA_XMLENUMS_HXX #include "xmlEnums.hxx" -#endif -#ifndef DBACCESS_SHARED_XMLSTRINGS_HRC #include "xmlstrings.hrc" -#endif -#ifndef _TOOLS_DEBUG_HXX #include <tools/debug.hxx> -#endif namespace dbaxml { @@ -126,7 +105,6 @@ SvXMLImportContext* OXMLDocuments::CreateChildContext( GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); pContext = new OXMLComponent( GetOwnImport(), nPrefix, rLocalName,xAttrList,m_xContainer,m_sComponentServiceName ); break; - // case XML_TOK_QUERY_COLLECTION: case XML_TOK_COMPONENT_COLLECTION: GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); pContext = new OXMLHierarchyCollection( GetOwnImport(), nPrefix, rLocalName,xAttrList,m_xContainer,m_sCollectionServiceName,m_sComponentServiceName ); @@ -148,3 +126,5 @@ ODBFilter& OXMLDocuments::GetOwnImport() //---------------------------------------------------------------------------- } // namespace dbaxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlDocuments.hxx b/dbaccess/source/filter/xml/xmlDocuments.hxx index 26444e9e5454..1a84dfa4c94e 100644 --- a/dbaccess/source/filter/xml/xmlDocuments.hxx +++ b/dbaccess/source/filter/xml/xmlDocuments.hxx @@ -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,15 +28,9 @@ #ifndef DBA_XMLDOCUMENTS_HXX #define DBA_XMLDOCUMENTS_HXX -#ifndef _XMLOFF_XMLICTXT_HXX #include <xmloff/xmlictxt.hxx> -#endif -#ifndef DBA_XMLENUMS_HXX #include "xmlEnums.hxx" -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include <com/sun/star/container/XNameAccess.hpp> -#endif namespace dbaxml { @@ -77,3 +72,5 @@ namespace dbaxml // ----------------------------------------------------------------------------- #endif // DBA_XMLDOCUMENTS_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlEnums.hxx b/dbaccess/source/filter/xml/xmlEnums.hxx index 2298b13c58e1..2248050d09b3 100644 --- a/dbaccess/source/filter/xml/xmlEnums.hxx +++ b/dbaccess/source/filter/xml/xmlEnums.hxx @@ -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. @@ -170,3 +171,5 @@ namespace dbaxml } // namespace dbaxml // ----------------------------------------------------------------------------- #endif // DBA_XMLENUMS_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ 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: */ diff --git a/dbaccess/source/filter/xml/xmlExport.hxx b/dbaccess/source/filter/xml/xmlExport.hxx index 7c1b64952bed..8dc662f85705 100644 --- a/dbaccess/source/filter/xml/xmlExport.hxx +++ b/dbaccess/source/filter/xml/xmlExport.hxx @@ -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. @@ -28,70 +29,28 @@ #ifndef DBA_XMLEXPORT_HXX #define DBA_XMLEXPORT_HXX -#ifndef _COM_SUN_STAR_CONTAINER_XNAMED_HPP_ #include <com/sun/star/container/XNamed.hpp> -#endif -#ifndef _COM_SUN_STAR_DOCUMENT_XFILTER_HPP_ #include <com/sun/star/document/XFilter.hpp> -#endif -#ifndef _COM_SUN_STAR_DOCUMENT_XIMPORTER_HPP_ #include <com/sun/star/document/XImporter.hpp> -#endif -#ifndef _COM_SUN_STAR_DOCUMENT_XEXPORTER_HPP_ #include <com/sun/star/document/XExporter.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XINITIALIZATION_HPP_ #include <com/sun/star/lang/XInitialization.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XCOMPONENT_HPP_ #include <com/sun/star/lang/XComponent.hpp> -#endif -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include <cppuhelper/implbase1.hxx> -#endif -#ifndef _CPPUHELPER_IMPLBASE5_HXX_ #include <cppuhelper/implbase5.hxx> -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif -#ifndef _COM_SUN_STAR_IO_XACTIVEDATASOURCE_HPP_ #include <com/sun/star/io/XActiveDataSource.hpp> -#endif -#ifndef _OSL_DIAGNOSE_H_ #include <osl/diagnose.h> -#endif -#ifndef _UNOTOOLS_TEMPFILE_HXX #include <unotools/tempfile.hxx> -#endif -#ifndef _UNOTOOLS_LOCALFILEHELPER_HXX #include <unotools/localfilehelper.hxx> -#endif -#ifndef _UNTOOLS_UCBSTREAMHELPER_HXX #include <unotools/ucbstreamhelper.hxx> -#endif -#ifndef _XMLOFF_XMLEXP_HXX #include <xmloff/xmlexp.hxx> -#endif -#ifndef _XMLOFF_XMLIMP_HXX #include <xmloff/xmlimp.hxx> -#endif -#ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" -#endif #include "dsntypes.hxx" -#ifndef _COMPHELPER_STLTYPES_HXX_ #include <comphelper/stl_types.hxx> -#endif -#ifndef _COM_SUN_STAR_SDBCX_XCOLUMNSSUPPLIER_HPP_ #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> -#endif #include <memory> @@ -241,3 +200,5 @@ public: } // dbaxml // ----------------------------------------------------------------------------- #endif // DBA_XMLEXPORT_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx b/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx index a0b5e18f3904..130d1e04b525 100644 --- a/dbaccess/source/filter/xml/xmlFileBasedDatabase.cxx +++ b/dbaccess/source/filter/xml/xmlFileBasedDatabase.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,33 +28,15 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_dbaxml.hxx" -#ifndef DBA_XMLFILEBASEDDATABASE_HXX_INCLUDED #include "xmlFileBasedDatabase.hxx" -#endif -#ifndef DBA_XMLFILTER_HXX #include "xmlfilter.hxx" -#endif -#ifndef _XMLOFF_XMLTOKEN_HXX #include <xmloff/xmltoken.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 _TOOLS_DEBUG_HXX #include <tools/debug.hxx> -#endif -#ifndef TOOLS_DIAGNOSE_EX_H #include <tools/diagnose_ex.h> -#endif #include <comphelper/sequence.hxx> #include <svl/filenotation.hxx> #include <unotools/pathoptions.hxx> @@ -134,7 +117,7 @@ OXMLFileBasedDatabase::OXMLFileBasedDatabase( ODBFilter& rImport, { xDataSource->setPropertyValue(PROPERTY_URL,makeAny(sURL)); } - catch(Exception) + catch(const Exception&) { DBG_UNHANDLED_EXCEPTION(); } @@ -151,3 +134,5 @@ OXMLFileBasedDatabase::~OXMLFileBasedDatabase() //---------------------------------------------------------------------------- } // namespace dbaxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx b/dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx index 2e5a957ebad9..9f58f4b0f03f 100644 --- a/dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx +++ b/dbaccess/source/filter/xml/xmlFileBasedDatabase.hxx @@ -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,12 +28,8 @@ #ifndef DBA_XMLFILEBASEDDATABASE_HXX_INCLUDED #define DBA_XMLFILEBASEDDATABASE_HXX_INCLUDED -#ifndef _XMLOFF_XMLICTXT_HXX #include <xmloff/xmlictxt.hxx> -#endif -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include <com/sun/star/beans/PropertyValue.hpp> -#endif #include <vector> namespace dbaxml @@ -52,3 +49,5 @@ namespace dbaxml // ----------------------------------------------------------------------------- #endif // DBA_XMLFILEBASEDDATABASE_HXX_INCLUDED + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlHelper.cxx b/dbaccess/source/filter/xml/xmlHelper.cxx index 357baca253d6..a1418593ad0f 100644 --- a/dbaccess/source/filter/xml/xmlHelper.cxx +++ b/dbaccess/source/filter/xml/xmlHelper.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,39 +28,17 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_dbaxml.hxx" -#ifndef DBA_XMLHELPER_HXX #include "xmlHelper.hxx" -#endif -#ifndef _XMLOFF_XMLNMSPE_HXX #include <xmloff/xmlnmspe.hxx> -#endif -#ifndef _XMLOFF_XMLTOKEN_HXX #include <xmloff/xmltoken.hxx> -#endif -#ifndef _COM_SUN_STAR_AWT_TEXTALIGN_HPP_ #include <com/sun/star/awt/TextAlign.hpp> -#endif -#ifndef DBACCESS_SHARED_XMLSTRINGS_HRC #include "xmlstrings.hrc" -#endif -#ifndef DBA_XMLENUMS_HXX #include "xmlEnums.hxx" -#endif -#ifndef _XMLOFF_CONTEXTID_HXX_ #include <xmloff/contextid.hxx> -#endif -#ifndef _XMLOFF_XMLCONSTANTSPROPERTYHANDLER_HXX #include <xmloff/XMLConstantsPropertyHandler.hxx> -#endif -#ifndef _XMLOFF_XMLEMENT_HXX #include <xmloff/xmlement.hxx> -#endif -#ifndef _COM_SUN_STAR_AWT_TEXTALIGN_HPP_ #include <com/sun/star/awt/TextAlign.hpp> -#endif -#ifndef _TOOLS_DEBUG_HXX #include <tools/debug.hxx> -#endif namespace dbaxml { @@ -112,34 +91,6 @@ UniReference < XMLPropertySetMapper > OXMLHelper::GetTableStylesPropertySetMappe { static const XMLPropertyMapEntry s_aTableStylesProperties[] = { - //MAP_CONST( PROPERTY_FONTNAME, XML_NAMESPACE_STYLE, XML_FONT_NAME, XML_TYPE_STRING, 0 ), - //MAP_CONST( PROPERTY_TEXTCOLOR, XML_NAMESPACE_FO, XML_COLOR, XML_TYPE_COLOR, 0 ), - //MAP_CONST( PROPERTY_TEXTLINECOLOR, XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR, XML_TYPE_TEXT_UNDERLINE_COLOR|MID_FLAG_MULTI_PROPERTY, 0 ), - - //MAP_CONST( PROPERTY_TEXTRELIEF, XML_NAMESPACE_STYLE, XML_FONT_RELIEF, XML_TYPE_TEXT_FONT_RELIEF|MID_FLAG_MULTI_PROPERTY, 0 ), - //MAP_CONST( PROPERTY_TEXTEMPHASIS, XML_NAMESPACE_STYLE, XML_TEXT_EMPHASIZE, XML_TYPE_CONTROL_TEXT_EMPHASIZE, 0 ), - //MAP_CONST( PROPERTY_FONTCHARWIDTH, XML_NAMESPACE_STYLE, XML_FONT_CHAR_WIDTH, XML_TYPE_NUMBER16, 0 ), - //MAP_CONST( PROPERTY_FONTCHARSET, XML_NAMESPACE_STYLE, XML_FONT_CHARSET, XML_TYPE_TEXT_FONTENCODING, 0 ), - //MAP_CONST( PROPERTY_FONTFAMILY, XML_NAMESPACE_STYLE, XML_FONT_FAMILY_GENERIC, XML_TYPE_TEXT_FONTFAMILY, 0 ), - //MAP_CONST( PROPERTY_FONTHEIGHT, XML_NAMESPACE_FO, XML_FONT_SIZE, XML_TYPE_MEASURE16, 0 ), - //MAP_CONST( PROPERTY_FONTKERNING, XML_NAMESPACE_STYLE, XML_LETTER_KERNING, XML_TYPE_BOOL, 0 ), - // - //MAP_CONST( PROPERTY_FONTORIENTATION, XML_NAMESPACE_STYLE, XML_ROTATION_ANGLE, XML_TYPE_ROTATION_ANGLE, 0 ), - //MAP_CONST( PROPERTY_FONTPITCH, XML_NAMESPACE_STYLE, XML_FONT_PITCH, XML_TYPE_TEXT_FONTPITCH, 0 ), - //MAP_CONST( PROPERTY_FONTSLANT, XML_NAMESPACE_FO, XML_FONT_STYLE, XML_TYPE_TEXT_POSTURE, 0 ), - //MAP_CONST_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_STYLE, XML_TYPE_TEXT_CROSSEDOUT_STYLE|MID_FLAG_MERGE_PROPERTY, 0), - //MAP_CONST_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_TYPE, XML_TYPE_TEXT_CROSSEDOUT_TYPE|MID_FLAG_MERGE_PROPERTY, 0), - //MAP_CONST_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_WIDTH, XML_TYPE_TEXT_CROSSEDOUT_WIDTH|MID_FLAG_MERGE_PROPERTY, 0), - //MAP_CONST_ASCII( "CharStrikeout", XML_NAMESPACE_STYLE, XML_TEXT_LINE_THROUGH_TEXT, XML_TYPE_TEXT_CROSSEDOUT_TEXT|MID_FLAG_MERGE_PROPERTY, 0), - //MAP_CONST( PROPERTY_FONTSTYLENAME, XML_NAMESPACE_STYLE, XML_FONT_STYLE_NAME, XML_TYPE_STRING, 0 ), - //MAP_CONST_ASCII( "CharUnderline", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_STYLE, XML_TYPE_TEXT_UNDERLINE_STYLE|MID_FLAG_MERGE_PROPERTY, 0 ), - //MAP_CONST_ASCII( "CharUnderline", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_TYPE, XML_TYPE_TEXT_UNDERLINE_TYPE|MID_FLAG_MERGE_PROPERTY, 0 ), - //MAP_CONST_ASCII( "CharUnderline", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_WIDTH, XML_TYPE_TEXT_UNDERLINE_WIDTH|MID_FLAG_MERGE_PROPERTY, 0 ), - //MAP_CONST_ASCII( "CharUnderlineColor", XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR, XML_TYPE_TEXT_UNDERLINE_COLOR|MID_FLAG_MULTI_PROPERTY, 0 ), - //MAP_CONST_ASCII( "CharUnderlineHasColor",XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_COLOR, XML_TYPE_TEXT_UNDERLINE_HASCOLOR|MID_FLAG_MERGE_ATTRIBUTE, 0 ), - //MAP_CONST( PROPERTY_FONTWEIGHT, XML_NAMESPACE_FO, XML_FONT_WEIGHT, XML_TYPE_TEXT_WEIGHT, 0 ), - //MAP_CONST( PROPERTY_FONTWIDTH, XML_NAMESPACE_STYLE, XML_FONT_WIDTH, XML_TYPE_FONT_WIDTH, 0 ), - //MAP_CONST( PROPERTY_FONTWORDLINEMODE, XML_NAMESPACE_STYLE, XML_TEXT_UNDERLINE_MODE, XML_TYPE_TEXT_LINE_MODE, 0 ), MAP_END() }; UniReference < XMLPropertyHandlerFactory> xFac = new ::xmloff::OControlPropertyHandlerFactory(); @@ -216,3 +167,4 @@ UniReference < XMLPropertySetMapper > OXMLHelper::GetRowStylesPropertySetMapper( // ----------------------------------------------------------------------------- } +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlHelper.hxx b/dbaccess/source/filter/xml/xmlHelper.hxx index 58853f4b1b17..fcc9ca8af74e 100644 --- a/dbaccess/source/filter/xml/xmlHelper.hxx +++ b/dbaccess/source/filter/xml/xmlHelper.hxx @@ -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,15 +28,9 @@ #ifndef DBA_XMLHELPER_HXX #define DBA_XMLHELPER_HXX -#ifndef _XMLOFF_PROPERTYSETMAPPER_HXX #include <xmloff/xmlprmap.hxx> -#endif -#ifndef _XMLOFF_CONTEXTID_HXX_ #include <xmloff/contextid.hxx> -#endif -#ifndef _XMLOFF_FORMS_CONTROLPROPERTYHDL_HXX_ #include <xmloff/controlpropertyhdl.hxx> -#endif #include <memory> @@ -74,3 +69,4 @@ namespace dbaxml // ----------------------------------------------------------------------------- #endif // DBA_XMLHELPER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx b/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx index 0d1ea16f7e52..3e55ab88f4fa 100644 --- a/dbaccess/source/filter/xml/xmlHierarchyCollection.cxx +++ b/dbaccess/source/filter/xml/xmlHierarchyCollection.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,45 +28,19 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_dbaxml.hxx" -#ifndef DBA_XMLHIERARCHYCOLLECTION_HXX #include "xmlHierarchyCollection.hxx" -#endif -#ifndef DBA_XMLCOMPONENT_HXX #include "xmlComponent.hxx" -#endif -#ifndef DBA_XMLQUERY_HXX #include "xmlQuery.hxx" -#endif -#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_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_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 -#ifndef _TOOLS_DEBUG_HXX #include <tools/debug.hxx> -#endif namespace dbaxml @@ -134,7 +109,7 @@ OXMLHierarchyCollection::OXMLHierarchyCollection( ODBFilter& rImport } catch(Exception&) { - OSL_ENSURE(0,"OXMLHierarchyCollection::OXMLHierarchyCollection -> exception catched"); + OSL_FAIL("OXMLHierarchyCollection::OXMLHierarchyCollection -> exception catched"); } } } @@ -169,9 +144,6 @@ SvXMLImportContext* OXMLHierarchyCollection::CreateChildContext( switch( rTokenMap.Get( nPrefix, rLocalName ) ) { -// case XML_TOK_QUERY: -// pContext = new OXMLQuery( GetOwnImport(), nPrefix, rLocalName,xAttrList,m_xContainer ); -// break; case XML_TOK_COMPONENT: GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); pContext = new OXMLComponent( GetOwnImport(), nPrefix, rLocalName,xAttrList,m_xContainer,m_sComponentServiceName ); @@ -180,7 +152,6 @@ SvXMLImportContext* OXMLHierarchyCollection::CreateChildContext( GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); pContext = new OXMLColumn( GetOwnImport(), nPrefix, rLocalName,xAttrList,m_xContainer,m_xTable); break; - // case XML_TOK_QUERY_COLLECTION: case XML_TOK_COMPONENT_COLLECTION: GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); pContext = new OXMLHierarchyCollection( GetOwnImport(), nPrefix, rLocalName,xAttrList,m_xContainer,m_sCollectionServiceName,m_sComponentServiceName); @@ -201,3 +172,5 @@ ODBFilter& OXMLHierarchyCollection::GetOwnImport() //---------------------------------------------------------------------------- } // namespace dbaxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx b/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx index 5bd7f54730df..3d87826a928d 100644 --- a/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx +++ b/dbaccess/source/filter/xml/xmlHierarchyCollection.hxx @@ -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. @@ -73,3 +74,5 @@ namespace dbaxml // ----------------------------------------------------------------------------- #endif // DBA_XMLHIERARCHYCOLLECTION_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlLogin.cxx b/dbaccess/source/filter/xml/xmlLogin.cxx index a672db671d48..cf255778a349 100644 --- a/dbaccess/source/filter/xml/xmlLogin.cxx +++ b/dbaccess/source/filter/xml/xmlLogin.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,33 +28,15 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_dbaxml.hxx" -#ifndef DBA_XMLLOGIN_HXX #include "xmlLogin.hxx" -#endif -#ifndef DBA_XMLFILTER_HXX #include "xmlfilter.hxx" -#endif -#ifndef _XMLOFF_XMLTOKEN_HXX #include <xmloff/xmltoken.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 _TOOLS_DEBUG_HXX #include <tools/debug.hxx> -#endif -#ifndef TOOLS_DIAGNOSE_EX_H #include <tools/diagnose_ex.h> -#endif #include <com/sun/star/sdbc/XDataSource.hpp> #include <vector> @@ -99,7 +82,7 @@ OXMLLogin::OXMLLogin( ODBFilter& rImport, { xDataSource->setPropertyValue(PROPERTY_USER,makeAny(sValue)); } - catch(Exception) + catch(const Exception&) { DBG_UNHANDLED_EXCEPTION(); } @@ -110,7 +93,7 @@ OXMLLogin::OXMLLogin( ODBFilter& rImport, { xDataSource->setPropertyValue(PROPERTY_ISPASSWORDREQUIRED,makeAny((sValue == s_sTRUE ? sal_True : sal_False))); } - catch(Exception) + catch(const Exception&) { DBG_UNHANDLED_EXCEPTION(); } @@ -130,14 +113,14 @@ OXMLLogin::OXMLLogin( ODBFilter& rImport, { Reference< XDataSource>(xDataSource,UNO_QUERY_THROW)->setLoginTimeout(sValue.toInt32()); } - catch(Exception) + catch(const Exception&) { DBG_UNHANDLED_EXCEPTION(); } break; } } - catch(Exception) + catch(const Exception&) { DBG_UNHANDLED_EXCEPTION(); } @@ -155,3 +138,5 @@ OXMLLogin::~OXMLLogin() //---------------------------------------------------------------------------- } // namespace dbaxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlLogin.hxx b/dbaccess/source/filter/xml/xmlLogin.hxx index a41920d76562..6f2751eb300b 100644 --- a/dbaccess/source/filter/xml/xmlLogin.hxx +++ b/dbaccess/source/filter/xml/xmlLogin.hxx @@ -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,9 +28,7 @@ #ifndef DBA_XMLLOGIN_HXX #define DBA_XMLLOGIN_HXX -#ifndef _XMLOFF_XMLICTXT_HXX #include <xmloff/xmlictxt.hxx> -#endif namespace dbaxml { @@ -50,3 +49,5 @@ namespace dbaxml // ----------------------------------------------------------------------------- #endif // DBA_XMLLOGIN_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlQuery.cxx b/dbaccess/source/filter/xml/xmlQuery.cxx index 8e592f5d52b6..38fa654841e2 100644 --- a/dbaccess/source/filter/xml/xmlQuery.cxx +++ b/dbaccess/source/filter/xml/xmlQuery.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,39 +28,17 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_dbaxml.hxx" -#ifndef DBA_XMLQUERY_HXX #include "xmlQuery.hxx" -#endif -#ifndef DBA_XMLFILTER_HXX #include "xmlfilter.hxx" -#endif -#ifndef _XMLOFF_XMLTOKEN_HXX #include <xmloff/xmltoken.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_BEANS_PROPERTYVALUE_HPP_ #include <com/sun/star/beans/PropertyValue.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_ #include <com/sun/star/container/XNameContainer.hpp> -#endif -#ifndef _TOOLS_DEBUG_HXX #include <tools/debug.hxx> -#endif namespace dbaxml { @@ -99,7 +78,7 @@ OXMLQuery::OXMLQuery( ODBFilter& rImport m_sCommand = sValue; break; case XML_TOK_ESCAPE_PROCESSING: - m_bEscapeProcessing = sValue.equalsAscii("true"); + m_bEscapeProcessing = sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("true")); break; } } @@ -166,9 +145,11 @@ void OXMLQuery::setProperties(Reference< XPropertySet > & _xProp ) } catch(Exception&) { - OSL_ENSURE(0,"OXMLTable::EndElement -> exception catched"); + OSL_FAIL("OXMLTable::EndElement -> exception catched"); } } //---------------------------------------------------------------------------- } // namespace dbaxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlQuery.hxx b/dbaccess/source/filter/xml/xmlQuery.hxx index f751d9b7af50..4e4bfde87be0 100644 --- a/dbaccess/source/filter/xml/xmlQuery.hxx +++ b/dbaccess/source/filter/xml/xmlQuery.hxx @@ -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,12 +28,8 @@ #ifndef DBA_XMLQUERY_HXX #define DBA_XMLQUERY_HXX -#ifndef _XMLOFF_XMLICTXT_HXX #include <xmloff/xmlictxt.hxx> -#endif -#ifndef DBA_XMLTABLE_HXX #include "xmlTable.hxx" -#endif namespace dbaxml @@ -64,3 +61,5 @@ namespace dbaxml // ----------------------------------------------------------------------------- #endif // DBA_XMLQUERY_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlServerDatabase.cxx b/dbaccess/source/filter/xml/xmlServerDatabase.cxx index 021e0851a521..f670bc1365bb 100644 --- a/dbaccess/source/filter/xml/xmlServerDatabase.cxx +++ b/dbaccess/source/filter/xml/xmlServerDatabase.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,33 +28,15 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_dbaxml.hxx" -#ifndef DBA_XMLSERVERDATABASE_HXX_INCLUDED #include "xmlServerDatabase.hxx" -#endif -#ifndef DBA_XMLFILTER_HXX #include "xmlfilter.hxx" -#endif -#ifndef _XMLOFF_XMLTOKEN_HXX #include <xmloff/xmltoken.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 _TOOLS_DEBUG_HXX #include <tools/debug.hxx> -#endif -#ifndef TOOLS_DIAGNOSE_EX_H #include <tools/diagnose_ex.h> -#endif namespace dbaxml { @@ -173,7 +156,7 @@ OXMLServerDatabase::OXMLServerDatabase( ODBFilter& rImport, { xDataSource->setPropertyValue(PROPERTY_URL,makeAny(sURL.makeStringAndClear())); } - catch(Exception) + catch(const Exception&) { DBG_UNHANDLED_EXCEPTION(); } @@ -191,3 +174,5 @@ OXMLServerDatabase::~OXMLServerDatabase() //---------------------------------------------------------------------------- } // namespace dbaxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlServerDatabase.hxx b/dbaccess/source/filter/xml/xmlServerDatabase.hxx index 4eb2b8de402f..c94d2184f793 100644 --- a/dbaccess/source/filter/xml/xmlServerDatabase.hxx +++ b/dbaccess/source/filter/xml/xmlServerDatabase.hxx @@ -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,12 +28,8 @@ #ifndef DBA_XMLSERVERDATABASE_HXX_INCLUDED #define DBA_XMLSERVERDATABASE_HXX_INCLUDED -#ifndef _XMLOFF_XMLICTXT_HXX #include <xmloff/xmlictxt.hxx> -#endif -#ifndef _COM_SUN_STAR_BEANS_PROPERTYVALUE_HPP_ #include <com/sun/star/beans/PropertyValue.hpp> -#endif #include <vector> namespace dbaxml @@ -53,3 +50,4 @@ namespace dbaxml #endif // DBA_XMLSERVERDATABASE_HXX_INCLUDED +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlStyleImport.cxx b/dbaccess/source/filter/xml/xmlStyleImport.cxx index d24edcc1264d..f48d9b96437c 100644 --- a/dbaccess/source/filter/xml/xmlStyleImport.cxx +++ b/dbaccess/source/filter/xml/xmlStyleImport.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. @@ -28,58 +29,23 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_dbaxml.hxx" -#ifndef DBA_XMLSTYLEIMPORT_HXX #include "xmlStyleImport.hxx" -#endif -#ifndef _XMLOFF_NMSPMAP_HXX #include <xmloff/nmspmap.hxx> -#endif -#ifndef _XMLOFF_XMLNMSPE_HXX #include <xmloff/xmlnmspe.hxx> -#endif -#ifndef _XMLOFF_XMLIMPPR_HXX #include <xmloff/xmlimppr.hxx> -#endif -#ifndef _XMLOFF_FAMILIES_HXX_ #include <xmloff/families.hxx> -#endif -#ifndef _XMLOFF_XMLNUMFI_HXX #include <xmloff/xmlnumfi.hxx> -#endif -#ifndef _XMLOFF_XMLTOKEN_HXX #include <xmloff/xmltoken.hxx> -#endif -#ifndef _COM_SUN_STAR_STYLE_XSTYLEFAMILIESSUPPLIER_HPP_ #include <com/sun/star/style/XStyleFamiliesSupplier.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_ #include <com/sun/star/container/XNameContainer.hpp> -#endif -#ifndef _COM_SUN_STAR_TABLE_BORDERLINE_HPP_ #include <com/sun/star/table/BorderLine.hpp> -#endif -#ifndef _COMPHELPER_EXTRACT_HXX_ #include <comphelper/extract.hxx> -#endif -#ifndef _XMLOFF_XMLPROPERTYSETCONTEXT_HXX #include <xmloff/xmlprcon.hxx> -#endif -#ifndef _XMLOFF_XMLUCONV_HXX #include <xmloff/xmluconv.hxx> -#endif -#ifndef _TOOLS_DEBUG_HXX -#include <tools/debug.hxx> -#endif -#ifndef DBA_XMLFILTER_HXX +#include <osl/diagnose.h> #include "xmlfilter.hxx" -#endif -#ifndef DBA_XMLHELPER_HXX #include "xmlHelper.hxx" -#endif -#ifndef _TOOLS_DEBUG_HXX -#include <tools/debug.hxx> -#endif #define XML_LINE_LEFT 0 @@ -154,7 +120,7 @@ void OTableStyleContext::FillPropertySet( pStyle = PTR_CAST(SvXMLNumFormatContext,pMyStyles-> FindStyleChildContext(XML_STYLE_FAMILY_DATA_STYLE, m_sDataStyleName, sal_True)); else { - DBG_ERROR("not possible to get style"); + OSL_FAIL("not possible to get style"); } } if ( pStyle ) @@ -162,7 +128,6 @@ void OTableStyleContext::FillPropertySet( uno::Any aNumberFormat; m_nNumberFormat = pStyle->GetKey(); aNumberFormat <<= m_nNumberFormat; - //rPropSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_NUMBERFORMAT)), aNumberFormat); AddProperty(CTF_DB_NUMBERFORMAT, aNumberFormat); } } @@ -180,7 +145,7 @@ void OTableStyleContext::SetDefaults() void OTableStyleContext::AddProperty(const sal_Int16 nContextID, const uno::Any& rValue) { sal_Int32 nIndex(static_cast<OTableStylesContext *>(pStyles)->GetIndex(nContextID)); - DBG_ASSERT(nIndex != -1, "Property not found in Map"); + OSL_ENSURE(nIndex != -1, "Property not found in Map"); XMLPropertyState aPropState(nIndex, rValue); GetProperties().push_back(aPropState); // has to be insertes in a sort order later } @@ -361,3 +326,5 @@ ODBFilter& OTableStylesContext::GetOwnImport() // ----------------------------------------------------------------------------- } // dbaxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlStyleImport.hxx b/dbaccess/source/filter/xml/xmlStyleImport.hxx index b9210e49e0e9..87c93c793c02 100644 --- a/dbaccess/source/filter/xml/xmlStyleImport.hxx +++ b/dbaccess/source/filter/xml/xmlStyleImport.hxx @@ -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. @@ -28,36 +29,16 @@ #ifndef DBA_XMLSTYLEIMPORT_HXX #define DBA_XMLSTYLEIMPORT_HXX -#ifndef _RTL_USTRING_HXX_ #include <rtl/ustring.hxx> -#endif -#ifndef _XMLOFF_XMLIMP_HXX #include <xmloff/xmlimp.hxx> -#endif -#ifndef _XMLOFF_XMLICTXT_HXX #include <xmloff/xmlictxt.hxx> -#endif -#ifndef _XMLOFF_PROPMAPPINGTYPES_HXX #include <xmloff/maptype.hxx> -#endif -#ifndef _XMLOFF_PRSTYLEI_HXX_ #include <xmloff/prstylei.hxx> -#endif -#ifndef _XMLOFF_XMLIMPPR_HXX #include <xmloff/xmlimppr.hxx> -#endif -#ifndef _XMLTEXTMASTERPAGECONTEXT_HXX #include <xmloff/XMLTextMasterPageContext.hxx> -#endif -#ifndef _XMLTEXTMASTERSTYLESCONTEXT_HXX #include <xmloff/XMLTextMasterStylesContext.hxx> -#endif -#ifndef _XMLOFF_CONTEXTID_HXX_ #include <xmloff/contextid.hxx> -#endif -#ifndef _XMLOFF_FORMS_CONTROLPROPERTYHDL_HXX_ #include <xmloff/controlpropertyhdl.hxx> -#endif #include <vector> namespace dbaxml @@ -70,7 +51,6 @@ namespace dbaxml ::rtl::OUString sPageStyle; const rtl::OUString sNumberFormat; SvXMLStylesContext* pStyles; - // std::vector<ScXMLMapContent> aMaps; com::sun::star::uno::Any aConditionalFormat; sal_Int32 m_nNumberFormat; sal_Bool bConditionalFormatCreated : 1; @@ -155,3 +135,5 @@ namespace dbaxml } // dbaxml // ----------------------------------------------------------------------------- #endif // DBA_XMLSTYLEIMPORT_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlTable.cxx b/dbaccess/source/filter/xml/xmlTable.cxx index 8698db7cffd1..8652f77cc113 100644 --- a/dbaccess/source/filter/xml/xmlTable.cxx +++ b/dbaccess/source/filter/xml/xmlTable.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,48 +28,20 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_dbaxml.hxx" -#ifndef DBA_XMLTABLE_HXX #include "xmlTable.hxx" -#endif -#ifndef DBA_XMLFILTER_HXX #include "xmlfilter.hxx" -#endif -#ifndef _XMLOFF_XMLTOKEN_HXX #include <xmloff/xmltoken.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 DBA_XMLSTYLEIMPORT_HXX #include "xmlStyleImport.hxx" -#endif -#ifndef DBA_XMLHIERARCHYCOLLECTION_HXX #include "xmlHierarchyCollection.hxx" -#endif -#ifndef DBACCESS_SHARED_XMLSTRINGS_HRC #include "xmlstrings.hrc" -#endif -#ifndef _UCBHELPER_CONTENT_HXX #include <ucbhelper/content.hxx> -#endif -#ifndef _COM_SUN_STAR_UCB_XCOMMANDENVIRONMENT_HPP_ #include <com/sun/star/ucb/XCommandEnvironment.hpp> -#endif -#ifndef _COM_SUN_STAR_SDBCX_XCOLUMNSSUPPLIER_HPP_ #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> -#endif -#ifndef _COMPHELPER_NAMECONTAINER_HXX_ #include <comphelper/namecontainer.hxx> -#endif -#ifndef _TOOLS_DEBUG_HXX #include <tools/debug.hxx> -#endif namespace dbaxml { @@ -120,10 +93,10 @@ OXMLTable::OXMLTable( ODBFilter& _rImport m_sStyleName = sValue; break; case XML_TOK_APPLY_FILTER: - m_bApplyFilter = sValue.equalsAscii("true"); + m_bApplyFilter = sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("true")); break; case XML_TOK_APPLY_ORDER: - m_bApplyOrder = sValue.equalsAscii("true"); + m_bApplyOrder = sValue.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("true")); break; } } @@ -213,7 +186,7 @@ void OXMLTable::setProperties(uno::Reference< XPropertySet > & _xProp ) } catch(Exception&) { - OSL_ENSURE(0,"OXMLTable::EndElement -> exception catched"); + OSL_FAIL("OXMLTable::EndElement -> exception catched"); } } // ----------------------------------------------------------------------------- @@ -246,7 +219,7 @@ void OXMLTable::EndElement() } catch(Exception&) { - OSL_ENSURE(0,"OXMLQuery::EndElement -> exception catched"); + OSL_FAIL("OXMLQuery::EndElement -> exception catched"); } } @@ -293,3 +266,5 @@ void OXMLTable::fillAttributes(sal_uInt16 /*nPrfx*/ //---------------------------------------------------------------------------- } // namespace dbaxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlTable.hxx b/dbaccess/source/filter/xml/xmlTable.hxx index 0fab2577c32d..925497ce92a8 100644 --- a/dbaccess/source/filter/xml/xmlTable.hxx +++ b/dbaccess/source/filter/xml/xmlTable.hxx @@ -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,15 +28,9 @@ #ifndef DBA_XMLTABLE_HXX #define DBA_XMLTABLE_HXX -#ifndef _XMLOFF_XMLICTXT_HXX #include <xmloff/xmlictxt.hxx> -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> -#endif -#ifndef _COM_SUN_STAR_CONTAINER_XNAMEACCESS_HPP_ #include <com/sun/star/container/XNameAccess.hpp> -#endif namespace dbaxml { @@ -89,3 +84,5 @@ namespace dbaxml // ----------------------------------------------------------------------------- #endif // DBA_XMLTABLE_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlTableFilterList.cxx b/dbaccess/source/filter/xml/xmlTableFilterList.cxx index add1494231c5..0256afa63330 100644 --- a/dbaccess/source/filter/xml/xmlTableFilterList.cxx +++ b/dbaccess/source/filter/xml/xmlTableFilterList.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,42 +28,18 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_dbaxml.hxx" -#ifndef DBA_XMLTABLEFILTERLIST_HXX #include "xmlTableFilterList.hxx" -#endif -#ifndef DBA_XMLTABLEFILTERPATTERN_HXX #include "xmlTableFilterPattern.hxx" -#endif -#ifndef DBA_XMLENUMS_HXX #include "xmlEnums.hxx" -#endif -#ifndef _XMLOFF_XMLTOKEN_HXX #include <xmloff/xmltoken.hxx> -#endif -#ifndef _XMLOFF_XMLNMSPE_HXX #include <xmloff/xmlnmspe.hxx> -#endif -#ifndef _XMLOFF_NMSPMAP_HXX #include <xmloff/nmspmap.hxx> -#endif -#ifndef _XMLOFF_XMLTOKEN_HXX #include <xmloff/xmltoken.hxx> -#endif -#ifndef DBACCESS_SHARED_XMLSTRINGS_HRC #include "xmlstrings.hrc" -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> -#endif -#ifndef _XMLOFF_XMLIMP_HXX #include <xmloff/xmlimp.hxx> -#endif -#ifndef DBA_XMLFILTER_HXX #include "xmlfilter.hxx" -#endif -#ifndef _TOOLS_DEBUG_HXX #include <tools/debug.hxx> -#endif namespace dbaxml { @@ -130,3 +107,5 @@ void OXMLTableFilterList::EndElement() //---------------------------------------------------------------------------- } // namespace dbaxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlTableFilterList.hxx b/dbaccess/source/filter/xml/xmlTableFilterList.hxx index fe22ac40bb52..d288b23ae7d1 100644 --- a/dbaccess/source/filter/xml/xmlTableFilterList.hxx +++ b/dbaccess/source/filter/xml/xmlTableFilterList.hxx @@ -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,9 +28,7 @@ #ifndef DBA_XMLTABLEFILTERLIST_HXX #define DBA_XMLTABLEFILTERLIST_HXX -#ifndef _XMLOFF_XMLICTXT_HXX #include <xmloff/xmlictxt.hxx> -#endif #include <vector> namespace dbaxml @@ -77,3 +76,5 @@ namespace dbaxml // ----------------------------------------------------------------------------- #endif // DBA_XMLTABLEFILTERLIST_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlTableFilterPattern.cxx b/dbaccess/source/filter/xml/xmlTableFilterPattern.cxx index 6babad7b7fad..4a8a87da30b5 100644 --- a/dbaccess/source/filter/xml/xmlTableFilterPattern.cxx +++ b/dbaccess/source/filter/xml/xmlTableFilterPattern.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,15 +28,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_dbaxml.hxx" -#ifndef DBA_XMLTABLEFILTERPATTERN_HXX #include "xmlTableFilterPattern.hxx" -#endif -#ifndef DBA_XMLTABLEFILTERLIST_HXX #include "xmlTableFilterList.hxx" -#endif -#ifndef _TOOLS_DEBUG_HXX #include <tools/debug.hxx> -#endif namespace dbaxml { @@ -74,3 +69,5 @@ void OXMLTableFilterPattern::Characters( const ::rtl::OUString& rChars ) //---------------------------------------------------------------------------- } // namespace dbaxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlTableFilterPattern.hxx b/dbaccess/source/filter/xml/xmlTableFilterPattern.hxx index c33136849e0e..460d896ecc89 100644 --- a/dbaccess/source/filter/xml/xmlTableFilterPattern.hxx +++ b/dbaccess/source/filter/xml/xmlTableFilterPattern.hxx @@ -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,9 +28,7 @@ #ifndef DBA_XMLTABLEFILTERPATTERN_HXX #define DBA_XMLTABLEFILTERPATTERN_HXX -#ifndef _XMLOFF_XMLICTXT_HXX #include <xmloff/xmlictxt.hxx> -#endif namespace dbaxml { @@ -54,3 +53,5 @@ namespace dbaxml // ----------------------------------------------------------------------------- #endif // DBA_XMLTABLEFILTERPATTERN_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlfilter.cxx b/dbaccess/source/filter/xml/xmlfilter.cxx index e9a2453f133c..bef47dc01ade 100644 --- a/dbaccess/source/filter/xml/xmlfilter.cxx +++ b/dbaccess/source/filter/xml/xmlfilter.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. @@ -28,105 +29,44 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_dbaxml.hxx" -#ifndef _COM_SUN_STAR_PACKAGES_ZIP_ZIPIOEXCEPTION_HPP_ #include <com/sun/star/packages/zip/ZipIOException.hpp> -#endif -#ifndef _COM_SUN_STAR_EMBED_ELEMENTMODES_HPP_ #include <com/sun/star/embed/ElementModes.hpp> -#endif -#ifndef _COM_SUN_STAR_SDB_XOFFICEDATABASEDOCUMENT_HPP_ #include <com/sun/star/sdb/XOfficeDatabaseDocument.hpp> -#endif -#ifndef DBA_XMLFILTER_HXX #include "xmlfilter.hxx" -#endif -#ifndef _FLT_REGHELPER_HXX_ #include "flt_reghelper.hxx" -#endif -#ifndef _SV_SVAPP_HXX #include <vcl/svapp.hxx> -#endif -#ifndef _SV_WINDOW_HXX #include <vcl/window.hxx> -#endif -#ifndef _XMLOFF_XMLNMSPE_HXX #include <xmloff/xmlnmspe.hxx> -#endif -#ifndef _XMLOFF_XMLSCRIPTI_HXX #include <xmloff/xmlscripti.hxx> -#endif -#ifndef _XMLOFF_XMLTOKEN_HXX #include <xmloff/xmltoken.hxx> -#endif -#ifndef _XMLOFF_TEXTIMP_HXX_ #include <xmloff/txtimp.hxx> -#endif -#ifndef _XMLOFF_NMSPMAP_HXX #include <xmloff/nmspmap.hxx> -#endif -#ifndef _RTL_LOGFILE_HXX_ #include <rtl/logfile.hxx> -#endif -#ifndef _COM_SUN_STAR_XML_SAX_INPUTSOURCE_HPP_ #include <com/sun/star/xml/sax/InputSource.hpp> -#endif -#ifndef _COM_SUN_STAR_XML_SAX_XPARSER_HPP_ #include <com/sun/star/xml/sax/XParser.hpp> -#endif -#ifndef _XMLOFF_PROGRESSBARHELPER_HXX #include <xmloff/ProgressBarHelper.hxx> -#endif -#ifndef _SFXDOCFILE_HXX //autogen wg. SfxMedium #include <sfx2/docfile.hxx> -#endif -#ifndef _COM_SUN_STAR_IO_XINPUTSTREAM_HPP_ #include <com/sun/star/io/XInputStream.hpp> -#endif -#ifndef _COM_SUN_STAR_UNO_XNAMINGSERVICE_HPP_ #include <com/sun/star/uno/XNamingService.hpp> -#endif -#ifndef DBA_XMLDATABASE_HXX #include "xmlDatabase.hxx" -#endif -#ifndef DBA_XMLENUMS_HXX #include "xmlEnums.hxx" -#endif -#ifndef _URLOBJ_HXX //autogen wg. INetURLObject #include <tools/urlobj.hxx> -#endif -#ifndef DBACCESS_SHARED_XMLSTRINGS_HRC #include "xmlstrings.hrc" -#endif -#ifndef _XMLOFF_DOCUMENTSETTINGSCONTEXT_HXX #include <xmloff/DocumentSettingsContext.hxx> -#endif -#ifndef DBA_XMLSTYLEIMPORT_HXX #include "xmlStyleImport.hxx" -#endif -#ifndef _XMLOFF_XMLUCONV_HXX #include <xmloff/xmluconv.hxx> -#endif -#ifndef DBA_XMLHELPER_HXX #include "xmlHelper.hxx" -#endif -#ifndef _COM_SUN_STAR_UTIL_XMODIFIABLE_HPP_ #include <com/sun/star/util/XModifiable.hpp> -#endif #include <com/sun/star/frame/XComponentLoader.hpp> #include <com/sun/star/frame/FrameSearchFlag.hpp> #include <com/sun/star/lang/WrappedTargetRuntimeException.hpp> -#ifndef _SV_SVAPP_HXX //autogen #include <vcl/svapp.hxx> -#endif -#ifndef _VOS_MUTEX_HXX_ -#include <vos/mutex.hxx> -#endif +#include <osl/mutex.hxx> #include <svtools/sfxecode.hxx> #include <unotools/moduleoptions.hxx> -#ifndef _TOOLKIT_HELPER_VCLUNOHELPER_HXX_ #include <toolkit/helper/vclunohelper.hxx> -#endif #include <tools/diagnose_ex.h> +#include <osl/diagnose.h> #include <comphelper/namedvaluecollection.hxx> #include <comphelper/mimeconfighelper.hxx> #include <comphelper/documentconstants.hxx> @@ -185,8 +125,8 @@ namespace dbaxml (void)ex; OSL_ASSERT(0); } - } // if ( s_bFirstTime ) - } // if ( m_eWhat == E_JAVA ) + } + } else if ( m_eWhat == E_CALC ) { static bool s_bFirstTime = true; @@ -260,7 +200,7 @@ namespace dbaxml if ( m_aTypeCollection.needsJVM(sURL) ) { pCreatorThread = new FastLoader(m_xFactory,FastLoader::E_JAVA); - } // if ( m_aTypeCollection.needsJVM(sURL) ) + } else if ( sURL.matchIgnoreAsciiCaseAsciiL("sdbc:calc:",10,0) ) { pCreatorThread = new FastLoader(m_xFactory,FastLoader::E_CALC); @@ -278,8 +218,8 @@ namespace dbaxml } }; } - sal_Char __READONLY_DATA sXML_np__db[] = "_db"; - sal_Char __READONLY_DATA sXML_np___db[] = "__db"; + sal_Char const sXML_np__db[] = "_db"; + sal_Char const sXML_np___db[] = "__db"; using namespace ::com::sun::star::util; /// read a component (file + filter version) @@ -289,9 +229,9 @@ sal_Int32 ReadThroughComponent( const uno::Reference<XMultiServiceFactory> & rFactory, const uno::Reference< XDocumentHandler >& _xFilter ) { - DBG_ASSERT(xInputStream.is(), "input stream missing"); - DBG_ASSERT(xModelComponent.is(), "document missing"); - DBG_ASSERT(rFactory.is(), "factory missing"); + OSL_ENSURE(xInputStream.is(), "input stream missing"); + OSL_ENSURE(xModelComponent.is(), "document missing"); + OSL_ENSURE(rFactory.is(), "factory missing"); RTL_LOGFILE_CONTEXT_AUTHOR( aLog, "dbaxml", "oj", "ReadThroughComponent" ); @@ -302,15 +242,15 @@ sal_Int32 ReadThroughComponent( // get parser uno::Reference< XParser > xParser( rFactory->createInstance( - ::rtl::OUString::createFromAscii("com.sun.star.xml.sax.Parser") ), + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser"))), UNO_QUERY ); - DBG_ASSERT( xParser.is(), "Can't create parser" ); + OSL_ENSURE( xParser.is(), "Can't create parser" ); if( !xParser.is() ) return 1; RTL_LOGFILE_CONTEXT_TRACE( aLog, "parser created" ); // get filter - DBG_ASSERT( _xFilter.is(), "Can't instantiate filter component." ); + OSL_ENSURE( _xFilter.is(), "Can't instantiate filter component." ); if( !_xFilter.is() ) return 1; @@ -337,7 +277,7 @@ sal_Int32 ReadThroughComponent( aError += ','; aError += ByteString::CreateFromInt32( r.ColumnNumber ); - DBG_ERROR( aError.GetBuffer() ); + OSL_FAIL( aError.GetBuffer() ); return 1; } #else @@ -372,8 +312,8 @@ sal_Int32 ReadThroughComponent( const uno::Reference<XMultiServiceFactory> & rFactory, const uno::Reference< XDocumentHandler >& _xFilter) { - DBG_ASSERT( xStorage.is(), "Need storage!"); - DBG_ASSERT(NULL != pStreamName, "Please, please, give me a name!"); + OSL_ENSURE( xStorage.is(), "Need storage!"); + OSL_ENSURE(NULL != pStreamName, "Please, please, give me a name!"); if ( xStorage.is() ) { @@ -470,7 +410,7 @@ sal_Bool SAL_CALL ODBFilter::filter( const Sequence< PropertyValue >& rDescripto { uno::Reference< ::com::sun::star::awt::XWindow > xWindow; { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; Window* pFocusWindow = Application::GetFocusWindow(); xWindow = VCLUnoHelper::GetInterface( pFocusWindow ); if( pFocusWindow ) @@ -483,7 +423,7 @@ sal_Bool SAL_CALL ODBFilter::filter( const Sequence< PropertyValue >& rDescripto if ( xWindow.is() ) { - ::vos::OGuard aGuard(Application::GetSolarMutex()); + SolarMutexGuard aGuard; Window* pFocusWindow = VCLUnoHelper::GetWindow( xWindow ); if ( pFocusWindow ) pFocusWindow->LeaveWait(); @@ -668,7 +608,7 @@ const SvXMLTokenMap& ODBFilter::GetDocElemTokenMap() const { if ( !m_pDocElemTokenMap.get() ) { - static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= + static SvXMLTokenMapEntry aElemTokenMap[]= { { XML_NAMESPACE_OFFICE, XML_SETTINGS, XML_TOK_DOC_SETTINGS }, { XML_NAMESPACE_OOO, XML_SETTINGS, XML_TOK_DOC_SETTINGS }, @@ -690,7 +630,7 @@ const SvXMLTokenMap& ODBFilter::GetDatabaseElemTokenMap() const { if ( !m_pDatabaseElemTokenMap.get() ) { - static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= + static SvXMLTokenMapEntry aElemTokenMap[]= { { XML_NAMESPACE_DB, XML_DATASOURCE, XML_TOK_DATASOURCE }, { XML_NAMESPACE_DB, XML_FORMS, XML_TOK_FORMS}, @@ -710,7 +650,7 @@ const SvXMLTokenMap& ODBFilter::GetDataSourceElemTokenMap() const { if ( !m_pDataSourceElemTokenMap.get() ) { - static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= + static SvXMLTokenMapEntry aElemTokenMap[]= { { XML_NAMESPACE_DB, XML_CONNECTION_RESOURCE, XML_TOK_CONNECTION_RESOURCE}, { XML_NAMESPACE_DB, XML_SUPPRESS_VERSION_COLUMNS, XML_TOK_SUPPRESS_VERSION_COLUMNS}, @@ -761,7 +701,7 @@ const SvXMLTokenMap& ODBFilter::GetLoginElemTokenMap() const { if ( !m_pLoginElemTokenMap.get() ) { - static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= + static SvXMLTokenMapEntry aElemTokenMap[]= { { XML_NAMESPACE_DB, XML_USER_NAME, XML_TOK_USER_NAME}, { XML_NAMESPACE_DB, XML_IS_PASSWORD_REQUIRED, XML_TOK_IS_PASSWORD_REQUIRED}, @@ -778,7 +718,7 @@ const SvXMLTokenMap& ODBFilter::GetDatabaseDescriptionElemTokenMap() const { if ( !m_pDatabaseDescriptionElemTokenMap.get() ) { - static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= + static SvXMLTokenMapEntry aElemTokenMap[]= { { XML_NAMESPACE_DB, XML_FILE_BASED_DATABASE, XML_TOK_FILE_BASED_DATABASE}, { XML_NAMESPACE_DB, XML_SERVER_DATABASE, XML_TOK_SERVER_DATABASE}, @@ -793,7 +733,7 @@ const SvXMLTokenMap& ODBFilter::GetDataSourceInfoElemTokenMap() const { if ( !m_pDataSourceInfoElemTokenMap.get() ) { - static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= + static SvXMLTokenMapEntry aElemTokenMap[]= { { XML_NAMESPACE_DB, XML_ADDITIONAL_COLUMN_STATEMENT,XML_TOK_ADDITIONAL_COLUMN_STATEMENT}, { XML_NAMESPACE_DB, XML_ROW_RETRIEVING_STATEMENT, XML_TOK_ROW_RETRIEVING_STATEMENT}, @@ -819,7 +759,7 @@ const SvXMLTokenMap& ODBFilter::GetDocumentsElemTokenMap() const { if ( !m_pDocumentsElemTokenMap.get() ) { - static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= + static SvXMLTokenMapEntry aElemTokenMap[]= { { XML_NAMESPACE_DB, XML_COMPONENT, XML_TOK_COMPONENT}, { XML_NAMESPACE_DB, XML_COMPONENT_COLLECTION, XML_TOK_COMPONENT_COLLECTION}, @@ -839,7 +779,7 @@ const SvXMLTokenMap& ODBFilter::GetComponentElemTokenMap() const { if ( !m_pComponentElemTokenMap.get() ) { - static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= + static SvXMLTokenMapEntry aElemTokenMap[]= { { XML_NAMESPACE_XLINK, XML_HREF, XML_TOK_HREF }, { XML_NAMESPACE_XLINK, XML_TYPE, XML_TOK_TYPE }, @@ -858,7 +798,7 @@ const SvXMLTokenMap& ODBFilter::GetQueryElemTokenMap() const { if ( !m_pQueryElemTokenMap.get() ) { - static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= + static SvXMLTokenMapEntry aElemTokenMap[]= { { XML_NAMESPACE_DB, XML_COMMAND, XML_TOK_COMMAND }, { XML_NAMESPACE_DB, XML_ESCAPE_PROCESSING, XML_TOK_ESCAPE_PROCESSING }, @@ -882,7 +822,7 @@ const SvXMLTokenMap& ODBFilter::GetColumnElemTokenMap() const { if ( !m_pColumnElemTokenMap.get() ) { - static __FAR_DATA SvXMLTokenMapEntry aElemTokenMap[]= + static SvXMLTokenMapEntry aElemTokenMap[]= { { XML_NAMESPACE_DB, XML_NAME, XML_TOK_COLUMN_NAME }, { XML_NAMESPACE_DB, XML_STYLE_NAME, XML_TOK_COLUMN_STYLE_NAME }, @@ -907,10 +847,8 @@ SvXMLImportContext* ODBFilter::CreateStylesContext(sal_uInt16 _nPrefix,const ::r { pContext = new OTableStylesContext(*this, _nPrefix, rLocalName, xAttrList, bIsAutoStyle); if (bIsAutoStyle) - //xAutoStyles = pContext; SetAutoStyles((SvXMLStylesContext*)pContext); else - //xStyles = pContext; SetStyles((SvXMLStylesContext*)pContext); } return pContext; @@ -970,7 +908,7 @@ void ODBFilter::setPropertyInfo() { xDataSource->setPropertyValue(PROPERTY_INFO,makeAny(aInfo)); } - catch(Exception) + catch(const Exception&) { DBG_UNHANDLED_EXCEPTION(); } @@ -979,3 +917,5 @@ void ODBFilter::setPropertyInfo() // ----------------------------------------------------------------------------- }// dbaxml // ----------------------------------------------------------------------------- + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlfilter.hxx b/dbaccess/source/filter/xml/xmlfilter.hxx index a14e5cd90984..c4e2a16dc856 100644 --- a/dbaccess/source/filter/xml/xmlfilter.hxx +++ b/dbaccess/source/filter/xml/xmlfilter.hxx @@ -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. @@ -28,63 +29,25 @@ #ifndef DBA_XMLFILTER_HXX #define DBA_XMLFILTER_HXX -#ifndef _COM_SUN_STAR_CONTAINER_XNAMED_HPP_ #include <com/sun/star/container/XNamed.hpp> -#endif -#ifndef _COM_SUN_STAR_DOCUMENT_XFILTER_HPP_ #include <com/sun/star/document/XFilter.hpp> -#endif -#ifndef _COM_SUN_STAR_DOCUMENT_XIMPORTER_HPP_ #include <com/sun/star/document/XImporter.hpp> -#endif -#ifndef _COM_SUN_STAR_DOCUMENT_XEXPORTER_HPP_ #include <com/sun/star/document/XExporter.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XINITIALIZATION_HPP_ #include <com/sun/star/lang/XInitialization.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif -#ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_ #include <com/sun/star/beans/XPropertySet.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XCOMPONENT_HPP_ #include <com/sun/star/lang/XComponent.hpp> -#endif -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include <cppuhelper/implbase1.hxx> -#endif -#ifndef _CPPUHELPER_IMPLBASE5_HXX_ #include <cppuhelper/implbase5.hxx> -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif -#ifndef _COM_SUN_STAR_IO_XACTIVEDATASOURCE_HPP_ #include <com/sun/star/io/XActiveDataSource.hpp> -#endif -#ifndef _OSL_DIAGNOSE_H_ #include <osl/diagnose.h> -#endif -#ifndef _UNOTOOLS_TEMPFILE_HXX #include <unotools/tempfile.hxx> -#endif -#ifndef _UNOTOOLS_LOCALFILEHELPER_HXX #include <unotools/localfilehelper.hxx> -#endif -#ifndef _UNTOOLS_UCBSTREAMHELPER_HXX #include <unotools/ucbstreamhelper.hxx> -#endif -#ifndef _XMLOFF_XMLIMP_HXX #include <xmloff/xmlimp.hxx> -#endif -#ifndef _DBASHARED_APITOOLS_HXX_ #include "apitools.hxx" -#endif -#ifndef _COMPHELPER_STLTYPES_HXX_ #include <comphelper/stl_types.hxx> -#endif #include <memory> @@ -208,3 +171,5 @@ public: } // dbaxml // ----------------------------------------------------------------------------- #endif // DBA_XMLFILTER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/filter/xml/xmlservices.cxx b/dbaccess/source/filter/xml/xmlservices.cxx index c6110424a3d4..93df97d58ca2 100644 --- a/dbaccess/source/filter/xml/xmlservices.cxx +++ b/dbaccess/source/filter/xml/xmlservices.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. @@ -28,15 +29,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_dbaxml.hxx" -#ifndef _CPPUHELPER_FACTORY_HXX_ #include <cppuhelper/factory.hxx> -#endif -#ifndef _OSL_DIAGNOSE_H_ #include <osl/diagnose.h> -#endif -#ifndef _FLT_REGHELPER_HXX_ #include "flt_reghelper.hxx" -#endif /********************************************************************************************/ @@ -102,3 +97,4 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( return xRet.get(); }; +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |