diff options
Diffstat (limited to 'connectivity/inc')
55 files changed, 577 insertions, 577 deletions
diff --git a/connectivity/inc/connectivity/BlobHelper.hxx b/connectivity/inc/connectivity/BlobHelper.hxx index a50de9d8639a..f524a34a0caa 100644 --- a/connectivity/inc/connectivity/BlobHelper.hxx +++ b/connectivity/inc/connectivity/BlobHelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/connectivity/inc/connectivity/CommonTools.hxx b/connectivity/inc/connectivity/CommonTools.hxx index dd8e480f730d..c17b4f37cea8 100644 --- a/connectivity/inc/connectivity/CommonTools.hxx +++ b/connectivity/inc/connectivity/CommonTools.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -62,7 +62,7 @@ namespace connectivity // typedefs typedef std::vector< ::com::sun::star::uno::WeakReferenceHelper > OWeakRefArray; - typedef ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier> OSQLTable; + typedef ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier> OSQLTable; DECLARE_STL_MAP(::rtl::OUString,OSQLTable,comphelper::UStringMixLess, OSQLTables); @@ -72,10 +72,10 @@ namespace connectivity template< class VectorVal > class ORefVector { std::vector< VectorVal > m_vector; - oslInterlockedCount m_refCount; + oslInterlockedCount m_refCount; protected: - virtual ~ORefVector(){} + virtual ~ORefVector(){} public: typedef std::vector< VectorVal > Vector; @@ -135,7 +135,7 @@ namespace connectivity // search from __first to __last the column with the name _rVal // when no such column exist __last is returned OOO_DLLPUBLIC_DBTOOLS - OSQLColumns::Vector::const_iterator find( OSQLColumns::Vector::const_iterator __first, + OSQLColumns::Vector::const_iterator find( OSQLColumns::Vector::const_iterator __first, OSQLColumns::Vector::const_iterator __last, const ::rtl::OUString& _rVal, const ::comphelper::UStringMixEqual& _rCase); @@ -143,7 +143,7 @@ namespace connectivity // search from __first to __last the column with the realname _rVal // when no such column exist __last is returned OOO_DLLPUBLIC_DBTOOLS - OSQLColumns::Vector::const_iterator findRealName( OSQLColumns::Vector::const_iterator __first, + OSQLColumns::Vector::const_iterator findRealName( OSQLColumns::Vector::const_iterator __first, OSQLColumns::Vector::const_iterator __last, const ::rtl::OUString& _rVal, const ::comphelper::UStringMixEqual& _rCase); @@ -154,7 +154,7 @@ namespace connectivity // search from __first to __last the column with the property _rProp equals the value _rVal // when no such column exist __last is returned OOO_DLLPUBLIC_DBTOOLS - OSQLColumns::Vector::const_iterator find( OSQLColumns::Vector::const_iterator __first, + OSQLColumns::Vector::const_iterator find( OSQLColumns::Vector::const_iterator __first, OSQLColumns::Vector::const_iterator __last, const ::rtl::OUString& _rProp, const ::rtl::OUString& _rVal, @@ -164,17 +164,17 @@ namespace connectivity /** creates a java virtual machine - @param _rxFactory + @param _rxFactory The ORB. @return The JavaVM. */ OOO_DLLPUBLIC_DBTOOLS ::rtl::Reference< jvmaccess::VirtualMachine > getJavaVM(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory); - /** return <TRUE/> if the java class exists, otherwise <FALSE/>. - @param _pJVM + /** return <TRUE/> if the java class exists, otherwise <FALSE/>. + @param _pJVM The JavaVM. - @param _sClassName + @param _sClassName The class name to look for. */ OOO_DLLPUBLIC_DBTOOLS sal_Bool existsJavaClassByName( const ::rtl::Reference< jvmaccess::VirtualMachine >& _pJVM,const ::rtl::OUString& _sClassName ); @@ -182,32 +182,32 @@ namespace connectivity //================================================================================== -#define DECLARE_SERVICE_INFO() \ - virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); \ - virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); \ - virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ - -#define IMPLEMENT_SERVICE_INFO(classname, implasciiname, serviceasciiname) \ - ::rtl::OUString SAL_CALL classname::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) \ - { \ - return ::rtl::OUString::createFromAscii(implasciiname); \ - } \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ - { \ - ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1); \ - aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname); \ - return aSupported; \ - } \ - sal_Bool SAL_CALL classname::supportsService( const ::rtl::OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException) \ - { \ - Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); \ - const ::rtl::OUString* pSupported = aSupported.getConstArray(); \ - const ::rtl::OUString* pEnd = pSupported + aSupported.getLength(); \ - for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported) \ - ; \ +#define DECLARE_SERVICE_INFO() \ + virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException); \ + virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); \ + virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ + +#define IMPLEMENT_SERVICE_INFO(classname, implasciiname, serviceasciiname) \ + ::rtl::OUString SAL_CALL classname::getImplementationName( ) throw (::com::sun::star::uno::RuntimeException) \ + { \ + return ::rtl::OUString::createFromAscii(implasciiname); \ + } \ + ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL classname::getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException) \ + { \ + ::com::sun::star::uno::Sequence< ::rtl::OUString > aSupported(1); \ + aSupported[0] = ::rtl::OUString::createFromAscii(serviceasciiname); \ + return aSupported; \ + } \ + sal_Bool SAL_CALL classname::supportsService( const ::rtl::OUString& _rServiceName ) throw(::com::sun::star::uno::RuntimeException) \ + { \ + Sequence< ::rtl::OUString > aSupported(getSupportedServiceNames()); \ + const ::rtl::OUString* pSupported = aSupported.getConstArray(); \ + const ::rtl::OUString* pEnd = pSupported + aSupported.getLength(); \ + for (;pSupported != pEnd && !pSupported->equals(_rServiceName); ++pSupported) \ + ; \ \ - return pSupported != pEnd; \ - } \ + return pSupported != pEnd; \ + } \ //================================================================================== diff --git a/connectivity/inc/connectivity/ConnectionWrapper.hxx b/connectivity/inc/connectivity/ConnectionWrapper.hxx index 1689db1f5698..8172d29f4851 100644 --- a/connectivity/inc/connectivity/ConnectionWrapper.hxx +++ b/connectivity/inc/connectivity/ConnectionWrapper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -46,10 +46,10 @@ namespace connectivity //= but when disposed it doesn't dispose the real connection //========================================================================== typedef ::cppu::ImplHelper2< ::com::sun::star::lang::XServiceInfo, - ::com::sun::star::lang::XUnoTunnel + ::com::sun::star::lang::XUnoTunnel > OConnection_BASE; - class OOO_DLLPUBLIC_DBTOOLS OConnectionWrapper : public OConnection_BASE + class OOO_DLLPUBLIC_DBTOOLS OConnectionWrapper : public OConnection_BASE { protected: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > m_xProxyConnection; @@ -67,25 +67,25 @@ namespace connectivity void disposing(); public: OConnectionWrapper( ); - + // XServiceInfo DECLARE_SERVICE_INFO(); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& _rType ) throw (::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw (::com::sun::star::uno::RuntimeException); - + // com::sun::star::lang::XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); /** method to create unique ids - @param _rURL + @param _rURL The URL. - @param _rInfo + @param _rInfo The info property of the datasource. It will be resorted if needed. - @param _pBuffer + @param _pBuffer Here we store the digest. Must not NULL. - @param _rUserName + @param _rUserName The user name. - @param _rPassword + @param _rPassword The password. */ static void createUniqueId( const ::rtl::OUString& _rURL diff --git a/connectivity/inc/connectivity/DateConversion.hxx b/connectivity/inc/connectivity/DateConversion.hxx index cbab67251e4a..caa05b1e74e9 100644 --- a/connectivity/inc/connectivity/DateConversion.hxx +++ b/connectivity/inc/connectivity/DateConversion.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/connectivity/inc/connectivity/DriversConfig.hxx b/connectivity/inc/connectivity/DriversConfig.hxx index 97db65f3a986..6b2e26520f99 100644 --- a/connectivity/inc/connectivity/DriversConfig.hxx +++ b/connectivity/inc/connectivity/DriversConfig.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -56,7 +56,7 @@ namespace connectivity void Load(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB) const; public: DriversConfigImpl(); - + const TInstalledDrivers& getInstalledDrivers(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB) const { Load(_rxORB); return m_aDrivers; } }; // @@ -65,7 +65,7 @@ namespace connectivity class OOO_DLLPUBLIC_DBTOOLS DriversConfig { typedef salhelper::SingletonRef<DriversConfigImpl> OSharedConfigNode; - + const ::comphelper::NamedValueCollection& impl_get(const ::rtl::OUString& _sURL,sal_Int32 _nProps) const; public: DriversConfig(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB); diff --git a/connectivity/inc/connectivity/FValue.hxx b/connectivity/inc/connectivity/FValue.hxx index 955f8227c74a..65d86eddd37a 100644 --- a/connectivity/inc/connectivity/FValue.hxx +++ b/connectivity/inc/connectivity/FValue.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -55,20 +55,20 @@ namespace connectivity { union { - sal_Bool m_bBool; - sal_Int8 m_nInt8; - sal_Int16 m_nInt16; - sal_Int32 m_nInt32; - rtl_uString* m_pString; + sal_Bool m_bBool; + sal_Int8 m_nInt8; + sal_Int16 m_nInt16; + sal_Int32 m_nInt32; + rtl_uString* m_pString; - void* m_pValue; // can contains double, etc + void* m_pValue; // can contains double, etc } m_aValue; - sal_Int32 m_eTypeKind; // the database type - sal_Bool m_bNull : 1; // value is null - sal_Bool m_bBound : 1; // is bound - sal_Bool m_bModified : 1; // value was changed - sal_Bool m_bSigned : 1; // value is signed + sal_Int32 m_eTypeKind; // the database type + sal_Bool m_bNull : 1; // value is null + sal_Bool m_bBound : 1; // is bound + sal_Bool m_bModified : 1; // value was changed + sal_Bool m_bSigned : 1; // value is signed void free(); @@ -259,13 +259,13 @@ namespace connectivity // we the possiblity to save a any for bookmarks ORowSetValue& operator=(const ::com::sun::star::uno::Any& _rAny); - operator sal_Bool() const { return isNull() ? sal_False : getBool(); } - operator sal_Int8() const { return isNull() ? static_cast<sal_Int8>(0) : getInt8(); } - operator sal_Int16() const { return isNull() ? static_cast<sal_Int16>(0) : getInt16(); } - operator sal_Int32() const { return isNull() ? 0 : getInt32(); } - operator sal_Int64() const { return isNull() ? 0 : getLong(); } - operator float() const { return isNull() ? (float)0.0: getFloat(); } - operator double() const { return isNull() ? 0.0 : getDouble(); } + operator sal_Bool() const { return isNull() ? sal_False : getBool(); } + operator sal_Int8() const { return isNull() ? static_cast<sal_Int8>(0) : getInt8(); } + operator sal_Int16() const { return isNull() ? static_cast<sal_Int16>(0) : getInt16(); } + operator sal_Int32() const { return isNull() ? 0 : getInt32(); } + operator sal_Int64() const { return isNull() ? 0 : getLong(); } + operator float() const { return isNull() ? (float)0.0: getFloat(); } + operator double() const { return isNull() ? 0.0 : getDouble(); } operator ::rtl::OUString() const { @@ -298,55 +298,55 @@ namespace connectivity return !( *this == _rRH ); } - sal_Bool isNull() const + sal_Bool isNull() const { return m_bNull; } - void setNull() + void setNull() { free(); m_bNull = sal_True; m_aValue.m_pString = NULL; } - sal_Bool isBound() const { return m_bBound; } - void setBound(sal_Bool _bBound) { m_bBound = _bBound ? 1 : 0; } + sal_Bool isBound() const { return m_bBound; } + 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 ? 1 : 0; } + sal_Bool isModified() const { return m_bModified; } + 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); + sal_Bool isSigned() const { return m_bSigned; } + void setSigned(sal_Bool _bMod=sal_True); - sal_Int32 getTypeKind() const { return m_eTypeKind; } - void setTypeKind(sal_Int32 _eType); + sal_Int32 getTypeKind() const { return m_eTypeKind; } + void setTypeKind(sal_Int32 _eType); // before calling one of this methods, be sure that the value is not null - void* getValue() const { OSL_ENSURE(m_bBound,"Value is not bound!");return m_aValue.m_pValue; } - sal_Bool getBool() const; - sal_Int8 getInt8() const; - sal_Int16 getInt16() const; - sal_Int32 getInt32() const; - sal_Int64 getLong() const; - double getDouble() const; - float getFloat() const; + void* getValue() const { OSL_ENSURE(m_bBound,"Value is not bound!");return m_aValue.m_pValue; } + sal_Bool getBool() const; + sal_Int8 getInt8() const; + sal_Int16 getInt16() const; + sal_Int32 getInt32() const; + sal_Int64 getLong() const; + double getDouble() const; + float getFloat() const; // convert the double to the type _nDataType - void setFromDouble(const double& _rVal,sal_Int32 _nDatatype); + void setFromDouble(const double& _rVal,sal_Int32 _nDatatype); - ::rtl::OUString getString() const; // makes a automatic conversion if type isn't a string - ::com::sun::star::util::Date getDate() const; - ::com::sun::star::util::Time getTime() const; - ::com::sun::star::util::DateTime getDateTime() const; - ::com::sun::star::uno::Sequence<sal_Int8> getSequence() const; + ::rtl::OUString getString() const; // makes a automatic conversion if type isn't a string + ::com::sun::star::util::Date getDate() const; + ::com::sun::star::util::Time getTime() const; + ::com::sun::star::util::DateTime getDateTime() const; + ::com::sun::star::uno::Sequence<sal_Int8> getSequence() const; // only use for anys - ::com::sun::star::uno::Any getAny() const { return *(::com::sun::star::uno::Any*)m_aValue.m_pValue; } - ::com::sun::star::uno::Any makeAny() const; + ::com::sun::star::uno::Any getAny() const { return *(::com::sun::star::uno::Any*)m_aValue.m_pValue; } + ::com::sun::star::uno::Any makeAny() const; /** fetches a single value out of the row - @param _nPos the current column position - @param _nType the type of the current column - @param _xRow the row where to fetch the data from + @param _nPos the current column position + @param _nType the type of the current column + @param _xRow the row where to fetch the data from */ void fill(sal_Int32 _nPos, sal_Int32 _nType, @@ -354,10 +354,10 @@ namespace connectivity /** fetches a single value out of the row - @param _nPos the current column position - @param _nType the type of the current column + @param _nPos the current column position + @param _nType the type of the current column @param _bNullable if true then it will be checked if the result could be NULL, otherwise not. - @param _xRow the row where to fetch the data from + @param _xRow the row where to fetch the data from */ void fill(sal_Int32 _nPos, sal_Int32 _nType, @@ -376,22 +376,22 @@ namespace connectivity /// ORowSetValueDecorator decorates a ORowSetValue so the value is "refcounted" class OOO_DLLPUBLIC_DBTOOLS ORowSetValueDecorator : public ::salhelper::SimpleReferenceObject { - ORowSetValue m_aValue; // my own value + ORowSetValue m_aValue; // my own value public: ORowSetValueDecorator(){m_aValue.setBound(sal_True);} ORowSetValueDecorator(const ORowSetValue& _aValue) : m_aValue(_aValue){m_aValue.setBound(sal_True);} ORowSetValueDecorator& operator=(const ORowSetValue& _aValue); - inline operator const ORowSetValue&() const { return m_aValue; } - inline bool operator ==( const ORowSetValue & _rRH ) { return m_aValue == _rRH; } - inline const ORowSetValue& getValue() const { return m_aValue; } - inline ORowSetValue& get() { return m_aValue; } - inline void setValue(const ORowSetValue& _aValue) { m_aValue = _aValue; } - inline void setNull() { m_aValue.setNull(); } - inline void setBound(sal_Bool _bBound ) { m_aValue.setBound(_bBound);} - inline sal_Bool isBound( ) const { return m_aValue.isBound();} - inline void setTypeKind(sal_Int32 _nType) { m_aValue.setTypeKind(_nType); } - inline void setModified(sal_Bool _bModified) { m_aValue.setModified(_bModified); } + inline operator const ORowSetValue&() const { return m_aValue; } + inline bool operator ==( const ORowSetValue & _rRH ) { return m_aValue == _rRH; } + inline const ORowSetValue& getValue() const { return m_aValue; } + inline ORowSetValue& get() { return m_aValue; } + inline void setValue(const ORowSetValue& _aValue) { m_aValue = _aValue; } + inline void setNull() { m_aValue.setNull(); } + inline void setBound(sal_Bool _bBound ) { m_aValue.setBound(_bBound);} + inline sal_Bool isBound( ) const { return m_aValue.isBound();} + inline void setTypeKind(sal_Int32 _nType) { m_aValue.setTypeKind(_nType); } + inline void setModified(sal_Bool _bModified) { m_aValue.setModified(_bModified); } }; typedef ::rtl::Reference<ORowSetValueDecorator> ORowSetValueDecoratorRef; @@ -421,29 +421,29 @@ namespace connectivity // ---------------------------------------------------------------------------- template< class VectorVal > class ODeleteVector : public connectivity::ORowVector< VectorVal > { - sal_Bool m_bDeleted; + sal_Bool m_bDeleted; public: - ODeleteVector() : connectivity::ORowVector< VectorVal >() ,m_bDeleted(sal_False) {} - ODeleteVector(size_t _st) : connectivity::ORowVector< VectorVal >(_st) ,m_bDeleted(sal_False) {} + ODeleteVector() : connectivity::ORowVector< VectorVal >() ,m_bDeleted(sal_False) {} + ODeleteVector(size_t _st) : connectivity::ORowVector< VectorVal >(_st) ,m_bDeleted(sal_False) {} - sal_Bool isDeleted() const { return m_bDeleted; } - void setDeleted(sal_Bool _bDeleted) { m_bDeleted = _bDeleted; } + sal_Bool isDeleted() const { return m_bDeleted; } + void setDeleted(sal_Bool _bDeleted) { m_bDeleted = _bDeleted; } }; - typedef ODeleteVector< ORowSetValue > OValueVector; + typedef ODeleteVector< ORowSetValue > OValueVector; class OOO_DLLPUBLIC_DBTOOLS OValueRefVector : public ODeleteVector< ORowSetValueDecoratorRef > { public: OValueRefVector(){} - OValueRefVector(size_t _st) : ODeleteVector< ORowSetValueDecoratorRef >(_st) + OValueRefVector(size_t _st) : ODeleteVector< ORowSetValueDecoratorRef >(_st) { for(OValueRefVector::Vector::iterator aIter = get().begin() ; aIter != get().end() ;++aIter) *aIter = new ORowSetValueDecorator; } }; -#define SQL_NO_PARAMETER (SAL_MAX_UINT32) +#define SQL_NO_PARAMETER (SAL_MAX_UINT32) class OAssignValues : public OValueRefVector { ::std::vector<sal_Int32> m_nParameterIndexes; @@ -459,8 +459,8 @@ namespace connectivity - typedef ::rtl::Reference< OValueVector > OValueRow; - typedef ::rtl::Reference< OValueRefVector > OValueRefRow; + typedef ::rtl::Reference< OValueVector > OValueRow; + typedef ::rtl::Reference< OValueRefVector > OValueRefRow; } #endif // #ifndef _CONNECTIVITY_FILE_VALUE_HXX_ diff --git a/connectivity/inc/connectivity/IParseContext.hxx b/connectivity/inc/connectivity/IParseContext.hxx index 16bae3465820..9d20b4f86363 100644 --- a/connectivity/inc/connectivity/IParseContext.hxx +++ b/connectivity/inc/connectivity/IParseContext.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -42,24 +42,24 @@ namespace connectivity class IParseContext { public: - enum ErrorCode + enum ErrorCode { - ERROR_NONE = 0, - ERROR_GENERAL, // "Syntax error in SQL expression" - ERROR_VALUE_NO_LIKE, // "The value #1 can not be used with LIKE." - ERROR_FIELD_NO_LIKE, // "LIKE can not be used with this field." - ERROR_INVALID_COMPARE, // "The entered criterion can not be compared with this field." - ERROR_INVALID_INT_COMPARE, // "The field can not be compared with a number." - ERROR_INVALID_DATE_COMPARE, // "The field can not be compared with a date." - ERROR_INVALID_REAL_COMPARE, // "The field can not be compared with a floating point number." - ERROR_INVALID_TABLE, // "The database does not contain a table named \"#\"." + ERROR_NONE = 0, + ERROR_GENERAL, // "Syntax error in SQL expression" + ERROR_VALUE_NO_LIKE, // "The value #1 can not be used with LIKE." + ERROR_FIELD_NO_LIKE, // "LIKE can not be used with this field." + ERROR_INVALID_COMPARE, // "The entered criterion can not be compared with this field." + ERROR_INVALID_INT_COMPARE, // "The field can not be compared with a number." + ERROR_INVALID_DATE_COMPARE, // "The field can not be compared with a date." + ERROR_INVALID_REAL_COMPARE, // "The field can not be compared with a floating point number." + ERROR_INVALID_TABLE, // "The database does not contain a table named \"#\"." ERROR_INVALID_TABLE_OR_QUERY, // "The database does contain neither a table nor a query named \"#\"." - ERROR_INVALID_COLUMN, // "The column \"#1\" is unknown in the table \"#2\"." - ERROR_INVALID_TABLE_EXIST, // "The database already contains a table or view with name \"#\"." + ERROR_INVALID_COLUMN, // "The column \"#1\" is unknown in the table \"#2\"." + ERROR_INVALID_TABLE_EXIST, // "The database already contains a table or view with name \"#\"." ERROR_INVALID_QUERY_EXIST // "The database already contains a query with name \"#\"."; }; - enum InternationalKeyCode + enum InternationalKeyCode { KEY_NONE = 0, KEY_LIKE, diff --git a/connectivity/inc/connectivity/PColumn.hxx b/connectivity/inc/connectivity/PColumn.hxx index 281566b5e792..f929085a5e54 100644 --- a/connectivity/inc/connectivity/PColumn.hxx +++ b/connectivity/inc/connectivity/PColumn.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -49,12 +49,12 @@ namespace connectivity class OOO_DLLPUBLIC_DBTOOLS OParseColumn : public OParseColumn_BASE, public OParseColumn_PROP { - ::rtl::OUString m_aRealName; + ::rtl::OUString m_aRealName; ::rtl::OUString m_aTableName; ::rtl::OUString m_sLabel; - sal_Bool m_bFunction; - sal_Bool m_bDbasePrecisionChanged; - sal_Bool m_bAggregateFunction; + sal_Bool m_bFunction; + sal_Bool m_bDbasePrecisionChanged; + sal_Bool m_bAggregateFunction; sal_Bool m_bIsSearchable; protected: @@ -68,29 +68,29 @@ namespace connectivity const ::rtl::OUString& _TypeName, const ::rtl::OUString& _DefaultValue, const ::rtl::OUString& _Description, - sal_Int32 _IsNullable, - sal_Int32 _Precision, - sal_Int32 _Scale, - sal_Int32 _Type, - sal_Bool _IsAutoIncrement, - sal_Bool _IsCurrency, - sal_Bool _bCase); + sal_Int32 _IsNullable, + sal_Int32 _Precision, + sal_Int32 _Scale, + sal_Int32 _Type, + sal_Bool _IsAutoIncrement, + sal_Bool _IsCurrency, + sal_Bool _bCase); virtual void construct(); void setRealName(const ::rtl::OUString& _rName) { m_aRealName = _rName; } void setLabel(const ::rtl::OUString& i_sLabel) { m_sLabel = i_sLabel; } void setTableName(const ::rtl::OUString& _rName) { m_aTableName = _rName; } - void setFunction(sal_Bool _bFunction) { m_bFunction = _bFunction; } - void setAggregateFunction(sal_Bool _bFunction) { m_bAggregateFunction = _bFunction; } + void setFunction(sal_Bool _bFunction) { m_bFunction = _bFunction; } + void setAggregateFunction(sal_Bool _bFunction) { m_bAggregateFunction = _bFunction; } void setIsSearchable( sal_Bool _bIsSearchable ) { m_bIsSearchable = _bIsSearchable; } - void setDbasePrecisionChanged(sal_Bool _bDbasePrecisionChanged) { m_bDbasePrecisionChanged = _bDbasePrecisionChanged; } + void setDbasePrecisionChanged(sal_Bool _bDbasePrecisionChanged) { m_bDbasePrecisionChanged = _bDbasePrecisionChanged; } ::rtl::OUString getRealName() const { return m_aRealName; } ::rtl::OUString getLabel() const { return m_sLabel; } ::rtl::OUString getTableName() const { return m_aTableName; } - sal_Bool getFunction() const { return m_bFunction; } - sal_Bool getDbasePrecisionChanged() const { return m_bDbasePrecisionChanged; } + sal_Bool getFunction() const { return m_bFunction; } + sal_Bool getDbasePrecisionChanged() const { return m_bDbasePrecisionChanged; } public: /** creates a collection of OParseColumn, as described by a result set meta data instance. @@ -126,8 +126,8 @@ namespace connectivity class OOO_DLLPUBLIC_DBTOOLS OOrderColumn : public OOrderColumn_BASE, public OOrderColumn_PROP { - sal_Bool m_bAscending; - sal_Bool m_bOrder; + sal_Bool m_bAscending; + sal_Bool m_bOrder; protected: virtual ::cppu::IPropertyArrayHelper* createArrayHelper() const; virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); diff --git a/connectivity/inc/connectivity/ParameterCont.hxx b/connectivity/inc/connectivity/ParameterCont.hxx index 64cb5faf209b..17218ccf6722 100644 --- a/connectivity/inc/connectivity/ParameterCont.hxx +++ b/connectivity/inc/connectivity/ParameterCont.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -39,12 +39,12 @@ namespace dbtools //==================================================================== class OOO_DLLPUBLIC_DBTOOLS OParameterContinuation : public comphelper::OInteraction< ::com::sun::star::sdb::XInteractionSupplyParameters > { - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aValues; + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aValues; public: OParameterContinuation() { } - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > getValues() const { return m_aValues; } + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > getValues() const { return m_aValues; } // XInteractionSupplyParameters virtual void SAL_CALL setParameters( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& _rValues ) throw(::com::sun::star::uno::RuntimeException); diff --git a/connectivity/inc/connectivity/SQLStatementHelper.hxx b/connectivity/inc/connectivity/SQLStatementHelper.hxx index 152baed5292a..4cad600437eb 100644 --- a/connectivity/inc/connectivity/SQLStatementHelper.hxx +++ b/connectivity/inc/connectivity/SQLStatementHelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2008 by Sun Microsystems, Inc. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ namespace dbtools }; //......................................................................... -} // namespace dbtools +} // namespace dbtools //......................................................................... #endif // _CONNECTIVITY_SQLSTATEMENTHELPER_HXX_ diff --git a/connectivity/inc/connectivity/StdTypeDefs.hxx b/connectivity/inc/connectivity/StdTypeDefs.hxx index 50dd14358347..4dce68265770 100644 --- a/connectivity/inc/connectivity/StdTypeDefs.hxx +++ b/connectivity/inc/connectivity/StdTypeDefs.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -38,11 +38,11 @@ namespace rtl { class OUString; } namespace connectivity { - typedef ::std::vector< ::rtl::OUString> TStringVector; - typedef ::std::vector< sal_Int32> TIntVector; - typedef ::std::map<sal_Int32,sal_Int32> TInt2IntMap; - typedef ::std::map< ::rtl::OUString,sal_Int32> TString2IntMap; - typedef ::std::map< sal_Int32,::rtl::OUString> TInt2StringMap; + typedef ::std::vector< ::rtl::OUString> TStringVector; + typedef ::std::vector< sal_Int32> TIntVector; + typedef ::std::map<sal_Int32,sal_Int32> TInt2IntMap; + typedef ::std::map< ::rtl::OUString,sal_Int32> TString2IntMap; + typedef ::std::map< sal_Int32,::rtl::OUString> TInt2StringMap; } #endif // CONNECTIVITY_STDTYPEDEFS_HXX diff --git a/connectivity/inc/connectivity/TColumnsHelper.hxx b/connectivity/inc/connectivity/TColumnsHelper.hxx index 92d0cbd0980e..e325d0854efb 100644 --- a/connectivity/inc/connectivity/TColumnsHelper.hxx +++ b/connectivity/inc/connectivity/TColumnsHelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -44,7 +44,7 @@ namespace connectivity { OColumnsHelperImpl* m_pImpl; protected: - OTableHelper* m_pTable; + OTableHelper* m_pTable; virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); @@ -52,7 +52,7 @@ namespace connectivity virtual sdbcx::ObjectType appendObject( const ::rtl::OUString& _rForName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ); virtual void dropObject(sal_Int32 _nPos,const ::rtl::OUString _sElementName); public: - OColumnsHelper( ::cppu::OWeakObject& _rParent + OColumnsHelper( ::cppu::OWeakObject& _rParent ,sal_Bool _bCase ,::osl::Mutex& _rMutex ,const TStringVector &_rVector @@ -60,8 +60,8 @@ namespace connectivity ); virtual ~OColumnsHelper(); - /** set the parent of the columns. Can also be <NULL/>. - @param _pTable + /** set the parent of the columns. Can also be <NULL/>. + @param _pTable The parent. */ inline void setParent(OTableHelper* _pTable) { m_pTable = _pTable;} diff --git a/connectivity/inc/connectivity/TIndex.hxx b/connectivity/inc/connectivity/TIndex.hxx index 518bc699ef53..4ce05eab83bc 100644 --- a/connectivity/inc/connectivity/TIndex.hxx +++ b/connectivity/inc/connectivity/TIndex.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -38,12 +38,12 @@ namespace connectivity class OTableHelper; class OOO_DLLPUBLIC_DBTOOLS OIndexHelper : public connectivity::sdbcx::OIndex { - OTableHelper* m_pTable; + OTableHelper* m_pTable; public: virtual void refreshColumns(); public: - OIndexHelper( OTableHelper* _pTable); - OIndexHelper( OTableHelper* _pTable, + OIndexHelper( OTableHelper* _pTable); + OIndexHelper( OTableHelper* _pTable, const ::rtl::OUString& _Name, const ::rtl::OUString& _Catalog, sal_Bool _isUnique, diff --git a/connectivity/inc/connectivity/TIndexColumns.hxx b/connectivity/inc/connectivity/TIndexColumns.hxx index 8526a149d859..57214197a464 100644 --- a/connectivity/inc/connectivity/TIndexColumns.hxx +++ b/connectivity/inc/connectivity/TIndexColumns.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -43,7 +43,7 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); public: - OIndexColumns( OIndexHelper* _pIndex, + OIndexColumns( OIndexHelper* _pIndex, ::osl::Mutex& _rMutex, const ::std::vector< ::rtl::OUString> &_rVector); }; diff --git a/connectivity/inc/connectivity/TIndexes.hxx b/connectivity/inc/connectivity/TIndexes.hxx index 9a8296ee967b..e22e71d05ff3 100644 --- a/connectivity/inc/connectivity/TIndexes.hxx +++ b/connectivity/inc/connectivity/TIndexes.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -38,7 +38,7 @@ namespace connectivity class OTableHelper; class OOO_DLLPUBLIC_DBTOOLS OIndexesHelper : public sdbcx::OCollection { - OTableHelper* m_pTable; + OTableHelper* m_pTable; protected: virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); diff --git a/connectivity/inc/connectivity/TKey.hxx b/connectivity/inc/connectivity/TKey.hxx index 8d8fb089fb59..cdbaae2618fa 100644 --- a/connectivity/inc/connectivity/TKey.hxx +++ b/connectivity/inc/connectivity/TKey.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -38,12 +38,12 @@ namespace connectivity class OTableHelper; class OOO_DLLPUBLIC_DBTOOLS OTableKeyHelper : public connectivity::sdbcx::OKey { - OTableHelper* m_pTable; + OTableHelper* m_pTable; public: virtual void refreshColumns(); public: - OTableKeyHelper( OTableHelper* _pTable); - OTableKeyHelper( OTableHelper* _pTable + OTableKeyHelper( OTableHelper* _pTable); + OTableKeyHelper( OTableHelper* _pTable ,const ::rtl::OUString& _Name ,const sdbcx::TKeyProperties& _rProps ); diff --git a/connectivity/inc/connectivity/TKeyColumns.hxx b/connectivity/inc/connectivity/TKeyColumns.hxx index a4ab8f4c6e36..1c4a36295dc6 100644 --- a/connectivity/inc/connectivity/TKeyColumns.hxx +++ b/connectivity/inc/connectivity/TKeyColumns.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -43,7 +43,7 @@ namespace connectivity virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > createDescriptor(); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); public: - OKeyColumnsHelper( OTableKeyHelper* _pKey, + OKeyColumnsHelper( OTableKeyHelper* _pKey, ::osl::Mutex& _rMutex, const ::std::vector< ::rtl::OUString> &_rVector); }; diff --git a/connectivity/inc/connectivity/TKeys.hxx b/connectivity/inc/connectivity/TKeys.hxx index a1e3f8b613f1..b79cb8e2e90d 100644 --- a/connectivity/inc/connectivity/TKeys.hxx +++ b/connectivity/inc/connectivity/TKeys.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -39,7 +39,7 @@ namespace connectivity typedef sdbcx::OCollection OKeys_BASE; class OOO_DLLPUBLIC_DBTOOLS OKeysHelper : public OKeys_BASE { - OTableHelper* m_pTable; + OTableHelper* m_pTable; protected: virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); @@ -50,7 +50,7 @@ namespace connectivity virtual ::rtl::OUString getDropForeignKey() const; public: - OKeysHelper( OTableHelper* _pTable, + OKeysHelper( OTableHelper* _pTable, ::osl::Mutex& _rMutex, const TStringVector& _rVector ); diff --git a/connectivity/inc/connectivity/TTableHelper.hxx b/connectivity/inc/connectivity/TTableHelper.hxx index 432c8b7d7f4f..bcd67a94affe 100644 --- a/connectivity/inc/connectivity/TTableHelper.hxx +++ b/connectivity/inc/connectivity/TTableHelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -48,20 +48,20 @@ namespace connectivity ::rtl::OUString aField6; ::rtl::OUString sField12; // REMARKS ::rtl::OUString sField13; - sal_Int32 nField5 + sal_Int32 nField5 , nField7 - , nField9 - , nField11; - + , nField9 + , nField11; + OrdinalPosition nOrdinalPosition; ColumnDesc() {} ColumnDesc( const ::rtl::OUString& _rName - , sal_Int32 _nField5 + , sal_Int32 _nField5 , const ::rtl::OUString& _aField6 - , sal_Int32 _nField7 - , sal_Int32 _nField9 - , sal_Int32 _nField11 + , sal_Int32 _nField7 + , sal_Int32 _nField9 + , sal_Int32 _nField11 , const ::rtl::OUString& _sField12 , const ::rtl::OUString& _sField13 ,OrdinalPosition _nPosition ) @@ -69,10 +69,10 @@ namespace connectivity ,aField6(_aField6) ,sField12(_sField12) ,sField13(_sField13) - ,nField5(_nField5) + ,nField5(_nField5) ,nField7(_nField7) ,nField9(_nField9) - ,nField11(_nField11) + ,nField11(_nField11) ,nOrdinalPosition( _nPosition ) { } @@ -94,19 +94,19 @@ namespace connectivity protected: /** creates the column collection for the table - @param _rNames + @param _rNames The column names. */ virtual sdbcx::OCollection* createColumns(const TStringVector& _rNames) = 0; /** creates the key collection for the table - @param _rNames + @param _rNames The key names. */ virtual sdbcx::OCollection* createKeys(const TStringVector& _rNames) = 0; /** creates the index collection for the table - @param _rNames + @param _rNames The index names. */ virtual sdbcx::OCollection* createIndexes(const TStringVector& _rNames) = 0; @@ -131,10 +131,10 @@ namespace connectivity const ColumnDesc* getColumnDescription(const ::rtl::OUString& _sName) const; public: - OTableHelper( sdbcx::OCollection* _pTables, + OTableHelper( sdbcx::OCollection* _pTables, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, sal_Bool _bCase); - OTableHelper( sdbcx::OCollection* _pTables, + OTableHelper( sdbcx::OCollection* _pTables, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, sal_Bool _bCase, const ::rtl::OUString& _Name, diff --git a/connectivity/inc/connectivity/conncleanup.hxx b/connectivity/inc/connectivity/conncleanup.hxx index 374e70af468e..0c92da7270ee 100644 --- a/connectivity/inc/connectivity/conncleanup.hxx +++ b/connectivity/inc/connectivity/conncleanup.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -43,17 +43,17 @@ namespace dbtools //===================================================================== //= OAutoConnectionDisposer //===================================================================== - typedef ::cppu::WeakImplHelper2 < ::com::sun::star::beans::XPropertyChangeListener, + typedef ::cppu::WeakImplHelper2 < ::com::sun::star::beans::XPropertyChangeListener, ::com::sun::star::sdbc::XRowSetListener - > OAutoConnectionDisposer_Base; + > OAutoConnectionDisposer_Base; class OOO_DLLPUBLIC_DBTOOLS OAutoConnectionDisposer : public OAutoConnectionDisposer_Base { ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > m_xOriginalConnection; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet > m_xRowSet; // needed to add as listener - sal_Bool m_bRSListening : 1; // true when we're listening on rowset - sal_Bool m_bPropertyListening : 1; // true when we're listening for property changes + sal_Bool m_bRSListening : 1; // true when we're listening on rowset + sal_Bool m_bPropertyListening : 1; // true when we're listening for property changes public: /** constructs an object @@ -81,17 +81,17 @@ namespace dbtools private: void clearConnection(); - void startRowSetListening(); - void stopRowSetListening(); - sal_Bool isRowSetListening() const { return m_bRSListening; } + void startRowSetListening(); + void stopRowSetListening(); + sal_Bool isRowSetListening() const { return m_bRSListening; } - void startPropertyListening( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxProps ); - void stopPropertyListening( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxEventSource ); - sal_Bool isPropertyListening() const { return m_bPropertyListening; } + void startPropertyListening( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxProps ); + void stopPropertyListening( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxEventSource ); + sal_Bool isPropertyListening() const { return m_bPropertyListening; } }; //......................................................................... -} // namespace dbtools +} // namespace dbtools //......................................................................... #endif // _CONNECTIVITY_CONNCLEANUP_HXX_ diff --git a/connectivity/inc/connectivity/dbcharset.hxx b/connectivity/inc/connectivity/dbcharset.hxx index 60c96fb71a2f..015d441a5d64 100644 --- a/connectivity/inc/connectivity/dbcharset.hxx +++ b/connectivity/inc/connectivity/dbcharset.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -62,7 +62,7 @@ namespace dbtools protected: DECLARE_STL_STDKEY_SET( rtl_TextEncoding, TextEncBag ); - TextEncBag m_aEncodings; + TextEncBag m_aEncodings; public: class CharsetIterator; @@ -78,25 +78,25 @@ namespace dbtools /** find the given text encoding in the map. @return the <em>end</em> iterator if the encoding could not be found. */ - CharsetIterator find(const rtl_TextEncoding _eEncoding) const; + CharsetIterator find(const rtl_TextEncoding _eEncoding) const; /** find the given IANA name in the map. @return the <em>end</em> iterator if the IANA name could not be found. */ - CharsetIterator find(const ::rtl::OUString& _rIanaName, const IANA&) const; + CharsetIterator find(const ::rtl::OUString& _rIanaName, const IANA&) const; - sal_Int32 size() const { ensureConstructed( ); return m_aEncodings.size(); } + sal_Int32 size() const { ensureConstructed( ); return m_aEncodings.size(); } /// get access to the first element of the charset collection - CharsetIterator begin() const; + CharsetIterator begin() const; /// get access to the (last + 1st) element of the charset collection - CharsetIterator end() const; + CharsetIterator end() const; protected: // needed because we want to call a virtual method during construction void lateConstruct(); - inline void ensureConstructed( ) const { if ( m_aEncodings.empty() ) const_cast< OCharsetMap* >( this )->lateConstruct(); } + inline void ensureConstructed( ) const { if ( m_aEncodings.empty() ) const_cast< OCharsetMap* >( this )->lateConstruct(); } - virtual sal_Bool approveEncoding( const rtl_TextEncoding _eEncoding, const rtl_TextEncodingInfo& _rInfo ) const; + virtual sal_Bool approveEncoding( const rtl_TextEncoding _eEncoding, const rtl_TextEncodingInfo& _rInfo ) const; }; //------------------------------------------------------------------------- @@ -106,14 +106,14 @@ namespace dbtools { friend class OCharsetMap::CharsetIterator; - rtl_TextEncoding m_eEncoding; - ::rtl::OUString m_aIanaName; + rtl_TextEncoding m_eEncoding; + ::rtl::OUString m_aIanaName; public: CharsetIteratorDerefHelper(const CharsetIteratorDerefHelper& _rSource); - rtl_TextEncoding getEncoding() const { return m_eEncoding; } - ::rtl::OUString getIanaName() const { return m_aIanaName; } + rtl_TextEncoding getEncoding() const { return m_eEncoding; } + ::rtl::OUString getIanaName() const { return m_aIanaName; } protected: CharsetIteratorDerefHelper(); @@ -132,11 +132,11 @@ namespace dbtools friend OOO_DLLPUBLIC_DBTOOLS bool operator==(const CharsetIterator& lhs, const CharsetIterator& rhs); friend bool operator!=(const CharsetIterator& lhs, const CharsetIterator& rhs) { return !(lhs == rhs); } -// friend sal_Int32 operator-(const CharsetIterator& lhs, const CharsetIterator& rhs); +// friend sal_Int32 operator-(const CharsetIterator& lhs, const CharsetIterator& rhs); protected: - const OCharsetMap* m_pContainer; - OCharsetMap::TextEncBag::const_iterator m_aPos; + const OCharsetMap* m_pContainer; + OCharsetMap::TextEncBag::const_iterator m_aPos; public: CharsetIterator(const CharsetIterator& _rSource); @@ -148,21 +148,21 @@ namespace dbtools // can return a pointer or b) introduce a -> operator on the CharsetIteratorDerefHelper, too. /// prefix increment - const CharsetIterator& operator++(); + const CharsetIterator& operator++(); /// postfix increment - const CharsetIterator operator++(int) { CharsetIterator hold(*this); ++*this; return hold; } + const CharsetIterator operator++(int) { CharsetIterator hold(*this); ++*this; return hold; } /// prefix decrement - const CharsetIterator& operator--(); + const CharsetIterator& operator--(); /// postfix decrement - const CharsetIterator operator--(int) { CharsetIterator hold(*this); --*this; return hold; } + const CharsetIterator operator--(int) { CharsetIterator hold(*this); --*this; return hold; } protected: CharsetIterator(const OCharsetMap* _pContainer, OCharsetMap::TextEncBag::const_iterator _aPos ); }; //......................................................................... -} // namespace dbtools +} // namespace dbtools //......................................................................... #endif // _DBHELPER_DBCHARSET_HXX_ diff --git a/connectivity/inc/connectivity/dbconversion.hxx b/connectivity/inc/connectivity/dbconversion.hxx index 096810fab60e..851a65fe8a7c 100644 --- a/connectivity/inc/connectivity/dbconversion.hxx +++ b/connectivity/inc/connectivity/dbconversion.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -115,12 +115,12 @@ namespace dbtools sal_Int32 nKey, sal_Int16 nKeyType); - static ::com::sun::star::util::Date toDate(double dVal, const ::com::sun::star::util::Date& _rNullDate = getStandardDate()); - static ::com::sun::star::util::Date toDate(const ::rtl::OUString& _sSQLDate); - static ::com::sun::star::util::Time toTime(double dVal); - static ::com::sun::star::util::Time toTime(const ::rtl::OUString& _sSQLDate); - static ::com::sun::star::util::DateTime toDateTime(double dVal, const ::com::sun::star::util::Date& _rNullDate = getStandardDate()); - static ::com::sun::star::util::DateTime toDateTime(const ::rtl::OUString& _sSQLDate); + static ::com::sun::star::util::Date toDate(double dVal, const ::com::sun::star::util::Date& _rNullDate = getStandardDate()); + static ::com::sun::star::util::Date toDate(const ::rtl::OUString& _sSQLDate); + static ::com::sun::star::util::Time toTime(double dVal); + static ::com::sun::star::util::Time toTime(const ::rtl::OUString& _sSQLDate); + static ::com::sun::star::util::DateTime toDateTime(double dVal, const ::com::sun::star::util::Date& _rNullDate = getStandardDate()); + static ::com::sun::star::util::DateTime toDateTime(const ::rtl::OUString& _sSQLDate); /** return the given DateTime as JDBC compliant 64 bit value @@ -130,15 +130,15 @@ namespace dbtools static sal_Int32 toDays(const ::com::sun::star::util::Date& _rVal, const ::com::sun::star::util::Date& _rNullDate = getStandardDate()); - static double toDouble(const ::com::sun::star::util::Date& rVal, const ::com::sun::star::util::Date& _rNullDate = getStandardDate()); - static double toDouble(const ::com::sun::star::util::Time& rVal); - static double toDouble(const ::com::sun::star::util::DateTime& rVal, const ::com::sun::star::util::Date& _rNullDate = getStandardDate()); + static double toDouble(const ::com::sun::star::util::Date& rVal, const ::com::sun::star::util::Date& _rNullDate = getStandardDate()); + static double toDouble(const ::com::sun::star::util::Time& rVal); + static double toDouble(const ::com::sun::star::util::DateTime& rVal, const ::com::sun::star::util::Date& _rNullDate = getStandardDate()); - static sal_Int32 toINT32(const ::com::sun::star::util::Date& rVal); - static sal_Int32 toINT32(const ::com::sun::star::util::Time& rVal); + static sal_Int32 toINT32(const ::com::sun::star::util::Date& rVal); + static sal_Int32 toINT32(const ::com::sun::star::util::Time& rVal); - static ::com::sun::star::util::Date toDate(sal_Int32 _nVal); - static ::com::sun::star::util::Time toTime(sal_Int32 _nVal); + static ::com::sun::star::util::Date toDate(sal_Int32 _nVal); + static ::com::sun::star::util::Time toTime(sal_Int32 _nVal); /** convert a double which is a date value relative to a given fixed date into a date value relative to the standard db null date. @@ -218,7 +218,7 @@ namespace dbtools }; //......................................................................... -} // namespace dbtools +} // namespace dbtools //......................................................................... #endif // _DBHELPER_DBCONVERSION_HXX_ diff --git a/connectivity/inc/connectivity/dbexception.hxx b/connectivity/inc/connectivity/dbexception.hxx index aa87f82d9b43..1da9f273aaeb 100644 --- a/connectivity/inc/connectivity/dbexception.hxx +++ b/connectivity/inc/connectivity/dbexception.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -74,8 +74,8 @@ public: enum TYPE { SQL_EXCEPTION, SQL_WARNING, SQL_CONTEXT, UNDEFINED }; private: - ::com::sun::star::uno::Any m_aContent; - TYPE m_eType; // redundant (could be derived from m_aContent.getValueType()) + ::com::sun::star::uno::Any m_aContent; + TYPE m_eType; // redundant (could be derived from m_aContent.getValueType()) public: SQLExceptionInfo(); @@ -137,14 +137,14 @@ public: const SQLExceptionInfo& operator=(const ::com::sun::star::sdb::SQLErrorEvent& _rErrorEvent); const SQLExceptionInfo& operator=(const ::com::sun::star::uno::Any& _rCaughtSQLException); - sal_Bool isKindOf(TYPE _eType) const; + sal_Bool isKindOf(TYPE _eType) const; // not just a simple comparisation ! e.g. getType() == SQL_CONTEXT implies isKindOf(SQL_EXCEPTION) == sal_True ! - sal_Bool isValid() const { return m_eType != UNDEFINED; } - TYPE getType() const { return m_eType; } + sal_Bool isValid() const { return m_eType != UNDEFINED; } + TYPE getType() const { return m_eType; } - operator const ::com::sun::star::sdbc::SQLException* () const; + operator const ::com::sun::star::sdbc::SQLException* () const; operator const ::com::sun::star::sdbc::SQLWarning* () const; - operator const ::com::sun::star::sdb::SQLContext* () const; + operator const ::com::sun::star::sdb::SQLContext* () const; const ::com::sun::star::uno::Any& get() const { return m_aContent; } @@ -166,7 +166,7 @@ class OOO_DLLPUBLIC_DBTOOLS SQLExceptionIteratorHelper { protected: const ::com::sun::star::sdbc::SQLException* m_pCurrent; - SQLExceptionInfo::TYPE m_eCurrentType; + SQLExceptionInfo::TYPE m_eCurrentType; public: /** constructs an iterator instance from an SQLException @@ -203,7 +203,7 @@ public: /** determines whether there are more elements in the exception chain */ - sal_Bool hasMoreElements() const { return ( m_pCurrent != NULL ); } + sal_Bool hasMoreElements() const { return ( m_pCurrent != NULL ); } /** returns the type of the current element in the exception chain */ @@ -233,11 +233,11 @@ public: In opposite to the second <member>current</member>, this version allows typed access to the respective SQLException. */ - void next( SQLExceptionInfo& _out_rInfo ); + void next( SQLExceptionInfo& _out_rInfo ); }; //================================================================================== -//= StandardExceptions +//= StandardExceptions //================================================================================== //---------------------------------------------------------------------------------- /** returns a standard error string for a given SQLState @@ -370,7 +370,7 @@ OOO_DLLPUBLIC_DBTOOLS void throwSQLException( throw (::com::sun::star::sdbc::SQLException); //......................................................................... -} // namespace dbtools +} // namespace dbtools //......................................................................... #endif // _DBHELPER_DBEXCEPTION_HXX_ diff --git a/connectivity/inc/connectivity/dbmetadata.hxx b/connectivity/inc/connectivity/dbmetadata.hxx index 630065276201..f50e15c4218b 100644 --- a/connectivity/inc/connectivity/dbmetadata.hxx +++ b/connectivity/inc/connectivity/dbmetadata.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/connectivity/inc/connectivity/dbtools.hxx b/connectivity/inc/connectivity/dbtools.hxx index 3319fbd40ed3..ddab63ea761e 100644 --- a/connectivity/inc/connectivity/dbtools.hxx +++ b/connectivity/inc/connectivity/dbtools.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -111,7 +111,7 @@ namespace dbtools // calculates the default numberformat for a given datatype and a give language // @param _nDataType @see com.sun.star.sdbc.DataType - // @param _nScale can be zero + // @param _nScale can be zero OOO_DLLPUBLIC_DBTOOLS sal_Int32 getDefaultNumberFormat(sal_Int32 _nDataType, sal_Int32 _nScale, @@ -160,7 +160,7 @@ namespace dbtools const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& _rxRowSet, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory, sal_Bool _bSetAsActiveConnection - ) SAL_THROW ( ( ::com::sun::star::sdbc::SQLException + ) SAL_THROW ( ( ::com::sun::star::sdbc::SQLException , ::com::sun::star::lang::WrappedTargetException , ::com::sun::star::uno::RuntimeException ) ); @@ -191,7 +191,7 @@ namespace dbtools const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& _rxRowSet, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory, bool _bUseAutoConnectionDisposer - ) SAL_THROW ( ( ::com::sun::star::sdbc::SQLException + ) SAL_THROW ( ( ::com::sun::star::sdbc::SQLException , ::com::sun::star::lang::WrappedTargetException , ::com::sun::star::uno::RuntimeException ) ); @@ -283,7 +283,7 @@ namespace dbtools const ::rtl::OUString& _rCommand, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& _rxKeepFieldsAlive, SQLExceptionInfo* _pErrorInfo = NULL - ) SAL_THROW( ( ) ); + ) SAL_THROW( ( ) ); /** get fields for a result set given by a "command descriptor" @@ -319,7 +319,7 @@ namespace dbtools const sal_Int32 _nCommandType, const ::rtl::OUString& _rCommand, SQLExceptionInfo* _pErrorInfo = NULL - ) SAL_THROW( ( ) ); + ) SAL_THROW( ( ) ); /** create a new ::com::sun::star::sdbc::SQLContext, fill it with the given descriptions and the given source, @@ -328,7 +328,7 @@ namespace dbtools OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::sdb::SQLContext prependContextInfo(const ::com::sun::star::sdbc::SQLException& _rException, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext, const ::rtl::OUString& _rContextDescription, const ::rtl::OUString& _rContextDetails ); OOO_DLLPUBLIC_DBTOOLS - ::com::sun::star::sdbc::SQLException prependErrorInfo( + ::com::sun::star::sdbc::SQLException prependErrorInfo( const ::com::sun::star::sdbc::SQLException& _rChainedException, const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxContext, const ::rtl::OUString& _rAdditionalError, @@ -376,13 +376,13 @@ namespace dbtools <TRUE/> otherwise */ OOO_DLLPUBLIC_DBTOOLS - bool getDataSourceSetting( + bool getDataSourceSetting( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxDataSource, const sal_Char* _pAsciiSettingsName, ::com::sun::star::uno::Any& /* [out] */ _rSettingsValue ); OOO_DLLPUBLIC_DBTOOLS - bool getDataSourceSetting( + bool getDataSourceSetting( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& _rxDataSource, const ::rtl::OUString& _sSettingsName, ::com::sun::star::uno::Any& /* [out] */ _rSettingsValue @@ -402,23 +402,23 @@ namespace dbtools ,EComposeRule _eComposeRule); /** split a fully qualified table name (including catalog and schema, if appliable) into it's component parts. - @param _rxConnMetaData meta data describing the connection where you got the table name from - @param _rQualifiedName fully qualified table name - @param _rCatalog (out parameter) upon return, contains the catalog name - @param _rSchema (out parameter) upon return, contains the schema name - @param _rName (out parameter) upon return, contains the table name - @param _eComposeRule where do you need the name for + @param _rxConnMetaData meta data describing the connection where you got the table name from + @param _rQualifiedName fully qualified table name + @param _rCatalog (out parameter) upon return, contains the catalog name + @param _rSchema (out parameter) upon return, contains the schema name + @param _rName (out parameter) upon return, contains the table name + @param _eComposeRule where do you need the name for */ OOO_DLLPUBLIC_DBTOOLS void qualifiedNameComponents(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxConnMetaData, const ::rtl::OUString& _rQualifiedName, ::rtl::OUString& _rCatalog, ::rtl::OUString& _rSchema, ::rtl::OUString& _rName,EComposeRule _eComposeRule); /** calculate a NumberFormatsSupplier for use with an given connection - @param _rxConn the connection for which the formatter is requested - @param _bAllowDefault if the connection (and related components, such as it's parent) cannot supply + @param _rxConn the connection for which the formatter is requested + @param _bAllowDefault if the connection (and related components, such as it's parent) cannot supply a formatter, we can ask the DatabaseEnvironment for a default one. This parameter states if this is allowed. - @param _rxFactory required (only of _bAllowDefault is sal_True) for creating the DatabaseEnvironment. - @return the formatter all object related to the given connection should work with. + @param _rxFactory required (only of _bAllowDefault is sal_True) for creating the DatabaseEnvironment. + @return the formatter all object related to the given connection should work with. */ OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier> getNumberFormats( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _rxConn, @@ -463,9 +463,9 @@ namespace dbtools ); /** transfer and translate properties between two FormComponents - @param _rxOld the source property set - @param _rxNew the destination property set - @param _rLocale the locale for converting number related properties + @param _rxOld the source property set + @param _rxNew the destination property set + @param _rLocale the locale for converting number related properties */ OOO_DLLPUBLIC_DBTOOLS void TransferFormComponentProperties( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxOld, @@ -474,22 +474,22 @@ namespace dbtools ); /** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::INSERT - @param _rxCursorSet the property set + @param _rxCursorSet the property set */ OOO_DLLPUBLIC_DBTOOLS sal_Bool canInsert(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet); /** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::UPDATE - @param _rxCursorSet the property set + @param _rxCursorSet the property set */ OOO_DLLPUBLIC_DBTOOLS sal_Bool canUpdate(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet); /** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::DELETE - @param _rxCursorSet the property set + @param _rxCursorSet the property set */ OOO_DLLPUBLIC_DBTOOLS sal_Bool canDelete(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet); //---------------------------------------------------------------------------------- /** compose a complete table name from it's up to three parts, regarding to the database meta data composing rules */ - OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString composeTableName( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxMetaData, + OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString composeTableName( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData >& _rxMetaData, const ::rtl::OUString& _rCatalog, const ::rtl::OUString& _rSchema, const ::rtl::OUString& _rName, @@ -519,9 +519,9 @@ namespace dbtools const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xTable ); //---------------------------------------------------------------------------------- /** compose the table name out of the property set which must support the properties from the service <member scope= "com::sun::star::sdbcx">table</member> - @param _xMetaData + @param _xMetaData The metadata from the connection. - @param _xTable + @param _xTable The table. */ OOO_DLLPUBLIC_DBTOOLS ::rtl::OUString composeTableName( @@ -540,11 +540,11 @@ namespace dbtools const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory); /** search for a name that is NOT in the NameAcces - @param _rxContainer + @param _rxContainer the NameAccess container to search in - @param _rBaseName + @param _rBaseName the base name that should be used to create the new name - @param _bStartWithNumber + @param _bStartWithNumber When <TRUE/> the name ends with number even when the name itself doesn't occur in the collection. @return A name which doesn't exist in the collection. @@ -563,8 +563,8 @@ namespace dbtools ); /** create a name which is a valid SQL 92 identifier name - @param _rName the string which should be converted - @param _rSpecials @see com.sun.star.sdbc.XDatabaseMetaData.getExtraNameCharacters + @param _rName the string which should be converted + @param _rSpecials @see com.sun.star.sdbc.XDatabaseMetaData.getExtraNameCharacters @see isValidSQLName */ @@ -572,15 +572,15 @@ namespace dbtools /** checks whether the given name is a valid SQL name - @param _rName the string which should be converted - @param _rSpecials @see com.sun.star.sdbc.XDatabaseMetaData.getExtraNameCharacters + @param _rName the string which should be converted + @param _rSpecials @see com.sun.star.sdbc.XDatabaseMetaData.getExtraNameCharacters @see convertName2SQLName */ OOO_DLLPUBLIC_DBTOOLS sal_Bool isValidSQLName( const ::rtl::OUString& _rName, const ::rtl::OUString& _rSpecials ); OOO_DLLPUBLIC_DBTOOLS - void showError( const SQLExceptionInfo& _rInfo, + void showError( const SQLExceptionInfo& _rInfo, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow>& _pParent, const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory); @@ -597,47 +597,47 @@ namespace dbtools <TRUE/> if the update request was successfully re-routed to one of the other updateXXX methods */ OOO_DLLPUBLIC_DBTOOLS - sal_Bool implUpdateObject( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowUpdate >& _rxUpdatedObject, + sal_Bool implUpdateObject( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowUpdate >& _rxUpdatedObject, const sal_Int32 _nColumnIndex, - const ::com::sun::star::uno::Any& _rValue) SAL_THROW ( ( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ); + const ::com::sun::star::uno::Any& _rValue) SAL_THROW ( ( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) ); /** ask the user for parameters if the prepared statement needs some and sets them in the prepared statement - @param _xConnection the connection must be able to create <type scope="com::sun::star::sdb">SingleSelectQueryComposer</type>s - @param _xPreparedStmt the prepared statement where the parameters could be set when needed + @param _xConnection the connection must be able to create <type scope="com::sun::star::sdb">SingleSelectQueryComposer</type>s + @param _xPreparedStmt the prepared statement where the parameters could be set when needed @param _aParametersSet contains which parameters have to asked for and which already have set. */ OOO_DLLPUBLIC_DBTOOLS - void askForParameters( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer >& _xComposer, + void askForParameters( const ::com::sun::star::uno::Reference< ::com::sun::star::sdb::XSingleSelectQueryComposer >& _xComposer, 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()); /** 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 - @param parameterIndex the index of the parameter, 1 based - @param x the value to set - @param sqlType the corresponding sql type @see com::sun::star::sdbc::DataType - @param scale the scale of the sql type can be 0 + @param _xParams the parameters where to set the value + @param parameterIndex the index of the parameter, 1 based + @param x the value to set + @param sqlType the corresponding sql type @see com::sun::star::sdbc::DataType + @param scale the scale of the sql type can be 0 */ OOO_DLLPUBLIC_DBTOOLS - void setObjectWithInfo( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XParameters>& _xParameters, + void setObjectWithInfo( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XParameters>& _xParameters, sal_Int32 parameterIndex, const ::com::sun::star::uno::Any& x, sal_Int32 sqlType, sal_Int32 scale=0) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); /** 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 - @param parameterIndex the index of the parameter, 1 based - @param x the value to set - @param sqlType the corresponding sql type @see com::sun::star::sdbc::DataType - @param scale the scale of the sql type can be 0 + @param _xParams the parameters where to set the value + @param parameterIndex the index of the parameter, 1 based + @param x the value to set + @param sqlType the corresponding sql type @see com::sun::star::sdbc::DataType + @param scale the scale of the sql type can be 0 */ OOO_DLLPUBLIC_DBTOOLS - void setObjectWithInfo( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XParameters>& _xParameters, + void setObjectWithInfo( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XParameters>& _xParameters, sal_Int32 parameterIndex, const ::connectivity::ORowSetValue& x, sal_Int32 sqlType, @@ -657,88 +657,88 @@ namespace dbtools <TRUE/> if the update request was successfully re-routed to one of the other updateXXX methods */ OOO_DLLPUBLIC_DBTOOLS - sal_Bool implSetObject( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XParameters>& _rxParameters, + sal_Bool implSetObject( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XParameters>& _rxParameters, const sal_Int32 _nColumnIndex, const ::com::sun::star::uno::Any& _rValue) SAL_THROW ( ( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ) ); /** creates the standard sql create table statement without the key part. - @param descriptor + @param descriptor The descriptor of the new table. - @param _xConnection + @param _xConnection The connection. @param _bAddScale The scale will also be added when the value is 0. */ OOO_DLLPUBLIC_DBTOOLS - ::rtl::OUString createStandardCreateStatement( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor, + ::rtl::OUString createStandardCreateStatement( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, ISQLStatementHelper* _pHelper, const ::rtl::OUString& _sCreatePattern = ::rtl::OUString()); /** creates the standard sql statement for the key part of a create table statement. - @param descriptor + @param descriptor The descriptor of the new table. - @param _xConnection + @param _xConnection The connection. */ OOO_DLLPUBLIC_DBTOOLS - ::rtl::OUString createStandardKeyStatement( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor, + ::rtl::OUString createStandardKeyStatement( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection); /** creates the standard sql statement for the column part of a create table statement. @param _pHelper Allow to add special SQL constructs. - @param descriptor + @param descriptor The descriptor of the column. - @param _xConnection + @param _xConnection The connection. @param _pHelper Allow to add special SQL constructs. */ OOO_DLLPUBLIC_DBTOOLS - ::rtl::OUString createStandardColumnPart( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor + ::rtl::OUString createStandardColumnPart( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection ,ISQLStatementHelper* _pHelper = NULL ,const ::rtl::OUString& _sCreatePattern = ::rtl::OUString()); /** creates a SQL CREATE TABLE statement - - @param descriptor + + @param descriptor The descriptor of the new table. - @param _xConnection + @param _xConnection The connection. @param _pHelper Allow to add special SQL constructs. @param _sCreatePattern - + @return The CREATE TABLE statement. */ OOO_DLLPUBLIC_DBTOOLS - ::rtl::OUString createSqlCreateTableStatement( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor + ::rtl::OUString createSqlCreateTableStatement( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& descriptor ,const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection ,ISQLStatementHelper* _pHelper = NULL ,const ::rtl::OUString& _sCreatePattern = ::rtl::OUString()); /** creates a SDBC column with the help of getColumns. - @param _xTable + @param _xTable The table. - @param _rName + @param _rName The name of the column. - @param _bCase + @param _bCase Is the column case sensitive. - @param _bQueryForInfo + @param _bQueryForInfo If <TRUE/> the autoincrement and currency field will be read from the meta data, otherwise the following parameters will be used instead - @param _bIsAutoIncrement + @param _bIsAutoIncrement <TRUE/> if the column is an autoincrement. - @param _bIsCurrency + @param _bIsCurrency <TRUE/> if the column is a currency field. - @param _nDataType + @param _nDataType The data type of the column. */ OOO_DLLPUBLIC_DBTOOLS ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet> - createSDBCXColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xTable, + createSDBCXColumn( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xTable, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, const ::rtl::OUString& _rName, sal_Bool _bCase, @@ -748,11 +748,11 @@ namespace dbtools sal_Int32 _nDataType = com::sun::star::sdbc::DataType::OTHER); /** tries to locate the corresponding DataDefinitionSupplier for the given url and connection - @param _rsUrl + @param _rsUrl The URL used to connect to the database. - @param _xConnection + @param _xConnection The connection used to find the correct driver. - @param _rxFactory + @param _rxFactory Used to create the drivermanager. @return The datadefintion object. @@ -763,13 +763,13 @@ namespace dbtools const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory>& _rxFactory); /** returns the table privileges to the given parameters - @param _xMetaData + @param _xMetaData The meta data. - @param _sCatalog + @param _sCatalog contains the catalog name - @param _sSchema + @param _sSchema contains the schema name - @param _sTable + @param _sTable contains the table name */ OOO_DLLPUBLIC_DBTOOLS @@ -783,17 +783,17 @@ namespace dbtools typedef ::std::multimap< ::rtl::OUString, ColumnInformation, ::comphelper::UStringMixLess> ColumnInformationMap; /** collects the information about auto increment, currency and data type for the given column name. The column must be quoted, * is also valid. - @param _xConnection + @param _xConnection The connection. - @param _sComposedTableName + @param _sComposedTableName The quoted table name. ccc.sss.ttt - @param _sName + @param _sName The name of the column, or * - @param _rInfo + @param _rInfo The information about the column(s). */ OOO_DLLPUBLIC_DBTOOLS - void collectColumnInformation( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, + void collectColumnInformation( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection>& _xConnection, const ::rtl::OUString& _sComposedTableName, const ::rtl::OUString& _rName, ColumnInformationMap& _rInfo); @@ -819,7 +819,7 @@ namespace dbtools ); //......................................................................... -} // namespace dbtools +} // namespace dbtools //......................................................................... #endif // _CONNECTIVITY_DBTOOLS_HXX_ diff --git a/connectivity/inc/connectivity/dbtoolsdllapi.hxx b/connectivity/inc/connectivity/dbtoolsdllapi.hxx index f322ce343f2d..290744307db5 100644 --- a/connectivity/inc/connectivity/dbtoolsdllapi.hxx +++ b/connectivity/inc/connectivity/dbtoolsdllapi.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * 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 diff --git a/connectivity/inc/connectivity/filtermanager.hxx b/connectivity/inc/connectivity/filtermanager.hxx index 07a5763dd1b0..3d720a1a2158 100644 --- a/connectivity/inc/connectivity/filtermanager.hxx +++ b/connectivity/inc/connectivity/filtermanager.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/connectivity/inc/connectivity/formattedcolumnvalue.hxx b/connectivity/inc/connectivity/formattedcolumnvalue.hxx index a2ae4c3df3aa..db7cbf5643e6 100644 --- a/connectivity/inc/connectivity/formattedcolumnvalue.hxx +++ b/connectivity/inc/connectivity/formattedcolumnvalue.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/connectivity/inc/connectivity/parameters.hxx b/connectivity/inc/connectivity/parameters.hxx index 765ef3814448..741d95d5f668 100644 --- a/connectivity/inc/connectivity/parameters.hxx +++ b/connectivity/inc/connectivity/parameters.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -110,7 +110,7 @@ namespace dbtools private: ::osl::Mutex& m_rMutex; - ::cppu::OInterfaceContainerHelper m_aParameterListeners; + ::cppu::OInterfaceContainerHelper m_aParameterListeners; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xORB; @@ -203,7 +203,7 @@ namespace dbtools the value of this master column. For instance, if the database component is bound to a statement <code>SELECT * from invoice where inv_id = :cid</code>, - and there is <em>one</em> master-detail link from + and there is <em>one</em> master-detail link from @precond the instance is alive, i.e. <member>isAlive</member> returns <TRUE/> @@ -268,7 +268,7 @@ namespace dbtools ); /** initializes our query composer, and the collection of inner parameter columns - + @param _rxComponent the database component to initialize from. Must not be <NULL/> @return @@ -352,7 +352,7 @@ namespace dbtools ); /** completes all missing parameters via an interaction handler - + @precond the instance is alive, i.e. <member>isAlive</member> returns <TRUE/> @@ -365,7 +365,7 @@ namespace dbtools ); /** asks the parameter listeners to fill in final values - + @precond the instance is alive, i.e. <member>isAlive</member> returns <TRUE/> @@ -380,7 +380,7 @@ namespace dbtools private: /** retrieves the columns of the parent database component - + @precond the instance is alive, i.e. <member>isAlive</member> returns <TRUE/> @return @@ -388,7 +388,7 @@ namespace dbtools */ bool getParentColumns( ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& /* [out] */ _out_rxParentColumns, - bool _bFromComposer + bool _bFromComposer ); /** retrieves the columns of our database component diff --git a/connectivity/inc/connectivity/paramwrapper.hxx b/connectivity/inc/connectivity/paramwrapper.hxx index aa0a502a4e52..962d3513318e 100644 --- a/connectivity/inc/connectivity/paramwrapper.hxx +++ b/connectivity/inc/connectivity/paramwrapper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/connectivity/inc/connectivity/predicateinput.hxx b/connectivity/inc/connectivity/predicateinput.hxx index 84202f85e7c2..7c04fd352f49 100644 --- a/connectivity/inc/connectivity/predicateinput.hxx +++ b/connectivity/inc/connectivity/predicateinput.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -79,7 +79,7 @@ namespace dbtools If not <NULL/>, and a parsing error occurs, the error message will be copied to the string the argument points to. */ - sal_Bool normalizePredicateString( + sal_Bool normalizePredicateString( ::rtl::OUString& _rPredicateValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& _rxField, ::rtl::OUString* _pErrorMessage = NULL @@ -98,7 +98,7 @@ namespace dbtools points to. @see normalizePredicateString */ - ::rtl::OUString getPredicateValue( + ::rtl::OUString getPredicateValue( const ::rtl::OUString& _rPredicateValue, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & _rxField, sal_Bool _bForStatementUse, @@ -120,7 +120,7 @@ namespace dbtools }; //......................................................................... -} // namespace dbtools +} // namespace dbtools //......................................................................... #endif // CONNECTIVITY_PREDICATEINPUT_HXX diff --git a/connectivity/inc/connectivity/sdbcx/IRefreshable.hxx b/connectivity/inc/connectivity/sdbcx/IRefreshable.hxx index 769ed2107536..845d0f9db174 100644 --- a/connectivity/inc/connectivity/sdbcx/IRefreshable.hxx +++ b/connectivity/inc/connectivity/sdbcx/IRefreshable.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -44,13 +44,13 @@ namespace connectivity class OOO_DLLPUBLIC_DBTOOLS SAL_NO_VTABLE IRefreshableUsers { public: - virtual void refreshUsers() = 0; + virtual void refreshUsers() = 0; }; class OOO_DLLPUBLIC_DBTOOLS SAL_NO_VTABLE IRefreshableColumns { public: - virtual void refreshColumns() = 0; + virtual void refreshColumns() = 0; }; } } diff --git a/connectivity/inc/connectivity/sdbcx/VCatalog.hxx b/connectivity/inc/connectivity/sdbcx/VCatalog.hxx index dd2787a43aab..0f514fcbf271 100644 --- a/connectivity/inc/connectivity/sdbcx/VCatalog.hxx +++ b/connectivity/inc/connectivity/sdbcx/VCatalog.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -70,29 +70,29 @@ namespace connectivity friend class connectivity::OSubComponent<OCatalog, OCatalog_BASE>; protected: - ::osl::Mutex m_aMutex; + ::osl::Mutex m_aMutex; // this members are deleted when the dtor is called // they are hold weak - OCollection* m_pTables; - OCollection* m_pViews; - OCollection* m_pGroups; - OCollection* m_pUsers; + OCollection* m_pTables; + OCollection* m_pViews; + OCollection* m_pGroups; + OCollection* m_pUsers; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; // just to make things easier /** builds the name which should be used to access the object later on in the collection. Will only be called in fillNames. - @param _xRow + @param _xRow The current row from the resultset given to fillNames. */ - virtual ::rtl::OUString buildName( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow >& _xRow); + virtual ::rtl::OUString buildName( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRow >& _xRow); /** fills a vector with the nescessary names which can be used in combination with the collections. For each row buildName will be called. - @param _xResult + @param _xResult The resultset which should be used to fill the names. Will be disposed after return and set to NULL. - @param _rNames + @param _rNames The vector who will be filled. */ void fillNames(::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& _xResult,TStringVector& _rNames); @@ -105,9 +105,9 @@ namespace connectivity // refreshTables is called when the method getTables had been called // the member m_pTables has to be created - virtual void refreshTables() = 0; + virtual void refreshTables() = 0; // refreshViews is called when the method getViews had been called - virtual void refreshViews() = 0; + virtual void refreshViews() = 0; // the other refresh methods come from base classes IRefreshableGroups and IRefreshableUsers @@ -118,7 +118,7 @@ namespace connectivity void SAL_CALL release() throw(); // XTablesSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTables( ) throw(::com::sun::star::uno::RuntimeException); - // XViewsSupplier + // XViewsSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getViews( ) throw(::com::sun::star::uno::RuntimeException); // XUsersSupplier virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getUsers( ) throw(::com::sun::star::uno::RuntimeException); diff --git a/connectivity/inc/connectivity/sdbcx/VCollection.hxx b/connectivity/inc/connectivity/sdbcx/VCollection.hxx index c3262b450ca0..2ab4d895e1ea 100644 --- a/connectivity/inc/connectivity/sdbcx/VCollection.hxx +++ b/connectivity/inc/connectivity/sdbcx/VCollection.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -101,15 +101,15 @@ namespace connectivity public OCollectionBase { protected: - ::std::auto_ptr<IObjectCollection> m_pElements; + ::std::auto_ptr<IObjectCollection> m_pElements; - ::cppu::OInterfaceContainerHelper m_aContainerListeners; - ::cppu::OInterfaceContainerHelper m_aRefreshListeners; + ::cppu::OInterfaceContainerHelper m_aContainerListeners; + ::cppu::OInterfaceContainerHelper m_aRefreshListeners; protected: - ::cppu::OWeakObject& m_rParent; // parent of the collection - ::osl::Mutex& m_rMutex; // mutex of the parent - sal_Bool m_bUseIndexOnly; // is only TRUE when only an indexaccess is needed + ::cppu::OWeakObject& m_rParent; // parent of the collection + ::osl::Mutex& m_rMutex; // mutex of the parent + sal_Bool m_bUseIndexOnly; // is only TRUE when only an indexaccess is needed // the implementing class should refresh their elements virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException) = 0; @@ -179,9 +179,9 @@ namespace connectivity /** return the object, if not existent it creates it. - @param _nIndex + @param _nIndex The index of the object to create. - @return ObjectType + @return ObjectType */ ObjectType getObject(sal_Int32 _nIndex); diff --git a/connectivity/inc/connectivity/sdbcx/VColumn.hxx b/connectivity/inc/connectivity/sdbcx/VColumn.hxx index c5198a507b64..9a5948f8624c 100644 --- a/connectivity/inc/connectivity/sdbcx/VColumn.hxx +++ b/connectivity/inc/connectivity/sdbcx/VColumn.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -63,14 +63,14 @@ namespace connectivity ::rtl::OUString m_Description; ::rtl::OUString m_DefaultValue; - sal_Int32 m_IsNullable; - sal_Int32 m_Precision; - sal_Int32 m_Scale; - sal_Int32 m_Type; + sal_Int32 m_IsNullable; + sal_Int32 m_Precision; + sal_Int32 m_Scale; + sal_Int32 m_Type; - sal_Bool m_IsAutoIncrement; - sal_Bool m_IsRowVersion; - sal_Bool m_IsCurrency; + sal_Bool m_IsAutoIncrement; + sal_Bool m_IsRowVersion; + sal_Bool m_IsCurrency; using OColumnDescriptor_BASE::rBHelper; virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const; @@ -78,22 +78,22 @@ namespace connectivity virtual ~OColumn(); public: - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL acquire() throw(); + virtual void SAL_CALL release() throw(); - OColumn( sal_Bool _bCase); - OColumn( const ::rtl::OUString& _Name, + OColumn( sal_Bool _bCase); + OColumn( const ::rtl::OUString& _Name, const ::rtl::OUString& _TypeName, const ::rtl::OUString& _DefaultValue, const ::rtl::OUString& _Description, - sal_Int32 _IsNullable, - sal_Int32 _Precision, - sal_Int32 _Scale, - sal_Int32 _Type, - sal_Bool _IsAutoIncrement, - sal_Bool _IsRowVersion, - sal_Bool _IsCurrency, - sal_Bool _bCase); + sal_Int32 _IsNullable, + sal_Int32 _Precision, + sal_Int32 _Scale, + sal_Int32 _Type, + sal_Bool _IsAutoIncrement, + sal_Bool _IsRowVersion, + sal_Bool _IsCurrency, + sal_Bool _bCase); DECLARE_SERVICE_INFO(); //XInterface diff --git a/connectivity/inc/connectivity/sdbcx/VDescriptor.hxx b/connectivity/inc/connectivity/sdbcx/VDescriptor.hxx index f35459582db1..99e4bdf212c5 100644 --- a/connectivity/inc/connectivity/sdbcx/VDescriptor.hxx +++ b/connectivity/inc/connectivity/sdbcx/VDescriptor.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -50,7 +50,7 @@ namespace connectivity ,public ::com::sun::star::lang::XUnoTunnel { protected: - ::rtl::OUString m_Name; + ::rtl::OUString m_Name; /** helper for derived classes to implement OPropertyArrayUsageHelper::createArrayHelper @@ -62,17 +62,17 @@ namespace connectivity ::cppu::IPropertyArrayHelper* doCreateArrayHelper() const; private: - comphelper::UStringMixEqual m_aCase; - sal_Bool m_bNew; + comphelper::UStringMixEqual m_aCase; + sal_Bool m_bNew; public: ODescriptor(::cppu::OBroadcastHelper& _rBHelper,sal_Bool _bCase, sal_Bool _bNew = sal_False); virtual ~ODescriptor(); - - sal_Bool isNew() const { return m_bNew; } - sal_Bool getNew() const { return m_bNew; } - virtual void setNew(sal_Bool _bNew); + + sal_Bool isNew() const { return m_bNew; } + sal_Bool getNew() const { return m_bNew; } + virtual void setNew(sal_Bool _bNew); sal_Bool isCaseSensitive() const { return m_aCase.isCaseSensitive(); } @@ -87,7 +87,7 @@ namespace connectivity { return m_aCase(m_Name,_rRH); } - + // com::sun::star::lang::XUnoTunnel virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Sequence< sal_Int8 > getUnoTunnelImplementationId(); diff --git a/connectivity/inc/connectivity/sdbcx/VGroup.hxx b/connectivity/inc/connectivity/sdbcx/VGroup.hxx index 37c50d9956ab..55a6cf6f9d27 100644 --- a/connectivity/inc/connectivity/sdbcx/VGroup.hxx +++ b/connectivity/inc/connectivity/sdbcx/VGroup.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -51,7 +51,7 @@ namespace connectivity { typedef OCollection OUsers; - typedef ::cppu::WeakComponentImplHelper4< ::com::sun::star::sdbcx::XUsersSupplier, + typedef ::cppu::WeakComponentImplHelper4< ::com::sun::star::sdbcx::XUsersSupplier, ::com::sun::star::sdbcx::XAuthorizable, ::com::sun::star::container::XNamed, ::com::sun::star::lang::XServiceInfo> OGroup_BASE; @@ -64,7 +64,7 @@ namespace connectivity public ODescriptor { protected: - OUsers* m_pUsers; + OUsers* m_pUsers; using OGroup_BASE::rBHelper; diff --git a/connectivity/inc/connectivity/sdbcx/VIndex.hxx b/connectivity/inc/connectivity/sdbcx/VIndex.hxx index 4058e91bbc76..34a86d370bb6 100644 --- a/connectivity/inc/connectivity/sdbcx/VIndex.hxx +++ b/connectivity/inc/connectivity/sdbcx/VIndex.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -62,12 +62,12 @@ namespace connectivity public OIndex_BASE { protected: - ::rtl::OUString m_Catalog; - sal_Bool m_IsUnique; - sal_Bool m_IsPrimaryKeyIndex; - sal_Bool m_IsClustered; + ::rtl::OUString m_Catalog; + sal_Bool m_IsUnique; + sal_Bool m_IsPrimaryKeyIndex; + sal_Bool m_IsClustered; - OCollection* m_pColumns; + OCollection* m_pColumns; using ODescriptor_BASE::rBHelper; virtual void refreshColumns(); @@ -76,7 +76,7 @@ namespace connectivity virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); public: OIndex(sal_Bool _bCase); - OIndex( const ::rtl::OUString& _Name, + OIndex( const ::rtl::OUString& _Name, const ::rtl::OUString& _Catalog, sal_Bool _isUnique, sal_Bool _isPrimaryKeyIndex, diff --git a/connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx b/connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx index 8236af4bc9dc..97cfacbc4581 100644 --- a/connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx +++ b/connectivity/inc/connectivity/sdbcx/VIndexColumn.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -43,23 +43,23 @@ namespace connectivity public OColumn, public OIndexColumn_PROP { protected: - sal_Bool m_IsAscending; + sal_Bool m_IsAscending; virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); public: - OIndexColumn( sal_Bool _bCase); - OIndexColumn( sal_Bool _IsAscending, + OIndexColumn( sal_Bool _bCase); + OIndexColumn( sal_Bool _IsAscending, const ::rtl::OUString& _Name, const ::rtl::OUString& _TypeName, const ::rtl::OUString& _DefaultValue, - sal_Int32 _IsNullable, - sal_Int32 _Precision, - sal_Int32 _Scale, - sal_Int32 _Type, - sal_Bool _IsAutoIncrement, - sal_Bool _IsRowVersion, - sal_Bool _IsCurrency, - sal_Bool _bCase); + sal_Int32 _IsNullable, + sal_Int32 _Precision, + sal_Int32 _Scale, + sal_Int32 _Type, + sal_Bool _IsAutoIncrement, + sal_Bool _IsRowVersion, + sal_Bool _IsCurrency, + sal_Bool _bCase); virtual void construct(); DECLARE_SERVICE_INFO(); diff --git a/connectivity/inc/connectivity/sdbcx/VKey.hxx b/connectivity/inc/connectivity/sdbcx/VKey.hxx index 23796368d208..a6772d322b01 100644 --- a/connectivity/inc/connectivity/sdbcx/VKey.hxx +++ b/connectivity/inc/connectivity/sdbcx/VKey.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -51,13 +51,13 @@ namespace connectivity { ::std::vector< ::rtl::OUString> m_aKeyColumnNames; ::rtl::OUString m_ReferencedTable; - sal_Int32 m_Type; - sal_Int32 m_UpdateRule; - sal_Int32 m_DeleteRule; + sal_Int32 m_Type; + sal_Int32 m_UpdateRule; + sal_Int32 m_DeleteRule; KeyProperties(const ::rtl::OUString& _ReferencedTable, - sal_Int32 _Type, - sal_Int32 _UpdateRule, - sal_Int32 _DeleteRule) + sal_Int32 _Type, + sal_Int32 _UpdateRule, + sal_Int32 _DeleteRule) :m_ReferencedTable(_ReferencedTable), m_Type(_Type), m_UpdateRule(_UpdateRule), @@ -79,7 +79,7 @@ namespace connectivity { protected: TKeyProperties m_aProps; - OCollection* m_pColumns; + OCollection* m_pColumns; using ODescriptor_BASE::rBHelper; // OPropertyArrayUsageHelper @@ -89,11 +89,11 @@ namespace connectivity public: OKey(sal_Bool _bCase); OKey(const ::rtl::OUString& _Name,const TKeyProperties& _rProps,sal_Bool _bCase); - /*OKey( const ::rtl::OUString& _Name, + /*OKey( const ::rtl::OUString& _Name, const ::rtl::OUString& _ReferencedTable, - sal_Int32 _Type, - sal_Int32 _UpdateRule, - sal_Int32 _DeleteRule, + sal_Int32 _Type, + sal_Int32 _UpdateRule, + sal_Int32 _DeleteRule, sal_Bool _bCase);*/ virtual ~OKey( ); diff --git a/connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx b/connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx index 057b989fe1f1..e68e8e5352e7 100644 --- a/connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx +++ b/connectivity/inc/connectivity/sdbcx/VKeyColumn.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -43,23 +43,23 @@ namespace connectivity public OColumn, public OKeyColumn_PROP { protected: - ::rtl::OUString m_ReferencedColumn; + ::rtl::OUString m_ReferencedColumn; virtual ::cppu::IPropertyArrayHelper* createArrayHelper( sal_Int32 _nId) const; virtual ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); public: OKeyColumn(sal_Bool _bCase); - OKeyColumn( const ::rtl::OUString& _ReferencedColumn, + OKeyColumn( const ::rtl::OUString& _ReferencedColumn, const ::rtl::OUString& _Name, const ::rtl::OUString& _TypeName, const ::rtl::OUString& _DefaultValue, - sal_Int32 _IsNullable, - sal_Int32 _Precision, - sal_Int32 _Scale, - sal_Int32 _Type, - sal_Bool _IsAutoIncrement, - sal_Bool _IsRowVersion, - sal_Bool _IsCurrency, - sal_Bool _bCase); + sal_Int32 _IsNullable, + sal_Int32 _Precision, + sal_Int32 _Scale, + sal_Int32 _Type, + sal_Bool _IsAutoIncrement, + sal_Bool _IsRowVersion, + sal_Bool _IsCurrency, + sal_Bool _bCase); // just to make it not inline virtual ~OKeyColumn(); diff --git a/connectivity/inc/connectivity/sdbcx/VTable.hxx b/connectivity/inc/connectivity/sdbcx/VTable.hxx index fe3223ec31a4..ae14d06f3912 100644 --- a/connectivity/inc/connectivity/sdbcx/VTable.hxx +++ b/connectivity/inc/connectivity/sdbcx/VTable.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -54,18 +54,18 @@ namespace connectivity class OTable; class OCollection; - typedef ::cppu::WeakComponentImplHelper4< ::com::sun::star::sdbcx::XColumnsSupplier, + typedef ::cppu::WeakComponentImplHelper4< ::com::sun::star::sdbcx::XColumnsSupplier, ::com::sun::star::sdbcx::XKeysSupplier, ::com::sun::star::container::XNamed, ::com::sun::star::lang::XServiceInfo> OTableDescriptor_BASE; - typedef ::cppu::ImplHelper4< ::com::sun::star::sdbcx::XDataDescriptorFactory, + typedef ::cppu::ImplHelper4< ::com::sun::star::sdbcx::XDataDescriptorFactory, ::com::sun::star::sdbcx::XIndexesSupplier, ::com::sun::star::sdbcx::XRename, ::com::sun::star::sdbcx::XAlterTable > OTable_BASE; typedef ::comphelper::OIdPropertyArrayUsageHelper<OTable> OTable_PROP; - + class OOO_DLLPUBLIC_DBTOOLS OTable : public comphelper::OBaseMutex, @@ -81,10 +81,10 @@ namespace connectivity ::rtl::OUString m_Description; ::rtl::OUString m_Type; - OCollection* m_pKeys; - OCollection* m_pColumns; - OCollection* m_pIndexes; - OCollection* m_pTables; // must hold his own container to notify him when renaming + OCollection* m_pKeys; + OCollection* m_pColumns; + OCollection* m_pIndexes; + OCollection* m_pTables; // must hold his own container to notify him when renaming using OTableDescriptor_BASE::rBHelper; @@ -93,9 +93,9 @@ namespace connectivity // OPropertySetHelper virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); public: - OTable( OCollection* _pTables, + OTable( OCollection* _pTables, sal_Bool _bCase); - OTable( OCollection* _pTables, + OTable( OCollection* _pTables, sal_Bool _bCase, const ::rtl::OUString& _Name, const ::rtl::OUString& _Type, @@ -107,8 +107,8 @@ namespace connectivity DECLARE_SERVICE_INFO(); //XInterface - virtual void SAL_CALL acquire() throw(); - virtual void SAL_CALL release() throw(); + virtual void SAL_CALL acquire() throw(); + virtual void SAL_CALL release() throw(); virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); //XTypeProvider virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes( ) throw(::com::sun::star::uno::RuntimeException); diff --git a/connectivity/inc/connectivity/sdbcx/VTypeDef.hxx b/connectivity/inc/connectivity/sdbcx/VTypeDef.hxx index 41d0d2c21a25..5f6264a9ebc9 100644 --- a/connectivity/inc/connectivity/sdbcx/VTypeDef.hxx +++ b/connectivity/inc/connectivity/sdbcx/VTypeDef.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/connectivity/inc/connectivity/sdbcx/VUser.hxx b/connectivity/inc/connectivity/sdbcx/VUser.hxx index 5db5249e5220..8cb0ec4d9bf7 100644 --- a/connectivity/inc/connectivity/sdbcx/VUser.hxx +++ b/connectivity/inc/connectivity/sdbcx/VUser.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -61,7 +61,7 @@ namespace connectivity public ODescriptor { protected: - OGroups* m_pGroups; + OGroups* m_pGroups; using OUser_BASE::rBHelper; diff --git a/connectivity/inc/connectivity/sdbcx/VView.hxx b/connectivity/inc/connectivity/sdbcx/VView.hxx index 3684009a1268..33617ff9c783 100644 --- a/connectivity/inc/connectivity/sdbcx/VView.hxx +++ b/connectivity/inc/connectivity/sdbcx/VView.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -62,7 +62,7 @@ namespace connectivity ::rtl::OUString m_CatalogName; ::rtl::OUString m_SchemaName; ::rtl::OUString m_Command; - sal_Int32 m_CheckOption; + sal_Int32 m_CheckOption; // need for the getName method ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; diff --git a/connectivity/inc/connectivity/sqlerror.hxx b/connectivity/inc/connectivity/sqlerror.hxx index db96392d6267..d360a32bea2c 100644 --- a/connectivity/inc/connectivity/sqlerror.hxx +++ b/connectivity/inc/connectivity/sqlerror.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/connectivity/inc/connectivity/sqliterator.hxx b/connectivity/inc/connectivity/sqliterator.hxx index 29cd0eb40f58..0e61f34bc708 100644 --- a/connectivity/inc/connectivity/sqliterator.hxx +++ b/connectivity/inc/connectivity/sqliterator.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -66,24 +66,24 @@ namespace connectivity class OOO_DLLPUBLIC_DBTOOLS OSQLParseTreeIterator { private: - ::com::sun::star::sdbc::SQLException m_aErrors; // conatins the error while iterating through the statement - const OSQLParseNode* m_pParseTree; // aktueller ParseTree - const OSQLParser& m_rParser; // if set used for general error messages from the context - OSQLStatementType m_eStatementType; // Art des Statements - ::rtl::Reference<OSQLColumns> m_aSelectColumns; // alle Spalten aus dem 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 + ::com::sun::star::sdbc::SQLException m_aErrors; // conatins the error while iterating through the statement + const OSQLParseNode* m_pParseTree; // aktueller ParseTree + const OSQLParser& m_rParser; // if set used for general error messages from the context + OSQLStatementType m_eStatementType; // Art des Statements + ::rtl::Reference<OSQLColumns> m_aSelectColumns; // alle Spalten aus dem 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); + 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 - void traverseOneTableName( OSQLTables& _rTables,const OSQLParseNode * pTableName, const ::rtl::OUString & rTableRange ); - void traverseORCriteria(OSQLParseNode * pSearchCondition); - void traverseANDCriteria(OSQLParseNode * pSearchCondition); - void traverseOnePredicate( + void traverseOneTableName( OSQLTables& _rTables,const OSQLParseNode * pTableName, const ::rtl::OUString & rTableRange ); + void traverseORCriteria(OSQLParseNode * pSearchCondition); + void traverseANDCriteria(OSQLParseNode * pSearchCondition); + void traverseOnePredicate( OSQLParseNode * pColumnRef, ::rtl::OUString& aValue, OSQLParseNode * pParameter); @@ -92,8 +92,8 @@ namespace connectivity const OSQLParseNode* getTableNode( OSQLTables& _rTables, const OSQLParseNode* pTableRef, ::rtl::OUString& aTableRange ); void getQualified_join( OSQLTables& _rTables, const OSQLParseNode *pTableRef, ::rtl::OUString& aTableRange ); - void getSelect_statement(OSQLTables& _rTables,const OSQLParseNode* pSelect); - ::rtl::OUString getUniqueColumnName(const ::rtl::OUString & rColumnName) const; + void getSelect_statement(OSQLTables& _rTables,const OSQLParseNode* pSelect); + ::rtl::OUString getUniqueColumnName(const ::rtl::OUString & rColumnName) const; /** finds the column with a given name, belonging to a given table, in a given tables collection @param _rTables @@ -157,7 +157,7 @@ namespace connectivity // Der zu analysierende/zu traversierende Parse Tree: // bei "Ubergabe von NULL wird der aktuelle Parsetree gel"oscht und der Fehlerstatus gecleared void setParseTree(const OSQLParseNode * pNewParseTree); -// void setParser(const OSQLParser* _pParser) { m_pParser = _pParser; } +// void setParser(const OSQLParser* _pParser) { m_pParser = _pParser; } const OSQLParseNode * getParseTree() const { return m_pParseTree; }; // Teilbaueme bei einem select statement @@ -208,7 +208,7 @@ namespace connectivity @param _nIncludeMask set of TraversalParts bits, specifying which information is to be collected. - Note TraversalParts is currently not + Note TraversalParts is currently not */ void traverseSome( sal_uInt32 _nIncludeMask ); @@ -218,28 +218,28 @@ namespace connectivity ::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> getParameters() const { return m_aParameters; } ::rtl::Reference<OSQLColumns> getCreateColumns() const { return m_aCreateColumns;} /** return the columname and the table range - @param _pColumnRef + @param _pColumnRef The column ref parse node. - @param _rColumnName + @param _rColumnName The column name to be set. - @param _rTableRange + @param _rTableRange The table range to be set. */ - void getColumnRange( const OSQLParseNode* _pColumnRef, + void getColumnRange( const OSQLParseNode* _pColumnRef, ::rtl::OUString &_rColumnName, ::rtl::OUString& _rTableRange) const; /** retrieves a column's name, table range, and alias - @param _pColumnRef + @param _pColumnRef The column_ref parse node. - @param _out_rColumnName + @param _out_rColumnName The column name to be set. - @param _out_rTableRange + @param _out_rTableRange The table range to be set. @param _out_rColumnAliasIfPresent If the column specified by _pColumnRef is part of the select columns, and contains a column alias there, @@ -250,9 +250,9 @@ namespace connectivity ::rtl::OUString& _out_rTableRange, ::rtl::OUString& _out_rColumnAliasIfPresent ) const; - + /** return the alias name of a column - @param _pDerivedColumn + @param _pDerivedColumn The parse node where SQL_ISRULE(_pDerivedColumn,derived_column) must be true @return The alias name of the column or an empty string. @@ -260,16 +260,16 @@ namespace connectivity static ::rtl::OUString getColumnAlias(const OSQLParseNode* _pDerivedColumn); /** return the columname and the table range - @param _pColumnRef + @param _pColumnRef The column ref parse node. - @param _xMetaData + @param _xMetaData The database meta data. - @param _rColumnName + @param _rColumnName The column name to be set. - @param _rTableRange + @param _rTableRange The table range to be set. */ - static void getColumnRange( const OSQLParseNode* _pColumnRef, + static void getColumnRange( const OSQLParseNode* _pColumnRef, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _rxConnection, ::rtl::OUString &_rColumnName, ::rtl::OUString& _rTableRange); diff --git a/connectivity/inc/connectivity/sqlnode.hxx b/connectivity/inc/connectivity/sqlnode.hxx index 0432b3e31c6c..cc853d606e8f 100644 --- a/connectivity/inc/connectivity/sqlnode.hxx +++ b/connectivity/inc/connectivity/sqlnode.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -74,10 +74,10 @@ namespace connectivity class IParseContext; typedef ::std::vector< OSQLParseNode* > OSQLParseNodes; - - enum SQLNodeType {SQL_NODE_RULE, SQL_NODE_LISTRULE, SQL_NODE_COMMALISTRULE, + + enum SQLNodeType {SQL_NODE_RULE, SQL_NODE_LISTRULE, SQL_NODE_COMMALISTRULE, SQL_NODE_KEYWORD, SQL_NODE_COMPARISON, SQL_NODE_NAME, - SQL_NODE_STRING, SQL_NODE_INTNUM, SQL_NODE_APPROXNUM, + SQL_NODE_STRING, SQL_NODE_INTNUM, SQL_NODE_APPROXNUM, SQL_NODE_EQUAL,SQL_NODE_LESS,SQL_NODE_GREAT,SQL_NODE_LESSEQ,SQL_NODE_GREATEQ,SQL_NODE_NOTEQUAL, SQL_NODE_PUNCTUATION, SQL_NODE_AMMSC, SQL_NODE_ACCESS_DATE,SQL_NODE_DATE,SQL_NODE_CONCAT}; @@ -87,7 +87,7 @@ namespace connectivity //================================================================== struct OOO_DLLPUBLIC_DBTOOLS SQLParseNodeParameter { - const ::com::sun::star::lang::Locale& rLocale; + const ::com::sun::star::lang::Locale& rLocale; ::dbtools::DatabaseMetaData aMetaData; OSQLParser* pParser; ::boost::shared_ptr< QueryNameSet > pSubQueryHistory; @@ -95,7 +95,7 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > xField; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > xQueries; // see bParseToSDBCLevel const IParseContext& m_rContext; - sal_Char cDecSep; + sal_Char cDecSep; bool bQuote : 1; /// should we quote identifiers? bool bInternational : 1; /// should we internationalize keywords and placeholders? bool bPredicate : 1; /// are we going to parse a mere predicate? @@ -123,12 +123,12 @@ 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 + 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()) + 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! public: @@ -383,7 +383,7 @@ namespace connectivity const ::rtl::OUString& getTokenValue() const {return m_aNodeValue;} // SetTokenValue setzt den NodeValue - void setTokenValue(const ::rtl::OUString& rString) { if (isToken()) m_aNodeValue = rString;} + 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();} @@ -395,11 +395,11 @@ namespace connectivity // e.q. (a or b) and (c or d) <=> a and c or a and d or b and c or b and d static void disjunctiveNormalForm(OSQLParseNode*& pSearchCondition); - // Simplies logic expressions - // a * a = a - // a + a = a + // Simplies logic expressions + // a * a = a + // a + a = a // a * ( a + b) = a - // a + a * b = a + // a + a * b = a static void absorptions(OSQLParseNode*& pSearchCondition); // erase not nessary braces @@ -461,16 +461,16 @@ namespace connectivity { OSL_ENSURE(nPos < m_aChildren.size(), "Invalid Position"); - // return m_aChildren[nPos]; + // return m_aChildren[nPos]; return m_aChildren.at(nPos); } // Utility-Methoden zum Abfragen auf bestimmte Rules, Token oder Punctuation: - #define SQL_ISRULE(pParseNode, eRule) ((pParseNode)->isRule() && (pParseNode)->getRuleID() == OSQLParser::RuleID(OSQLParseNode::eRule)) + #define SQL_ISRULE(pParseNode, eRule) ((pParseNode)->isRule() && (pParseNode)->getRuleID() == OSQLParser::RuleID(OSQLParseNode::eRule)) #define SQL_ISTOKEN(pParseNode, token) ((pParseNode)->isToken() && (pParseNode)->getTokenID() == SQL_TOKEN_##token) #define SQL_ISPUNCTUATION(pParseNode, aString) ((pParseNode)->getNodeType() == SQL_NODE_PUNCTUATION && !(pParseNode)->getTokenValue().compareToAscii(aString)) } -#endif //_CONNECTIVITY_SQLNODE_HXX +#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 7c634595e44c..d55c555ef51a 100644 --- a/connectivity/inc/connectivity/sqlparse.hxx +++ b/connectivity/inc/connectivity/sqlparse.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -146,33 +146,33 @@ namespace connectivity private: typedef ::std::map< sal_uInt32, OSQLParseNode::Rule > RuleIDMap; - // static parts for parsers - static sal_uInt32 s_nRuleIDs[OSQLParseNode::rule_count + 1]; + // static parts for parsers + static sal_uInt32 s_nRuleIDs[OSQLParseNode::rule_count + 1]; static RuleIDMap s_aReverseRuleIDLookup; - static OParseContext s_aDefaultContext; + static OParseContext s_aDefaultContext; - static OSQLScanner* s_pScanner; + static OSQLScanner* s_pScanner; static OSQLParseNodesGarbageCollector* s_pGarbageCollector; - static sal_Int32 s_nRefCount; + static sal_Int32 s_nRefCount; // informations on the current parse action - const IParseContext* m_pContext; - OSQLParseNode* m_pParseTree; // result from parsing + const IParseContext* m_pContext; + OSQLParseNode* m_pParseTree; // result from parsing ::std::auto_ptr< OSQLParser_Data > m_pData; - ::rtl::OUString m_sFieldName; // current field name for a predicate - ::rtl::OUString m_sErrorMessage;// current error msg + ::rtl::OUString m_sFieldName; // current field name for a predicate + ::rtl::OUString m_sErrorMessage;// current error msg ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > - m_xField; // current field + m_xField; // current field ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatter > - m_xFormatter; // current number formatter - sal_Int32 m_nFormatKey; // numberformat, which should be used - sal_Int32 m_nDateFormatKey; - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceFactory; + m_xFormatter; // current number formatter + sal_Int32 m_nFormatKey; // numberformat, which should be used + sal_Int32 m_nDateFormatKey; + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceFactory; ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XCharacterClassification> m_xCharClass; - static ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XLocaleData> s_xLocaleData; - ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XLocaleData> xDummy; // can be deleted after 627 + static ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XLocaleData> s_xLocaleData; + ::com::sun::star::uno::Reference< ::com::sun::star::i18n::XLocaleData> xDummy; // can be deleted after 627 // convert a string into double trim it to scale of _nscale and than transform it back to string ::rtl::OUString stringToDouble(const ::rtl::OUString& _rValue,sal_Int16 _nScale); @@ -246,7 +246,7 @@ namespace connectivity void reduceLiteral(OSQLParseNode*& pLiteral, sal_Bool bAppendBlank); // does not change the pLiteral argument sal_Int16 buildNode(OSQLParseNode*& pAppend,OSQLParseNode* pCompare,OSQLParseNode* pLiteral,OSQLParseNode* pLiteral2); - + sal_Int16 buildComparsionRule(OSQLParseNode*& pAppend,OSQLParseNode* pLiteral); // pCompre will be deleted if it is not used sal_Int16 buildPredicateRule(OSQLParseNode*& pAppend,OSQLParseNode* pLiteral,OSQLParseNode*& pCompare,OSQLParseNode* pLiteral2 = NULL); diff --git a/connectivity/inc/connectivity/standardsqlstate.hxx b/connectivity/inc/connectivity/standardsqlstate.hxx index e93448408188..42765e9ae363 100644 --- a/connectivity/inc/connectivity/standardsqlstate.hxx +++ b/connectivity/inc/connectivity/standardsqlstate.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * 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 diff --git a/connectivity/inc/connectivity/statementcomposer.hxx b/connectivity/inc/connectivity/statementcomposer.hxx index dcc6aff0501a..37c3ab69d001 100644 --- a/connectivity/inc/connectivity/statementcomposer.hxx +++ b/connectivity/inc/connectivity/statementcomposer.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/connectivity/inc/connectivity/virtualdbtools.hxx b/connectivity/inc/connectivity/virtualdbtools.hxx index d35819fa6608..1760a9c835ab 100644 --- a/connectivity/inc/connectivity/virtualdbtools.hxx +++ b/connectivity/inc/connectivity/virtualdbtools.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -138,7 +138,7 @@ namespace connectivity , ::com::sun::star::uno::RuntimeException ) ) = 0; virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection> getRowSetConnection( - const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& _rxRowSet) + const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XRowSet>& _rxRowSet) const SAL_THROW ( (::com::sun::star::uno::RuntimeException) ) = 0; virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier> getNumberFormats( @@ -194,7 +194,7 @@ namespace connectivity const ::rtl::OUString& _rCommand, ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent >& _rxKeepFieldsAlive, ::dbtools::SQLExceptionInfo* _pErrorInfo = NULL - ) SAL_THROW( ( ) ) = 0; + ) SAL_THROW( ( ) ) = 0; virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > getFieldNamesByCommandDescriptor( @@ -202,20 +202,20 @@ namespace connectivity const sal_Int32 _nCommandType, const ::rtl::OUString& _rCommand, ::dbtools::SQLExceptionInfo* _pErrorInfo = NULL - ) SAL_THROW( ( ) ) = 0; + ) SAL_THROW( ( ) ) = 0; /** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::INSERT - @param _rxCursorSet the property set + @param _rxCursorSet the property set */ virtual sal_Bool canInsert(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const = 0; /** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::UPDATE - @param _rxCursorSet the property set + @param _rxCursorSet the property set */ virtual sal_Bool canUpdate(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const = 0; /** check if the property "Privileges" supports ::com::sun::star::sdbcx::Privilege::DELETE - @param _rxCursorSet the property set + @param _rxCursorSet the property set */ virtual sal_Bool canDelete(const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _rxCursorSet) const = 0; @@ -241,7 +241,7 @@ namespace connectivity /** enumerates all supported char sets @return the number of charsets supported */ - virtual sal_Int32 getSupportedTextEncodings( + virtual sal_Int32 getSupportedTextEncodings( ::std::vector< rtl_TextEncoding >& /* [out] */ _rEncs ) const = 0; }; @@ -348,11 +348,11 @@ namespace connectivity }; //.................................................................... - } // namespace simple + } // namespace simple //.................................................................... //........................................................................ -} // namespace connectivity +} // namespace connectivity //........................................................................ #endif // CONNECTIVITY_VIRTUAL_DBTOOLS_HXX diff --git a/connectivity/inc/connectivity/warningscontainer.hxx b/connectivity/inc/connectivity/warningscontainer.hxx index 273390ccbf7f..0836400278d2 100644 --- a/connectivity/inc/connectivity/warningscontainer.hxx +++ b/connectivity/inc/connectivity/warningscontainer.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 @@ -62,7 +62,7 @@ namespace dbtools { private: ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XWarningsSupplier > m_xExternalWarnings; - ::com::sun::star::uno::Any m_aOwnWarnings; + ::com::sun::star::uno::Any m_aOwnWarnings; public: WarningsContainer() { } @@ -102,7 +102,7 @@ namespace dbtools }; //......................................................................... -} // namespace dbtools +} // namespace dbtools //......................................................................... #endif // DBTOOLS_WARNINGSCONTAINER_HXX diff --git a/connectivity/inc/pch/precompiled_connectivity.cxx b/connectivity/inc/pch/precompiled_connectivity.cxx index e4bdb424d850..f89074e28cd3 100644 --- a/connectivity/inc/pch/precompiled_connectivity.cxx +++ b/connectivity/inc/pch/precompiled_connectivity.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 diff --git a/connectivity/inc/pch/precompiled_connectivity.hxx b/connectivity/inc/pch/precompiled_connectivity.hxx index 2845d35e3ef8..00686e50205f 100644 --- a/connectivity/inc/pch/precompiled_connectivity.hxx +++ b/connectivity/inc/pch/precompiled_connectivity.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * 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 |