diff options
Diffstat (limited to 'dbaccess/source/sdbtools')
12 files changed, 29 insertions, 59 deletions
diff --git a/dbaccess/source/sdbtools/connection/connectiondependent.hxx b/dbaccess/source/sdbtools/connection/connectiondependent.hxx index 52a418105985..ed756b98a76c 100644 --- a/dbaccess/source/sdbtools/connection/connectiondependent.hxx +++ b/dbaccess/source/sdbtools/connection/connectiondependent.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. @@ -154,3 +155,4 @@ namespace sdbtools #endif // DBACCESS_CONNECTION_DEPENDENT_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/sdbtools/connection/connectiontools.cxx b/dbaccess/source/sdbtools/connection/connectiontools.cxx index 1de93461d106..5f1e8153f278 100644 --- a/dbaccess/source/sdbtools/connection/connectiontools.cxx +++ b/dbaccess/source/sdbtools/connection/connectiontools.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,26 +29,16 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_dbaccess.hxx" -#ifndef DBACCESS_CONNECTIONTOOLS_HXX #include "connectiontools.hxx" -#endif -#ifndef DBACCESS_SOURCE_SDBTOOLS_CONNECTION_TABLENAME_HXX #include "tablename.hxx" -#endif -#ifndef DBACCESS_SOURCE_SDBTOOLS_CONNECTION_OBJECTNAMES_HXX #include "objectnames.hxx" -#endif -#ifndef DBACCESS_DATASOURCEMETADATA_HXX #include "datasourcemetadata.hxx" -#endif /** === begin UNO includes === **/ /** === end UNO includes === **/ -#ifndef COMPHELPER_NAMEDVALUECOLLECTION_HXX #include <comphelper/namedvaluecollection.hxx> -#endif #include <connectivity/dbtools.hxx> #include <connectivity/statementcomposer.hxx> @@ -195,3 +186,4 @@ namespace sdbtools } // namespace sdbtools //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/sdbtools/connection/connectiontools.hxx b/dbaccess/source/sdbtools/connection/connectiontools.hxx index c2235e54c526..ed1372e5eb89 100644 --- a/dbaccess/source/sdbtools/connection/connectiontools.hxx +++ b/dbaccess/source/sdbtools/connection/connectiontools.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,20 @@ #ifndef DBACCESS_CONNECTIONTOOLS_HXX #define DBACCESS_CONNECTIONTOOLS_HXX -#ifndef DBACCESS_MODULE_SDBT_HXX #include "module_sdbt.hxx" -#endif -#ifndef DBACCESS_CONNECTION_DEPENDENT_HXX #include "connectiondependent.hxx" -#endif /** === begin UNO includes === **/ -#ifndef _COM_SUN_STAR_SDB_TOOLS_XCONNECTIONTOOLS_HPP_ #include <com/sun/star/sdb/tools/XConnectionTools.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XSERVICEINFO_HPP_ #include <com/sun/star/lang/XServiceInfo.hpp> -#endif -#ifndef _COM_SUN_STAR_LANG_XINITIALIZATION_HPP_ #include <com/sun/star/lang/XInitialization.hpp> -#endif -#ifndef _COM_SUN_STAR_UNO_XCOMPONENTCONTEXT_HPP_ #include <com/sun/star/uno/XComponentContext.hpp> -#endif /** === end UNO includes === **/ -#ifndef _CPPUHELPER_IMPLBASE3_HXX_ #include <cppuhelper/implbase3.hxx> -#endif -#ifndef COMPHELPER_COMPONENTCONTEXT_HXX #include <comphelper/componentcontext.hxx> -#endif //........................................................................ namespace sdbtools @@ -123,3 +108,4 @@ namespace sdbtools #endif // DBACCESS_CONNECTIONTOOLS_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/sdbtools/connection/datasourcemetadata.cxx b/dbaccess/source/sdbtools/connection/datasourcemetadata.cxx index 5d9ba83fe9c3..ef76d96eed95 100644 --- a/dbaccess/source/sdbtools/connection/datasourcemetadata.cxx +++ b/dbaccess/source/sdbtools/connection/datasourcemetadata.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,19 +29,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_dbaccess.hxx" -#ifndef DBACCESS_DATASOURCEMETADATA_HXX #include "datasourcemetadata.hxx" -#endif /** === begin UNO includes === **/ -#ifndef _COM_SUN_STAR_LANG_NULLPOINTEREXCEPTION_HPP_ #include <com/sun/star/lang/NullPointerException.hpp> -#endif /** === end UNO includes === **/ -#ifndef CONNECTIVITY_INC_CONNECTIVITY_DBMETADATA_HXX #include <connectivity/dbmetadata.hxx> -#endif //........................................................................ namespace sdbtools @@ -91,3 +86,4 @@ namespace sdbtools } // namespace sdbtools //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx b/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx index de4a82df1340..440b1f6c2c81 100644 --- a/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx +++ b/dbaccess/source/sdbtools/connection/datasourcemetadata.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,19 +29,13 @@ #ifndef DBACCESS_DATASOURCEMETADATA_HXX #define DBACCESS_DATASOURCEMETADATA_HXX -#ifndef DBACCESS_CONNECTION_DEPENDENT_HXX #include "connectiondependent.hxx" -#endif /** === begin UNO includes === **/ -#ifndef _COM_SUN_STAR_SDB_TOOLS_XDATASOURCEMETADATA_HPP_ #include <com/sun/star/sdb/tools/XDataSourceMetaData.hpp> -#endif /** === end UNO includes === **/ -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include <cppuhelper/implbase1.hxx> -#endif #include <memory> @@ -95,3 +90,5 @@ namespace sdbtools //........................................................................ #endif // DBACCESS_DATASOURCEMETADATA_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/sdbtools/connection/objectnames.cxx b/dbaccess/source/sdbtools/connection/objectnames.cxx index 01e6931de526..fc523aceb650 100644 --- a/dbaccess/source/sdbtools/connection/objectnames.cxx +++ b/dbaccess/source/sdbtools/connection/objectnames.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,16 +29,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_dbaccess.hxx" -#ifndef DBACCESS_SOURCE_SDBTOOLS_CONNECTION_OBJECTNAMES_HXX #include "objectnames.hxx" -#endif -#ifndef DBACCESS_MODULE_SDBT_HXX #include "module_sdbt.hxx" -#endif -#ifndef DBACCESS_SDBT_RESOURCE_HRC #include "sdbt_resource.hrc" -#endif /** === begin UNO includes === **/ #include <com/sun/star/lang/NullPointerException.hpp> @@ -207,7 +202,7 @@ namespace sdbtools || ( _rName.indexOf( (sal_Unicode)96 ) >= 0 ) // || ( _rName.indexOf( (sal_Unicode)145 ) >= 0 ) // || ( _rName.indexOf( (sal_Unicode)146 ) >= 0 ) // - || ( _rName.indexOf( (sal_Unicode)180 ) >= 0 ) // #86621# removed unparsable chars + || ( _rName.indexOf( (sal_Unicode)180 ) >= 0 ) // removed unparsable chars ) return ErrorCondition::DB_QUERY_NAME_WITH_QUOTES; @@ -496,3 +491,4 @@ namespace sdbtools } // namespace sdbtools //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/sdbtools/connection/objectnames.hxx b/dbaccess/source/sdbtools/connection/objectnames.hxx index 0f72896aa118..de2b95951c62 100644 --- a/dbaccess/source/sdbtools/connection/objectnames.hxx +++ b/dbaccess/source/sdbtools/connection/objectnames.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. @@ -96,3 +97,4 @@ namespace sdbtools #endif // DBACCESS_SOURCE_SDBTOOLS_INC_OBJECTNAMES_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/sdbtools/connection/tablename.cxx b/dbaccess/source/sdbtools/connection/tablename.cxx index aedc62451300..47fb343a14ac 100644 --- a/dbaccess/source/sdbtools/connection/tablename.cxx +++ b/dbaccess/source/sdbtools/connection/tablename.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. @@ -42,6 +43,7 @@ #include <connectivity/dbtools.hxx> #include <tools/diagnose_ex.h> #include <tools/string.hxx> +#include <sal/macros.h> //........................................................................ namespace sdbtools @@ -210,7 +212,7 @@ namespace sdbtools //-------------------------------------------------------------------- namespace { - /** translates a CopmositionType into a EComposeRule + /** translates a CompositionType into a EComposeRule @throws IllegalArgumentException if the given value does not denote a valid CompositionType */ @@ -232,7 +234,7 @@ namespace sdbtools bool found = false; size_t i = 0; - for ( ; ( i < sizeof( TypeTable ) / sizeof( TypeTable[0] ) ) && !found; ++i ) + for ( ; ( i < SAL_N_ELEMENTS( TypeTable ) ) && !found; ++i ) if ( TypeTable[i].nCompositionType == _nType ) found = true; if ( !found ) @@ -273,3 +275,4 @@ namespace sdbtools } // namespace sdbtools //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/sdbtools/connection/tablename.hxx b/dbaccess/source/sdbtools/connection/tablename.hxx index fae1b8fae0be..d165fc8680fe 100644 --- a/dbaccess/source/sdbtools/connection/tablename.hxx +++ b/dbaccess/source/sdbtools/connection/tablename.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,19 +29,13 @@ #ifndef DBACCESS_SOURCE_SDBTOOLS_CONNECTION_TABLENAME_HXX #define DBACCESS_SOURCE_SDBTOOLS_CONNECTION_TABLENAME_HXX -#ifndef DBACCESS_CONNECTION_DEPENDENT_HXX #include "connectiondependent.hxx" -#endif /** === begin UNO includes === **/ -#ifndef _COM_SUN_STAR_SDB_TOOLS_XTABLENAME_HPP_ #include <com/sun/star/sdb/tools/XTableName.hpp> -#endif /** === end UNO includes === **/ -#ifndef _CPPUHELPER_IMPLBASE1_HXX_ #include <cppuhelper/implbase1.hxx> -#endif #include <memory> @@ -107,3 +102,4 @@ namespace sdbtools #endif // DBACCESS_SOURCE_SDBTOOLS_CONNECTION_TABLENAME_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/sdbtools/inc/module_sdbt.hxx b/dbaccess/source/sdbtools/inc/module_sdbt.hxx index 5b17ff86b4f0..938ec38c6aca 100644 --- a/dbaccess/source/sdbtools/inc/module_sdbt.hxx +++ b/dbaccess/source/sdbtools/inc/module_sdbt.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,9 +29,7 @@ #ifndef DBACCESS_MODULE_SDBT_HXX #define DBACCESS_MODULE_SDBT_HXX -#ifndef UNOTOOLS_INC_UNOTOOLS_COMPONENTRESMODULE_HXX #include <unotools/componentresmodule.hxx> -#endif //........................................................................ namespace sdbtools @@ -45,3 +44,4 @@ namespace sdbtools #endif // DBACCESS_MODULE_SDBT_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/sdbtools/misc/module_sdbt.cxx b/dbaccess/source/sdbtools/misc/module_sdbt.cxx index 9c9ee6304168..f84822c1d25a 100644 --- a/dbaccess/source/sdbtools/misc/module_sdbt.cxx +++ b/dbaccess/source/sdbtools/misc/module_sdbt.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,9 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_dbaccess.hxx" -#ifndef DBACCESS_MODULE_SDBT_HXX #include "module_sdbt.hxx" -#endif //........................................................................ namespace sdbtools @@ -43,3 +42,4 @@ namespace sdbtools } // namespace sdbtools //........................................................................ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/dbaccess/source/sdbtools/misc/sdbt_services.cxx b/dbaccess/source/sdbtools/misc/sdbt_services.cxx index 9cbba28a2061..cc0847be8d60 100644 --- a/dbaccess/source/sdbtools/misc/sdbt_services.cxx +++ b/dbaccess/source/sdbtools/misc/sdbt_services.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,9 +29,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_dbaccess.hxx" -#ifndef DBACCESS_MODULE_SDBT_HXX #include "module_sdbt.hxx" -#endif /** === begin UNO using === **/ using ::com::sun::star::lang::XMultiServiceFactory; @@ -84,3 +83,4 @@ extern "C" void* SAL_CALL component_getFactory( return xRet.get(); }; +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |