diff options
Diffstat (limited to 'connectivity/inc')
56 files changed, 209 insertions, 100 deletions
diff --git a/connectivity/inc/connectivity/BlobHelper.hxx b/connectivity/inc/connectivity/BlobHelper.hxx index 3a16911524ab..a50de9d8639a 100644..100755 --- a/connectivity/inc/connectivity/BlobHelper.hxx +++ b/connectivity/inc/connectivity/BlobHelper.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. @@ -49,3 +50,4 @@ namespace connectivity #endif //_CONNECTIVITY_BLOBHELPER_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/connectivity/CommonTools.hxx b/connectivity/inc/connectivity/CommonTools.hxx index c3409678f274..e483ab949f4a 100644..100755 --- a/connectivity/inc/connectivity/CommonTools.hxx +++ b/connectivity/inc/connectivity/CommonTools.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. @@ -53,6 +54,10 @@ namespace connectivity { //------------------------------------------------------------------------------ OOO_DLLPUBLIC_DBTOOLS sal_Bool match(const sal_Unicode* pWild, const sal_Unicode* pStr, const sal_Unicode cEscape); + inline sal_Bool match(const ::rtl::OUString &rWild, const ::rtl::OUString &rStr, const sal_Unicode cEscape) + { + return match(rWild.getStr(), rStr.getStr(), cEscape); + } //------------------------------------------------------------------------------ OOO_DLLPUBLIC_DBTOOLS rtl::OUString toString(const ::com::sun::star::uno::Any& rValue); OOO_DLLPUBLIC_DBTOOLS rtl::OUString toDateString(const ::com::sun::star::util::Date& rDate); @@ -72,8 +77,6 @@ namespace connectivity { std::vector< VectorVal > m_vector; oslInterlockedCount m_refCount; - // ORefVector(const ORefVector&); - // ORefVector& operator=(const ORefVector&); protected: virtual ~ORefVector(){} @@ -214,3 +217,4 @@ namespace connectivity #endif // _CONNECTIVITY_COMMONTOOLS_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/connectivity/ConnectionWrapper.hxx b/connectivity/inc/connectivity/ConnectionWrapper.hxx index 56c61cb827f2..1689db1f5698 100644..100755 --- a/connectivity/inc/connectivity/ConnectionWrapper.hxx +++ b/connectivity/inc/connectivity/ConnectionWrapper.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 connectivity } #endif // _CONNECTIVITY_ZCONNECTIONWRAPPER_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/connectivity/DateConversion.hxx b/connectivity/inc/connectivity/DateConversion.hxx index 4c1f668fa107..cbab67251e4a 100644..100755 --- a/connectivity/inc/connectivity/DateConversion.hxx +++ b/connectivity/inc/connectivity/DateConversion.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. @@ -92,3 +93,4 @@ namespace connectivity } #endif // _CONNECTIVITY_DATECONVERSION_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/connectivity/DriversConfig.hxx b/connectivity/inc/connectivity/DriversConfig.hxx index 94ca201e5ad5..97db65f3a986 100755 --- a/connectivity/inc/connectivity/DriversConfig.hxx +++ b/connectivity/inc/connectivity/DriversConfig.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. @@ -85,3 +86,5 @@ namespace connectivity }; } #endif // CONNECTIVITY_DRIVERSCONFIG_HXX_INCLUDED + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/connectivity/FValue.hxx b/connectivity/inc/connectivity/FValue.hxx index e4fe1b64e626..955f8227c74a 100644..100755 --- a/connectivity/inc/connectivity/FValue.hxx +++ b/connectivity/inc/connectivity/FValue.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. @@ -33,7 +34,7 @@ #include <rtl/ustring.hxx> #include <osl/diagnose.h> #include <comphelper/stl_types.hxx> -#include <vos/ref.hxx> +#include <rtl/ref.hxx> #include "connectivity/dbtoolsdllapi.hxx" #include "connectivity/CommonTools.hxx" #include <com/sun/star/util/DateTime.hpp> @@ -309,10 +310,10 @@ namespace connectivity } sal_Bool isBound() const { return m_bBound; } - void setBound(sal_Bool _bBound) { m_bBound = _bBound ? true : false; } + void setBound(sal_Bool _bBound) { m_bBound = _bBound ? 1 : 0; } sal_Bool isModified() const { return m_bModified; } - void setModified(sal_Bool _bMod=sal_True){ m_bModified = _bMod ? true : false; } + void setModified(sal_Bool _bMod=sal_True){ m_bModified = _bMod ? 1 : 0; } sal_Bool isSigned() const { return m_bSigned; } void setSigned(sal_Bool _bMod=sal_True); @@ -373,7 +374,7 @@ namespace connectivity }; /// ORowSetValueDecorator decorates a ORowSetValue so the value is "refcounted" - class OOO_DLLPUBLIC_DBTOOLS ORowSetValueDecorator : public ::vos::OReference + class OOO_DLLPUBLIC_DBTOOLS ORowSetValueDecorator : public ::salhelper::SimpleReferenceObject { ORowSetValue m_aValue; // my own value public: @@ -393,7 +394,7 @@ namespace connectivity inline void setModified(sal_Bool _bModified) { m_aValue.setModified(_bModified); } }; - typedef ::vos::ORef<ORowSetValueDecorator> ORowSetValueDecoratorRef; + typedef ::rtl::Reference<ORowSetValueDecorator> ORowSetValueDecoratorRef; // ------------------------------------------------------------------------- /// TSetBound is a unary_function to set the bound value with e.q. for_each call @@ -454,14 +455,15 @@ namespace connectivity sal_Int32 getParameterIndex(sal_Int32 _nId) const { return m_nParameterIndexes[_nId]; } }; - typedef ::vos::ORef< OAssignValues > ORefAssignValues; + typedef ::rtl::Reference< OAssignValues > ORefAssignValues; - typedef ::vos::ORef< OValueVector > OValueRow; - typedef ::vos::ORef< OValueRefVector > OValueRefRow; + typedef ::rtl::Reference< OValueVector > OValueRow; + typedef ::rtl::Reference< OValueRefVector > OValueRefRow; } #endif // #ifndef _CONNECTIVITY_FILE_VALUE_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/connectivity/IParseContext.hxx b/connectivity/inc/connectivity/IParseContext.hxx index 03de6e924154..16bae3465820 100644..100755 --- a/connectivity/inc/connectivity/IParseContext.hxx +++ b/connectivity/inc/connectivity/IParseContext.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. @@ -106,3 +107,4 @@ namespace connectivity #endif // CONNECTIVITY_IPARSECONTEXT_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/connectivity/PColumn.hxx b/connectivity/inc/connectivity/PColumn.hxx index 1e9dc8b560f1..7fb664ad8060 100644..100755 --- a/connectivity/inc/connectivity/PColumn.hxx +++ b/connectivity/inc/connectivity/PColumn.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. @@ -30,7 +31,7 @@ #include "connectivity/dbtoolsdllapi.hxx" #include "connectivity/sdbcx/VColumn.hxx" #include "connectivity/CommonTools.hxx" -#include <vos/ref.hxx> +#include <rtl/ref.hxx> #include <com/sun/star/sdbc/XResultSetMetaData.hpp> #include <com/sun/star/sdbc/XDatabaseMetaData.hpp> #include <com/sun/star/container/XNameAccess.hpp> @@ -94,7 +95,7 @@ namespace connectivity public: /** creates a collection of OParseColumn, as described by a result set meta data instance. */ - static ::vos::ORef< OSQLColumns > + static ::rtl::Reference< OSQLColumns > createColumnsForResultSet( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData >& _rxResMetaData, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxDBMetaData, @@ -158,3 +159,4 @@ namespace connectivity #endif //_CONNECTIVITY_PCOLUMN_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/connectivity/ParameterCont.hxx b/connectivity/inc/connectivity/ParameterCont.hxx index f096a9a1a747..64cb5faf209b 100644..100755 --- a/connectivity/inc/connectivity/ParameterCont.hxx +++ b/connectivity/inc/connectivity/ParameterCont.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. @@ -57,3 +58,4 @@ namespace dbtools } // dbtools #endif //CONNECTIVITY_PARAMETERCONTINUATION_HXX_INCLUDED +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/connectivity/SQLStatementHelper.hxx b/connectivity/inc/connectivity/SQLStatementHelper.hxx index 0d1bb97c7b7f..c64268debfd9 100644..100755 --- a/connectivity/inc/connectivity/SQLStatementHelper.hxx +++ b/connectivity/inc/connectivity/SQLStatementHelper.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. @@ -6,9 +7,6 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: dbtools.hxx,v $ - * $Revision: 1.37 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -52,3 +50,4 @@ namespace dbtools #endif // _CONNECTIVITY_SQLSTATEMENTHELPER_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/connectivity/StdTypeDefs.hxx b/connectivity/inc/connectivity/StdTypeDefs.hxx index 7b3afaab70d7..50dd14358347 100644..100755 --- a/connectivity/inc/connectivity/StdTypeDefs.hxx +++ b/connectivity/inc/connectivity/StdTypeDefs.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. @@ -46,3 +47,4 @@ namespace connectivity #endif // CONNECTIVITY_STDTYPEDEFS_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/connectivity/TColumnsHelper.hxx b/connectivity/inc/connectivity/TColumnsHelper.hxx index 1343ff633fd2..92d0cbd0980e 100644..100755 --- a/connectivity/inc/connectivity/TColumnsHelper.hxx +++ b/connectivity/inc/connectivity/TColumnsHelper.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. @@ -68,3 +69,4 @@ namespace connectivity } #endif // CONNECTIVITY_COLUMNSHELPER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/connectivity/TIndex.hxx b/connectivity/inc/connectivity/TIndex.hxx index c6537d2855fd..518bc699ef53 100644..100755 --- a/connectivity/inc/connectivity/TIndex.hxx +++ b/connectivity/inc/connectivity/TIndex.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. @@ -54,3 +55,4 @@ namespace connectivity } #endif // CONNECTIVITY_INDEXHELPER_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/connectivity/TIndexColumns.hxx b/connectivity/inc/connectivity/TIndexColumns.hxx index 466363d61e02..8526a149d859 100644..100755 --- a/connectivity/inc/connectivity/TIndexColumns.hxx +++ b/connectivity/inc/connectivity/TIndexColumns.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. @@ -48,3 +49,5 @@ namespace connectivity }; } #endif // CONNECTIVITY_INDEXCOLUMNSHELPER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/connectivity/TIndexes.hxx b/connectivity/inc/connectivity/TIndexes.hxx index d0a2eec83741..9a8296ee967b 100644..100755 --- a/connectivity/inc/connectivity/TIndexes.hxx +++ b/connectivity/inc/connectivity/TIndexes.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. @@ -55,3 +56,4 @@ namespace connectivity #endif // CONNECTIVITY_INDEXESHELPER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/connectivity/TKey.hxx b/connectivity/inc/connectivity/TKey.hxx index e586524dcca0..8d8fb089fb59 100644..100755 --- a/connectivity/inc/connectivity/TKey.hxx +++ b/connectivity/inc/connectivity/TKey.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. @@ -52,3 +53,4 @@ namespace connectivity #endif // CONNECTIVITY_TKEY_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/connectivity/TKeyColumns.hxx b/connectivity/inc/connectivity/TKeyColumns.hxx index 9328fd5af04e..a4ab8f4c6e36 100644..100755 --- a/connectivity/inc/connectivity/TKeyColumns.hxx +++ b/connectivity/inc/connectivity/TKeyColumns.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. @@ -48,3 +49,5 @@ namespace connectivity }; } #endif // CONNECTIVITY_TKEYCOLUMNS_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/connectivity/TKeys.hxx b/connectivity/inc/connectivity/TKeys.hxx index 8142dbcbe9df..a1e3f8b613f1 100644..100755 --- a/connectivity/inc/connectivity/TKeys.hxx +++ b/connectivity/inc/connectivity/TKeys.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,4 @@ namespace connectivity #endif // CONNECTIVITY_TKEYS_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/connectivity/TTableHelper.hxx b/connectivity/inc/connectivity/TTableHelper.hxx index f99a106bce37..432c8b7d7f4f 100644..100755 --- a/connectivity/inc/connectivity/TTableHelper.hxx +++ b/connectivity/inc/connectivity/TTableHelper.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. @@ -171,3 +172,4 @@ namespace connectivity } #endif // CONNECTIVITY_TABLEHELPER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/connectivity/conncleanup.hxx b/connectivity/inc/connectivity/conncleanup.hxx index ee940f02e66d..374e70af468e 100644..100755 --- a/connectivity/inc/connectivity/conncleanup.hxx +++ b/connectivity/inc/connectivity/conncleanup.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. @@ -95,3 +96,4 @@ namespace dbtools #endif // _CONNECTIVITY_CONNCLEANUP_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/connectivity/dbcharset.hxx b/connectivity/inc/connectivity/dbcharset.hxx index 427cdcf1cf88..60c96fb71a2f 100644..100755 --- a/connectivity/inc/connectivity/dbcharset.hxx +++ b/connectivity/inc/connectivity/dbcharset.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. @@ -166,3 +167,4 @@ namespace dbtools #endif // _DBHELPER_DBCHARSET_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/connectivity/dbconversion.hxx b/connectivity/inc/connectivity/dbconversion.hxx index 75c491e505e6..9f726e19dfe1 100644..100755 --- a/connectivity/inc/connectivity/dbconversion.hxx +++ b/connectivity/inc/connectivity/dbconversion.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. @@ -223,3 +224,4 @@ namespace dbtools #endif // _DBHELPER_DBCONVERSION_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/connectivity/dbexception.hxx b/connectivity/inc/connectivity/dbexception.hxx index bd4077ccb9e2..aa87f82d9b43 100644..100755 --- a/connectivity/inc/connectivity/dbexception.hxx +++ b/connectivity/inc/connectivity/dbexception.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. @@ -375,3 +376,4 @@ OOO_DLLPUBLIC_DBTOOLS void throwSQLException( #endif // _DBHELPER_DBEXCEPTION_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/connectivity/dbmetadata.hxx b/connectivity/inc/connectivity/dbmetadata.hxx index 7ed7967bf4c5..630065276201 100644..100755 --- a/connectivity/inc/connectivity/dbmetadata.hxx +++ b/connectivity/inc/connectivity/dbmetadata.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. @@ -198,3 +199,5 @@ namespace dbtools //........................................................................ #endif // CONNECTIVITY_INC_CONNECTIVITY_DBMETADATA_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/connectivity/dbtools.hxx b/connectivity/inc/connectivity/dbtools.hxx index 9b93830aeefe..3555025d370f 100644..100755 --- a/connectivity/inc/connectivity/dbtools.hxx +++ b/connectivity/inc/connectivity/dbtools.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. @@ -612,7 +613,7 @@ namespace dbtools const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XParameters>& _xParameters, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::task::XInteractionHandler >& _rxHandler, - const ::std::bit_vector& _aParametersSet = ::std::bit_vector()); + const ::std::vector<bool, std::allocator<bool> >& _aParametersSet = ::std::vector<bool, std::allocator<bool> >()); /** call the appropiate set method for the specific sql type @see com::sun::star::sdbc::DataType @param _xParams the parameters where to set the value @@ -823,3 +824,4 @@ namespace dbtools #endif // _CONNECTIVITY_DBTOOLS_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/connectivity/dbtoolsdllapi.hxx b/connectivity/inc/connectivity/dbtoolsdllapi.hxx index 6044a53e3328..f322ce343f2d 100644..100755 --- a/connectivity/inc/connectivity/dbtoolsdllapi.hxx +++ b/connectivity/inc/connectivity/dbtoolsdllapi.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. * @@ -38,3 +39,5 @@ #endif #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/connectivity/filtermanager.hxx b/connectivity/inc/connectivity/filtermanager.hxx index c9d1e95cfac4..b6e537ae4568 100644..100755 --- a/connectivity/inc/connectivity/filtermanager.hxx +++ b/connectivity/inc/connectivity/filtermanager.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. @@ -130,3 +131,4 @@ namespace dbtools #endif // CONNECTIVITY_FORMFILTERMANAGER_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/connectivity/formattedcolumnvalue.hxx b/connectivity/inc/connectivity/formattedcolumnvalue.hxx index d9bb8b49973f..a2ae4c3df3aa 100644..100755 --- a/connectivity/inc/connectivity/formattedcolumnvalue.hxx +++ b/connectivity/inc/connectivity/formattedcolumnvalue.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. @@ -117,3 +118,5 @@ namespace dbtools //........................................................................ #endif // CONNECTIVITY_FORMATTEDCOLUMNVALUE_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/connectivity/parameters.hxx b/connectivity/inc/connectivity/parameters.hxx index 75b314e770f3..765ef3814448 100644..100755 --- a/connectivity/inc/connectivity/parameters.hxx +++ b/connectivity/inc/connectivity/parameters.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. @@ -424,3 +425,4 @@ namespace dbtools #endif // CONNECTIVITY_PARAMETERS_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/connectivity/paramwrapper.hxx b/connectivity/inc/connectivity/paramwrapper.hxx index 34e2fef67bbc..aa0a502a4e52 100644..100755 --- a/connectivity/inc/connectivity/paramwrapper.hxx +++ b/connectivity/inc/connectivity/paramwrapper.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. @@ -206,3 +207,5 @@ namespace param //........................................................................ #endif // CONNECTIVITY_PARAMWRAPPER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/connectivity/predicateinput.hxx b/connectivity/inc/connectivity/predicateinput.hxx index 5041fd30c060..84202f85e7c2 100644..100755 --- a/connectivity/inc/connectivity/predicateinput.hxx +++ b/connectivity/inc/connectivity/predicateinput.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. @@ -124,3 +125,4 @@ namespace dbtools #endif // CONNECTIVITY_PREDICATEINPUT_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/connectivity/sdbcx/IRefreshable.hxx b/connectivity/inc/connectivity/sdbcx/IRefreshable.hxx index de3a2b28670c..769ed2107536 100644..100755 --- a/connectivity/inc/connectivity/sdbcx/IRefreshable.hxx +++ b/connectivity/inc/connectivity/sdbcx/IRefreshable.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. @@ -55,3 +56,4 @@ namespace connectivity } #endif //_CONNECTIVITY_SDBCX_IREFRESHABLE_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/connectivity/sdbcx/VCatalog.hxx b/connectivity/inc/connectivity/sdbcx/VCatalog.hxx index 672b9f4cfea6..dd2787a43aab 100644..100755 --- a/connectivity/inc/connectivity/sdbcx/VCatalog.hxx +++ b/connectivity/inc/connectivity/sdbcx/VCatalog.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. @@ -130,3 +131,4 @@ namespace connectivity #endif // _CONNECTIVITY_SDBCX_CATALOG_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/connectivity/sdbcx/VCollection.hxx b/connectivity/inc/connectivity/sdbcx/VCollection.hxx index 58fd6f8d0e2c..c3262b450ca0 100644..100755 --- a/connectivity/inc/connectivity/sdbcx/VCollection.hxx +++ b/connectivity/inc/connectivity/sdbcx/VCollection.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. @@ -241,3 +242,4 @@ namespace connectivity #endif // _CONNECTIVITY_SDBCX_COLLECTION_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/connectivity/sdbcx/VColumn.hxx b/connectivity/inc/connectivity/sdbcx/VColumn.hxx index 0a8c5498cf60..c5198a507b64 100644..100755 --- a/connectivity/inc/connectivity/sdbcx/VColumn.hxx +++ b/connectivity/inc/connectivity/sdbcx/VColumn.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. @@ -116,3 +117,4 @@ namespace connectivity #endif // _CONNECTIVITY_SDBCX_COLUMN_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/connectivity/sdbcx/VDescriptor.hxx b/connectivity/inc/connectivity/sdbcx/VDescriptor.hxx index 99b251d17f42..f35459582db1 100644..100755 --- a/connectivity/inc/connectivity/sdbcx/VDescriptor.hxx +++ b/connectivity/inc/connectivity/sdbcx/VDescriptor.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. @@ -100,3 +101,4 @@ namespace connectivity } #endif // _CONNECTIVITY_SDBCX_DESCRIPTOR_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/connectivity/sdbcx/VGroup.hxx b/connectivity/inc/connectivity/sdbcx/VGroup.hxx index b65b4cd2fda4..37c50d9956ab 100644..100755 --- a/connectivity/inc/connectivity/sdbcx/VGroup.hxx +++ b/connectivity/inc/connectivity/sdbcx/VGroup.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. @@ -36,9 +37,6 @@ #include <com/sun/star/container/XNamed.hpp> #include <comphelper/proparrhlp.hxx> #include <cppuhelper/compbase4.hxx> -//#ifndef _CONNECTIVITY_COMMONTOOLS_HXX_ -//#include "connectivity/CommonTools.hxx" -//#endif #include <comphelper/broadcasthelper.hxx> #include "connectivity/sdbcx/VCollection.hxx" #include <comphelper/propertycontainer.hxx> @@ -111,3 +109,4 @@ namespace connectivity #endif // _CONNECTIVITY_SDBCX_GROUP_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/connectivity/sdbcx/VIndex.hxx b/connectivity/inc/connectivity/sdbcx/VIndex.hxx index b0669fdda540..4058e91bbc76 100644..100755 --- a/connectivity/inc/connectivity/sdbcx/VIndex.hxx +++ b/connectivity/inc/connectivity/sdbcx/VIndex.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,6 @@ #ifndef _CONNECTIVITY_SDBCX_INDEX_HXX_ #define _CONNECTIVITY_SDBCX_INDEX_HXX_ -//#ifndef _OSL_DIAGNOSE_H_ -//#include <osl/diagnose.h> -//#endif #include <com/sun/star/sdbcx/XDataDescriptorFactory.hpp> #include <com/sun/star/sdbcx/XColumnsSupplier.hpp> #include <com/sun/star/container/XNamed.hpp> @@ -115,3 +113,4 @@ namespace connectivity #endif // _CONNECTIVITY_SDBCX_INDEX_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx b/connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx index da836b772f30..8236af4bc9dc 100644..100755 --- a/connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx +++ b/connectivity/inc/connectivity/sdbcx/VIndexColumn.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. @@ -67,3 +68,4 @@ namespace connectivity } #endif // _CONNECTIVITY_SDBCX_INDEXCOLUMN_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/connectivity/sdbcx/VKey.hxx b/connectivity/inc/connectivity/sdbcx/VKey.hxx index e4969cbced18..23796368d208 100644..100755 --- a/connectivity/inc/connectivity/sdbcx/VKey.hxx +++ b/connectivity/inc/connectivity/sdbcx/VKey.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. @@ -126,3 +127,4 @@ namespace connectivity #endif // _CONNECTIVITY_SDBCX_KEY_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx b/connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx index a3526cc68028..057b989fe1f1 100644..100755 --- a/connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx +++ b/connectivity/inc/connectivity/sdbcx/VKeyColumn.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. @@ -69,3 +70,4 @@ namespace connectivity } #endif // _CONNECTIVITY_SDBCX_KEYCOLUMN_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/connectivity/sdbcx/VTable.hxx b/connectivity/inc/connectivity/sdbcx/VTable.hxx index c1ced96b4195..fe3223ec31a4 100644..100755 --- a/connectivity/inc/connectivity/sdbcx/VTable.hxx +++ b/connectivity/inc/connectivity/sdbcx/VTable.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. @@ -146,3 +147,4 @@ namespace connectivity #endif // _CONNECTIVITY_SDBCX_TABLE_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/connectivity/sdbcx/VTypeDef.hxx b/connectivity/inc/connectivity/sdbcx/VTypeDef.hxx index 386cb254a69c..41d0d2c21a25 100644..100755 --- a/connectivity/inc/connectivity/sdbcx/VTypeDef.hxx +++ b/connectivity/inc/connectivity/sdbcx/VTypeDef.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. @@ -45,3 +46,4 @@ namespace connectivity #endif // _CONNECTIVITY_SDBCX_TYPEDEF_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/connectivity/sdbcx/VUser.hxx b/connectivity/inc/connectivity/sdbcx/VUser.hxx index 529926bd0229..5db5249e5220 100644..100755 --- a/connectivity/inc/connectivity/sdbcx/VUser.hxx +++ b/connectivity/inc/connectivity/sdbcx/VUser.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. @@ -105,3 +106,4 @@ namespace connectivity #endif // _CONNECTIVITY_SDBCX_USER_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/connectivity/sdbcx/VView.hxx b/connectivity/inc/connectivity/sdbcx/VView.hxx index ab386ad7c284..3684009a1268 100644..100755 --- a/connectivity/inc/connectivity/sdbcx/VView.hxx +++ b/connectivity/inc/connectivity/sdbcx/VView.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. @@ -106,3 +107,4 @@ namespace connectivity #endif // _CONNECTIVITY_SDBCX_VIEW_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/connectivity/sqlerror.hxx b/connectivity/inc/connectivity/sqlerror.hxx index 3d6be7edf383..f422bbde277a 100644..100755 --- a/connectivity/inc/connectivity/sqlerror.hxx +++ b/connectivity/inc/connectivity/sqlerror.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. @@ -177,7 +178,7 @@ namespace connectivity the ErrorCondition which hit you @param _rxContext - the context in which the error occured. This will be filled in as + the context in which the error occurred. This will be filled in as <member scope="com::sun::star::uno">Exception::Context</member> member. @param _rParamValue1 @@ -214,7 +215,7 @@ namespace connectivity Note: You should prefer the version of <type>raiseException</type> which takes an additional <type>Context</type> parameter, since this allows clients of your - exception to examine where the error occured. + exception to examine where the error occurred. @param _eCondition the ErrorCondition which hit you @@ -252,7 +253,7 @@ namespace connectivity the ErrorCondition which hit you @param _rxContext - the context in which the error occured. This will be filled in as + the context in which the error occurred. This will be filled in as <member scope="com::sun::star::uno">Exception::Context</member> member. @param _rExceptionType @@ -298,7 +299,7 @@ namespace connectivity the ErrorCondition which hit you @param _rxContext - the context in which the error occured. This will be filled in as + the context in which the error occurred. This will be filled in as <member scope="com::sun::star::uno">Exception::Context</member> member. @param _rParamValue1 @@ -338,3 +339,5 @@ namespace connectivity //........................................................................ #endif // CONNECTIVITY_SQLERROR_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/connectivity/sqliterator.hxx b/connectivity/inc/connectivity/sqliterator.hxx index 5152b7221f85..71299b857cda 100644..100755 --- a/connectivity/inc/connectivity/sqliterator.hxx +++ b/connectivity/inc/connectivity/sqliterator.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. @@ -35,7 +36,7 @@ #include <com/sun/star/sdbc/SQLWarning.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include "connectivity/CommonTools.hxx" -#include <vos/ref.hxx> +#include <rtl/ref.hxx> #include <cppuhelper/weak.hxx> #include <map> @@ -66,19 +67,19 @@ namespace connectivity { private: ::com::sun::star::sdbc::SQLException m_aErrors; // conatins the error while iterating through the statement - const OSQLParseNode* m_pParseTree; // aktueller ParseTree + const OSQLParseNode* m_pParseTree; // current ParseTree const OSQLParser& m_rParser; // if set used for general error messages from the context - OSQLStatementType m_eStatementType; // Art des Statements - ::vos::ORef<OSQLColumns> m_aSelectColumns; // alle Spalten aus dem Select-Clause - ::vos::ORef<OSQLColumns> m_aParameters; // all parameters - ::vos::ORef<OSQLColumns> m_aGroupColumns; // the group by columns - ::vos::ORef<OSQLColumns> m_aOrderColumns; // the order by columns - ::vos::ORef<OSQLColumns> m_aCreateColumns; // the columns for Create table clause + OSQLStatementType m_eStatementType; + ::rtl::Reference<OSQLColumns> m_aSelectColumns; // all columns from the Select clause + ::rtl::Reference<OSQLColumns> m_aParameters; // all parameters + ::rtl::Reference<OSQLColumns> m_aGroupColumns; // the group by columns + ::rtl::Reference<OSQLColumns> m_aOrderColumns; // the order by columns + ::rtl::Reference<OSQLColumns> m_aCreateColumns; // the columns for Create table clause ::std::auto_ptr< OSQLParseTreeIteratorImpl > m_pImpl; void traverseParameter(const OSQLParseNode* _pParseNode,const OSQLParseNode* _pColumnRef,const ::rtl::OUString& _aColumnName,const ::rtl::OUString& _aTableRange, const ::rtl::OUString& _rColumnAlias); - // F"ugt eine Tabelle in die Map ein + // inserts a table into the map void traverseOneTableName( OSQLTables& _rTables,const OSQLParseNode * pTableName, const ::rtl::OUString & rTableRange ); void traverseORCriteria(OSQLParseNode * pSearchCondition); void traverseANDCriteria(OSQLParseNode * pSearchCondition); @@ -121,13 +122,12 @@ namespace connectivity const ::rtl::OUString & rColumnName, const ::rtl::OUString & rTableRange, bool _bLookInSubTables ); protected: - void setSelectColumnName(::vos::ORef<OSQLColumns>& _rColumns,const ::rtl::OUString & rColumnName,const ::rtl::OUString & rColumnAlias, const ::rtl::OUString & rTableRange,sal_Bool bFkt=sal_False,sal_Int32 _nType = com::sun::star::sdbc::DataType::VARCHAR,sal_Bool bAggFkt=sal_False); - void appendColumns(::vos::ORef<OSQLColumns>& _rColumns,const ::rtl::OUString& _rTableAlias,const OSQLTable& _rTable); - // Weitere Member-Variable, die in den "set"-Funktionen zur - // Verfuegung stehen sollen, koennen in der abgeleiteten Klasse - // definiert werden und z. B. in deren Konstruktor initialisiert - // bzw. nach Benutzung der "traverse"-Routinen mit Hilfe weiterer - // Funktionen abgefragt werden. + void setSelectColumnName(::rtl::Reference<OSQLColumns>& _rColumns,const ::rtl::OUString & rColumnName,const ::rtl::OUString & rColumnAlias, const ::rtl::OUString & rTableRange,sal_Bool bFkt=sal_False,sal_Int32 _nType = com::sun::star::sdbc::DataType::VARCHAR,sal_Bool bAggFkt=sal_False); + void appendColumns(::rtl::Reference<OSQLColumns>& _rColumns,const ::rtl::OUString& _rTableAlias,const OSQLTable& _rTable); + // Other member variables that should be available in the "set" functions + // can be defined in the derived class. They can be initialized + // in its constructor and, after the "traverse" routines have been used, + // they can be queried using other functions. private: @@ -153,13 +153,13 @@ namespace connectivity void dispose(); bool isCaseSensitive() const; - // Der zu analysierende/zu traversierende Parse Tree: - // bei "Ubergabe von NULL wird der aktuelle Parsetree gel"oscht und der Fehlerstatus gecleared + // The parse tree to be analysed/traversed: + // If NULL is passed, the current parse tree will be deleted and the error status cleared. void setParseTree(const OSQLParseNode * pNewParseTree); // void setParser(const OSQLParser* _pParser) { m_pParser = _pParser; } const OSQLParseNode * getParseTree() const { return m_pParseTree; }; - // Teilbaueme bei einem select statement + // subtrees in case of a select statement const OSQLParseNode* getWhereTree() const; const OSQLParseNode* getOrderTree() const; const OSQLParseNode* getGroupByTree() const; @@ -170,14 +170,14 @@ namespace connectivity const OSQLParseNode* getSimpleGroupByTree() const; const OSQLParseNode* getSimpleHavingTree() const; - /** returns the errors which occured during parsing. + /** returns the errors which occurred during parsing. The returned object contains a chain (via SQLException::NextException) of SQLExceptions. */ inline const ::com::sun::star::sdbc::SQLException& getErrors() const { return m_aErrors; } inline bool hasErrors() const { return m_aErrors.Message.getLength() > 0; } - // Statement-Typ (wird bereits in setParseTree gesetzt): + // statement type (already set in setParseTree): OSQLStatementType getStatementType() const { return m_eStatementType; } /** traverses the complete statement tree, and fills all our data with @@ -211,14 +211,14 @@ namespace connectivity */ void traverseSome( sal_uInt32 _nIncludeMask ); - // Die TableRangeMap enth"alt alle Tabellen unter dem zugeh"origen Rangenamen der zuerst gefunden wird + // The TableRangeMap contains all tables associated with the range name found first. const OSQLTables& getTables() const; - ::vos::ORef<OSQLColumns> getSelectColumns() const { return m_aSelectColumns;} - ::vos::ORef<OSQLColumns> getGroupColumns() const { return m_aGroupColumns;} - ::vos::ORef<OSQLColumns> getOrderColumns() const { return m_aOrderColumns;} - ::vos::ORef<OSQLColumns> getParameters() const { return m_aParameters; } - ::vos::ORef<OSQLColumns> getCreateColumns() const { return m_aCreateColumns;} + ::rtl::Reference<OSQLColumns> getSelectColumns() const { return m_aSelectColumns;} + ::rtl::Reference<OSQLColumns> getGroupColumns() const { return m_aGroupColumns;} + ::rtl::Reference<OSQLColumns> getOrderColumns() const { return m_aOrderColumns;} + ::rtl::Reference<OSQLColumns> getParameters() const { return m_aParameters; } + ::rtl::Reference<OSQLColumns> getCreateColumns() const { return m_aCreateColumns;} /** return the columname and the table range @param _pColumnRef @@ -273,8 +273,7 @@ namespace connectivity ::rtl::OUString &_rColumnName, ::rtl::OUString& _rTableRange); - // Ermittelt fuer eine Funktion, Spalten den zugehoeren TableRange, - // wenn nicht eindeutig, dann leer + // empty if ambiguous sal_Bool getColumnTableRange(const OSQLParseNode* pNode, ::rtl::OUString &rTableRange) const; // return true when the tableNode is a rule like catalog_name, schema_name or table_name @@ -337,12 +336,12 @@ namespace connectivity /** appends an SQLException corresponding to the given error code to our error collection @param _eError - the code of the error which occured + the code of the error which occurred @param _pReplaceToken1 - if not <NULL/>, the first occurance of '#' in the error message will be replaced + if not <NULL/>, the first occurrence of '#' in the error message will be replaced with the given token @param _pReplaceToken2 - if not <NULL/>, and if _rReplaceToken1 is not <NULL/>, the second occurance of '#' + if not <NULL/>, and if _rReplaceToken1 is not <NULL/>, the second occurrence of '#' in the error message will be replaced with _rReplaceToken2 */ void impl_appendError( IParseContext::ErrorCode _eError, @@ -364,3 +363,4 @@ namespace connectivity #endif // _CONNECTIVITY_PARSE_SQLITERATOR_HXX_ +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/connectivity/sqlnode.hxx b/connectivity/inc/connectivity/sqlnode.hxx index 04ec8dc153df..f7182c34df75 100644..100755 --- a/connectivity/inc/connectivity/sqlnode.hxx +++ b/connectivity/inc/connectivity/sqlnode.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. @@ -123,13 +124,16 @@ namespace connectivity friend class OSQLParser; OSQLParseNodes m_aChildren; - OSQLParseNode* m_pParent; // pParent fuer Reuckverkettung im Baum - ::rtl::OUString m_aNodeValue; // Token-Name oder leer bei Regeln oder ::rtl::OUString bei - // ::rtl::OUString, INT, usw. -Werten - SQLNodeType m_eNodeType; // s. o. - sal_uInt32 m_nNodeID; // ::com::sun::star::chaos::Rule ID (bei IsRule()) oder Token ID (bei !IsRule()) - // ::com::sun::star::chaos::Rule IDs und Token IDs koennen nicht anhand des Wertes - // unterschieden werden, dafuer ist IsRule() abzufragen! + OSQLParseNode* m_pParent; // pParent for reverse linkage in the tree + ::rtl::OUString m_aNodeValue; // token name, or empty in case of rules, + // or ::rtl::OUString in case of + // ::rtl::OUString, INT, etc. + SQLNodeType m_eNodeType; // see above + sal_uInt32 m_nNodeID; // ::com::sun::star::chaos::Rule ID (if IsRule()) + // or Token ID (if !IsRule()) + // ::com::sun::star::chaos::Rule IDs and Token IDs can't + // be distinguished by their values, + // IsRule has to be used for that! public: enum Rule { @@ -232,7 +236,7 @@ namespace connectivity other_like_predicate_part_2, between_predicate_part_2, cast_spec, - rule_count, // letzter_wert + rule_count, // last value UNKNOWN_RULE // ID indicating that a node is no rule with a matching Rule-enum value (see getKnownRuleID) }; @@ -253,22 +257,19 @@ namespace connectivity SQLNodeType _eNodeType, sal_uInt32 _nNodeID = 0); - // Kopiert den entsprechenden ParseNode + // copies the respective ParseNode OSQLParseNode(const OSQLParseNode& rParseNode); OSQLParseNode& operator=(const OSQLParseNode& rParseNode); sal_Bool operator==(OSQLParseNode& rParseNode) const; - // Destruktor raeumt rekursiv den Baum ab + // destructor destructs the tree recursively virtual ~OSQLParseNode(); - // Parent gibt den Zeiger auf den Parent zurueck OSQLParseNode* getParent() const {return m_pParent;}; - // SetParent setzt den Parent-Zeiger eines ParseNodes void setParent(OSQLParseNode* pParseNode) {m_pParent = pParseNode;}; - // ChildCount liefert die Anzahl der Kinder eines Knotens sal_uInt32 count() const {return m_aChildren.size();}; inline OSQLParseNode* getChild(sal_uInt32 nPos) const; @@ -303,7 +304,7 @@ namespace connectivity too, to check whether they contain nested sub queries. @param _pErrorHolder - takes the error which occured while generating the statement, if any. Might be <NULL/>, + takes the error which occurred while generating the statement, if any. Might be <NULL/>, in this case the error is not reported back, and can only be recognized by examing the return value. @@ -349,42 +350,37 @@ namespace connectivity OSQLParseNode* getByRule(OSQLParseNode::Rule eRule) const; #if OSL_DEBUG_LEVEL > 0 - // zeigt den ParseTree mit tabs und linefeeds + // shows the ParseTree with tabs and linefeeds void showParseTree( ::rtl::OUString& rString ) const; void showParseTree( ::rtl::OUStringBuffer& _inout_rBuf, sal_uInt32 nLevel ) const; #endif - // GetNodeType gibt den Knotentyp zurueck SQLNodeType getNodeType() const {return m_eNodeType;}; - // RuleId liefert die RuleId der Regel des Knotens (nur bei IsRule()) + // RuleId returns the RuleID of the node's rule (only if IsRule()) sal_uInt32 getRuleID() const {return m_nNodeID;} /** returns the ID of the rule represented by the node - If the node does not represent a rule, UNKNOWN_RULE is returned */ Rule getKnownRuleID() const; - // RuleId liefert die TokenId des Tokens des Knotens (nur bei ! IsRule()) + // returns the TokenId of the node's token (only if !isRule()) sal_uInt32 getTokenID() const {return m_nNodeID;} - // IsRule testet ob ein Node eine Regel (NonTerminal) ist - // Achtung : Regeln koenne auch Blaetter sein, z.B. leere Listen + // IsRule tests whether a node is a rule (NonTerminal) + // ATTENTION: rules can be leaves, for example empty lists sal_Bool isRule() const { return (m_eNodeType == SQL_NODE_RULE) || (m_eNodeType == SQL_NODE_LISTRULE) || (m_eNodeType == SQL_NODE_COMMALISTRULE);} - // IsToken testet ob ein Node ein Token (Terminal) ist - sal_Bool isToken() const {return !isRule();} // ein Token ist keine Regel + // IsToken tests whether a Node is a Token (Terminal but not a rule) + sal_Bool isToken() const {return !isRule();} - // TokenValue liefert den NodeValue eines Tokens const ::rtl::OUString& getTokenValue() const {return m_aNodeValue;} - // SetTokenValue setzt den NodeValue void setTokenValue(const ::rtl::OUString& rString) { if (isToken()) m_aNodeValue = rString;} - // IsLeaf testet ob ein Node ein Blatt ist sal_Bool isLeaf() const {return m_aChildren.empty();} // negate only a searchcondition, any other rule could cause a gpf @@ -414,7 +410,7 @@ namespace connectivity ::rtl::OUString &_rTable ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _xMetaData); - // susbtitute all occurences of :var or [name] into the dynamic parameter ? + // susbtitute all occurrences of :var or [name] into the dynamic parameter ? // _pNode will be modified if parameters exists static void substituteParameterNames(OSQLParseNode* _pNode); @@ -423,7 +419,7 @@ namespace connectivity static ::rtl::OUString getTableRange(const OSQLParseNode* _pTableRef); protected: - // ParseNodeToStr konkateniert alle Token (Blaetter) des ParseNodes + // ParseNodeToStr konkateniert alle Token (leaves) des ParseNodes void parseNodeToStr(::rtl::OUString& rString, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > & xFormatter, @@ -471,3 +467,5 @@ namespace connectivity } #endif //_CONNECTIVITY_SQLNODE_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/connectivity/sqlparse.hxx b/connectivity/inc/connectivity/sqlparse.hxx index 03854e6c9faf..e7420d6c48c3 100644..100755 --- a/connectivity/inc/connectivity/sqlparse.hxx +++ b/connectivity/inc/connectivity/sqlparse.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. @@ -207,24 +208,23 @@ namespace connectivity /// access to the SQLError instance owned by this parser const SQLError& getErrorHelper() const; - // TokenIDToStr: Token-Name zu einer Token-Nr. + // TokenIDToStr: token name belonging to a token number. static ::rtl::OString TokenIDToStr(sal_uInt32 nTokenID, const IParseContext* pContext = NULL); - // StrToTokenID: Token-Nr. zu einem Token-Namen. + // StrToTokenID: token number belonging to a token name. // static sal_uInt32 StrToTokenID(const ::rtl::OString & rName); - // RuleIDToStr gibt den zu einer RuleID gehoerenden ::rtl::OUString zurueck - // (Leerstring, falls nicht gefunden) + // (empty string if not found) static ::rtl::OUString RuleIDToStr(sal_uInt32 nRuleID); - // StrToRuleID berechnet zu einem ::rtl::OUString die RuleID (d.h. ::com::sun::star::sdbcx::Index in yytname) - // (0, falls nicht gefunden). Die Suche nach der ID aufgrund eines Strings ist - // extrem ineffizient (sequentielle Suche nach ::rtl::OUString)! + // StrToRuleID calculates the RuleID for a ::rtl::OUString (that is, ::com::sun::star::sdbcx::Index in yytname) + // (0 if not found). The search for an ID based on a String is + // extremely inefficient (sequential search for ::rtl::OUString)! static sal_uInt32 StrToRuleID(const ::rtl::OString & rValue); static OSQLParseNode::Rule RuleIDToRule( sal_uInt32 _nRule ); - // RuleId mit enum, wesentlich effizienter + // RuleId with enum, far more efficient static sal_uInt32 RuleID(OSQLParseNode::Rule eRule); // compares the _sFunctionName with all known function names and return the DataType of the return value static sal_Int32 getFunctionReturnType(const ::rtl::OUString& _sFunctionName, const IParseContext* pContext = NULL); @@ -259,3 +259,5 @@ namespace connectivity #endif //_CONNECTIVITY_SQLPARSE_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/connectivity/standardsqlstate.hxx b/connectivity/inc/connectivity/standardsqlstate.hxx index 5f855a890f5f..e93448408188 100644..100755 --- a/connectivity/inc/connectivity/standardsqlstate.hxx +++ b/connectivity/inc/connectivity/standardsqlstate.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. * @@ -71,3 +72,5 @@ namespace dbtools //......................................................................... #endif // CONNECTIVITY_STANDARD_SQL_STATE_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/connectivity/statementcomposer.hxx b/connectivity/inc/connectivity/statementcomposer.hxx index 3dde4d8e0b48..dcc6aff0501a 100644..100755 --- a/connectivity/inc/connectivity/statementcomposer.hxx +++ b/connectivity/inc/connectivity/statementcomposer.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. @@ -109,3 +110,5 @@ namespace dbtools //........................................................................ #endif // CONNECTIVITY_STATEMENTCOMPOSER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/connectivity/virtualdbtools.hxx b/connectivity/inc/connectivity/virtualdbtools.hxx index 1ad4c1d7d77d..fe023e2acfc9 100644..100755 --- a/connectivity/inc/connectivity/virtualdbtools.hxx +++ b/connectivity/inc/connectivity/virtualdbtools.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. @@ -355,3 +356,4 @@ namespace connectivity #endif // CONNECTIVITY_VIRTUAL_DBTOOLS_HXX +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/connectivity/warningscontainer.hxx b/connectivity/inc/connectivity/warningscontainer.hxx index feb631a2098e..273390ccbf7f 100644..100755 --- a/connectivity/inc/connectivity/warningscontainer.hxx +++ b/connectivity/inc/connectivity/warningscontainer.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. @@ -105,3 +106,5 @@ namespace dbtools //......................................................................... #endif // DBTOOLS_WARNINGSCONTAINER_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/makefile.mk b/connectivity/inc/makefile.mk index 51a3f225b30a..51a3f225b30a 100644..100755 --- a/connectivity/inc/makefile.mk +++ b/connectivity/inc/makefile.mk diff --git a/connectivity/inc/pch/precompiled_connectivity.cxx b/connectivity/inc/pch/precompiled_connectivity.cxx index edbfe3801613..e4bdb424d850 100644..100755 --- a/connectivity/inc/pch/precompiled_connectivity.cxx +++ b/connectivity/inc/pch/precompiled_connectivity.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,3 +28,4 @@ #include "precompiled_connectivity.hxx" +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/inc/pch/precompiled_connectivity.hxx b/connectivity/inc/pch/precompiled_connectivity.hxx index 41571202327a..2845d35e3ef8 100644..100755 --- a/connectivity/inc/pch/precompiled_connectivity.hxx +++ b/connectivity/inc/pch/precompiled_connectivity.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. @@ -308,6 +309,9 @@ #include "rtl/ustrbuf.hxx" #include "rtl/ustring.hxx" +#include "salhelper/timer.hxx" +#include "salhelper/simplereferenceobject.hxx" + #include "sys/types.h" #include "tools/diagnose_ex.h" @@ -323,12 +327,11 @@ #include "unotools/processfactory.hxx" #include "unotools/sharedunocomponent.hxx" -#include "vos/mutex.hxx" -#include "vos/process.hxx" -#include "vos/ref.hxx" -#include "vos/ref.hxx" -#include "vos/refernce.hxx" -#include "vos/timer.hxx" +#include "osl/mutex.hxx" +#include "osl/process.h" + //---MARKER--- #endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |